diff --git a/distributedhardwarefwk.gni b/distributedhardwarefwk.gni index 3ac3d720de5b40d1e5322094dc3bbe7a83d95ac2..65aef6e9ec302595c61f60be70cc5f072dd8ca12 100644 --- a/distributedhardwarefwk.gni +++ b/distributedhardwarefwk.gni @@ -34,4 +34,10 @@ build_flags = [ "-Werror" ] declare_args() { dhardware_low_latency = false + powermgr_power_manager_fwk = true + + if (defined(global_parts_info) && + !defined(global_parts_info.powermgr_power_manager)) { + powermgr_power_manager_fwk = false + } } diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index 8074d244922ca6117578262ee2309c64a3ab0de6..6b61934d7b62e8a15ec34624ac6f25645a6589ea 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -130,12 +130,16 @@ ohos_shared_library("distributedhardwarefwksvr") { "init:libbegetutil", "ipc:ipc_core", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", "resource_schedule_service:ressched_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } + subsystem_name = "distributedhardware" part_name = "distributed_hardware_fwk" diff --git a/services/distributedhardwarefwkservice/include/utils/dh_context.h b/services/distributedhardwarefwkservice/include/utils/dh_context.h index c7869ea0336af7c8e37e3a8a5e16776e52481465..fed0ea79ef1fe06b17b2e2ce7602418b3ef9a453 100644 --- a/services/distributedhardwarefwkservice/include/utils/dh_context.h +++ b/services/distributedhardwarefwkservice/include/utils/dh_context.h @@ -22,8 +22,10 @@ #include #include +#ifdef POWER_MANAGER_ENABLE #include "power_mgr_client.h" #include "power_state_callback_stub.h" +#endif #include "device_type.h" #include "event_handler.h" @@ -63,10 +65,12 @@ public: void SetIsSleeping(bool isSleeping); private: +#ifdef POWER_MANAGER_ENABLE class DHFWKPowerStateCallback : public OHOS::PowerMgr::PowerStateCallbackStub { public: void OnPowerStateChanged(OHOS::PowerMgr::PowerState state) override; }; +#endif void RegisterPowerStateLinstener(); private: diff --git a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp index 0deec491e58fc1f2b46d5033aba4f57245ef065c..6907b950e2a8920ced6a581dcc50aa8dbfceaa09 100644 --- a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp +++ b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp @@ -40,6 +40,7 @@ DHContext::~DHContext() void DHContext::RegisterPowerStateLinstener() { +#ifdef POWER_MANAGER_ENABLE sptr powerStateCallback_(new DHFWKPowerStateCallback()); if (powerStateCallback_ == nullptr) { DHLOGE("DHFWK subscribe create power state callback Create Error"); @@ -52,8 +53,10 @@ void DHContext::RegisterPowerStateLinstener() } else { DHLOGE("DHFWK register power state callback success"); } +#endif } +#ifdef POWER_MANAGER_ENABLE void DHContext::DHFWKPowerStateCallback::OnPowerStateChanged(PowerMgr::PowerState state) { DHLOGI("DHFWK OnPowerStateChanged state: %u", static_cast(state)); @@ -67,6 +70,7 @@ void DHContext::DHFWKPowerStateCallback::OnPowerStateChanged(PowerMgr::PowerStat DHLOGI("DHFWK set NOT in sleeping"); DHContext::GetInstance().SetIsSleeping(false); } +#endif bool DHContext::IsSleeping() { diff --git a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn index 1032e67212f6cca7b88de11de518ba3fd1974efd..5e227055cd4698389b9b99089f1853a759345ffa 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn @@ -56,8 +56,12 @@ ohos_fuzztest("ResourcemanagerFuzzTest") { "eventhandler:libeventhandler", "ipc:ipc_single", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } } ############################################################################### diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index dcbc89f51c542572f8ebb0cc8ed5ae663d8437f7..dc6d62f2b8687831ddc12e4fe0754a0fa88c108a 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -61,10 +61,14 @@ ohos_unittest("AccessManagerTest") { "hisysevent:libhisysevent", "hitrace:hitrace_meter", "init:libbegetutil", - "power_manager:powermgr_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } } group("unittest") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn index 193efc0564c1c6c49a4f3b21d390ee9a18f62f11..6436791aa16bad6bb0be2835375f6a3d0844540c 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("ComponentLoaderTest") { "config_policy:configpolicy_util", "hitrace:hitrace_meter", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", ] defines = [ @@ -62,6 +61,11 @@ ohos_unittest("ComponentLoaderTest") { "DH_LOG_TAG=\"ComponentLoaderTest\"", "LOG_DOMAIN=0xD004100", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } } group("component_loader_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn index 5c83232ce23e9fa2f4def2cf9d05b2aea9029939..52924e9dd5263bddfd0a3225d274366703c7c9fe 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn @@ -68,7 +68,6 @@ ohos_unittest("ComponentManagerTest") { "eventhandler:libeventhandler", "ipc:ipc_single", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", ] defines = [ @@ -76,6 +75,11 @@ ohos_unittest("ComponentManagerTest") { "DH_LOG_TAG=\"ComponentManagerTest\"", "LOG_DOMAIN=0xD004100", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } } group("component_manager_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn index 370032e45e1d19d459678aa2af231ae873ab6741..b9b13657b2c99e1b5fabe38c414fb6a1f74f343d 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn @@ -61,9 +61,13 @@ ohos_unittest("DbAdapterTest") { "c_utils:utils", "eventhandler:libeventhandler", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", "safwk:system_ability_fwk", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines = [ "POWER_MANAGER_ENABLE" ] + } } group("db_adapter_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn index 9017a5150508265e78fc2ea95eb8f5970fdba5c9..934565cc507202036d28fa2b3a21c174089b93fc 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn @@ -49,7 +49,6 @@ ohos_unittest("DistributedHardwareManagerTest") { external_deps = [ "c_utils:utils", "eventhandler:libeventhandler", - "power_manager:powermgr_client", ] defines = [ @@ -57,6 +56,11 @@ ohos_unittest("DistributedHardwareManagerTest") { "DH_LOG_TAG=\"DistributedHardwareManagerTest\"", "LOG_DOMAIN=0xD004100", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } } group("distributed_hardware_manager_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn index b1ffab8bc24bcc936368c87f90324088ff9837a5..223ef07a1f481b254f15931fc4917dc707c1cd9a 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn @@ -58,9 +58,13 @@ ohos_unittest("DistributedHardwareServiceTest") { "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", - "power_manager:powermgr_client", "safwk:system_ability_fwk", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } } group("distributed_hardware_service_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn index 7905c5e84cef39b8e804fb5eb2d5f2a57281a45a..313b6701ab8911edfcb5101dd5f97b62aa5edd7f 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn @@ -57,7 +57,6 @@ ohos_unittest("LocalHardwareManagerTest") { "eventhandler:libeventhandler", "hisysevent:libhisysevent", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", ] defines = [ @@ -65,6 +64,11 @@ ohos_unittest("LocalHardwareManagerTest") { "DH_LOG_TAG=\"LocalHardwareManagerTest\"", "LOG_DOMAIN=0xD004100", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines += [ "POWER_MANAGER_ENABLE" ] + } } group("local_hardware_manager_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn index 15157c635abe9ebe3f05df39a943b1536646d6c2..ed29648d41a4b2e6b9d3676fafd3ba4d9ad74122 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn @@ -51,9 +51,13 @@ ohos_unittest("ResourceManagerTest") { "c_utils:utils", "eventhandler:libeventhandler", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", "safwk:system_ability_fwk", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines = [ "POWER_MANAGER_ENABLE" ] + } } group("resource_manager_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn index ac50f7da1c54e4365be8b4134fa2158aaa70d485..2b812ff63a30bdb78a4906dce1049fc4f95e993e 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn @@ -51,9 +51,13 @@ ohos_unittest("VersionInfoTest") { "c_utils:utils", "eventhandler:libeventhandler", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", "safwk:system_ability_fwk", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines = [ "POWER_MANAGER_ENABLE" ] + } } group("version_info_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn index d9cfa77b9048e86aa1aa717efb1e6a01933bc670..5637681a94fd9429218c8eebb4378da70b5683c1 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn @@ -52,9 +52,13 @@ ohos_unittest("VersioninfoManagerTest") { "c_utils:utils", "eventhandler:libeventhandler", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", "safwk:system_ability_fwk", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines = [ "POWER_MANAGER_ENABLE" ] + } } group("versioninfo_manager_test") { diff --git a/utils/test/unittest/common/eventtrance/BUILD.gn b/utils/test/unittest/common/eventtrance/BUILD.gn index e240e684246b313e8e3754a81e9e65a98ff4a8bc..2f29ff7d4706f7687c716992cddf4945e7abd65c 100644 --- a/utils/test/unittest/common/eventtrance/BUILD.gn +++ b/utils/test/unittest/common/eventtrance/BUILD.gn @@ -51,9 +51,13 @@ ohos_unittest("EventTranceTest") { "c_utils:utils", "hisysevent:libhisysevent", "hitrace:hitrace_meter", - "power_manager:powermgr_client", "safwk:system_ability_fwk", ] + + if (powermgr_power_manager_fwk) { + external_deps += [ "power_manager:powermgr_client" ] + defines = [ "POWER_MANAGER_ENABLE" ] + } } group("event_trance_test") {