diff --git a/distributedhardwarefwk.gni b/distributedhardwarefwk.gni index 5ed2fb1ff0d4f6424861a5c22193885857d48d5f..fc0c08f4e1658b1c7549ff80638c917d001c249e 100644 --- a/distributedhardwarefwk.gni +++ b/distributedhardwarefwk.gni @@ -34,4 +34,10 @@ build_flags = [ "-Werror" ] declare_args() { distributed_hardware_fwk_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 993406cb7ef9169c3da72f4225296a30fb76a5fa..64c94b6b17bc2383f8712c46824e9b38ccb5d500 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -155,12 +155,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 881c9263de4c9209c59f189b634e64fa98a481b6..6c9d810e0947e7a98ce4bcbd8f13a09e43e8831c 100644 --- a/services/distributedhardwarefwkservice/include/utils/dh_context.h +++ b/services/distributedhardwarefwkservice/include/utils/dh_context.h @@ -23,8 +23,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" @@ -112,10 +114,12 @@ public: void DelIsomerismConnectDev(const std::string &IsomerismDeviceId); 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 1bdbe7eec8da3d23c2c61239e5f6d356c17b484a..6f938b621b535a7d482d944071d20fc7ba03dd8e 100644 --- a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp +++ b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp @@ -43,6 +43,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"); @@ -55,8 +56,10 @@ void DHContext::RegisterPowerStateLinstener() } else { DHLOGI("DHFWK register power state callback success"); } + #endif } +#ifdef POWER_MANAGER_ENABLE void DHContext::DHFWKPowerStateCallback::OnPowerStateChanged(PowerMgr::PowerState state) { DHLOGI("DHFWK OnPowerStateChanged state: %{public}u", static_cast(state)); @@ -70,6 +73,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 573b8fba70d97d9d6ffd638b260ba9f01245973f..3063467869e31bf940f7302f391158deae70fe0a 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 7881f334e6a1c87b36eedd8198d55c2057ddbb9b..f14a0f80960685978159f717af357a492ef733a6 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -66,10 +66,14 @@ ohos_unittest("AccessManagerTest") { "hitrace:hitrace_meter", "init:libbegetutil", "kv_store:distributeddata_inner", - "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 a7c4277c4e001b81b47268c5e3a13de6d2e9c04e..966f20c4dd099085de6296b2e308be0464484305 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") { "hilog:libhilog", "hitrace:hitrace_meter", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", ] cflags = [ @@ -69,6 +68,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 bdbba762328a961f790af09d23077fc321fe9d03..e121d203916b10769e0bf4b067de24ac6621175e 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 a5162586c9f52c44b04ea8e77146da40e4b6c39a..313ca66c183d9b1cc339125d6f3fa6863c4025d4 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") { "eventhandler:libeventhandler", "hilog:libhilog", "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 bda1a54439141cb948b8732c81297990570dc115..e0a9163d7aed2da11619c54a6b2c9587bb9289c8 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn @@ -45,7 +45,6 @@ ohos_unittest("DistributedHardwareManagerTest") { "cJSON:cjson", "c_utils:utils", "eventhandler:libeventhandler", - "power_manager:powermgr_client", ] defines = [ @@ -60,6 +59,11 @@ ohos_unittest("DistributedHardwareManagerTest") { "-g3", "-Dprivate=public", ] + + 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 9ef78756bcfa695911abc012e283862f28a2071f..b344cdec7ddc4d413dbe949064a7d7d909a1c2d1 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn @@ -64,9 +64,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 9a9c75fd32e43e597fbe0dc2aa382214843a73bf..48c3d17f4377c99de87f73d7bb2c595381de29ee 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn @@ -55,7 +55,6 @@ ohos_unittest("LocalHardwareManagerTest") { "eventhandler:libeventhandler", "hisysevent:libhisysevent", "kv_store:distributeddata_inner", - "power_manager:powermgr_client", ] defines = [ @@ -70,6 +69,11 @@ ohos_unittest("LocalHardwareManagerTest") { "-g3", "-Dprivate=public", ] + + 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 6600a6c17e9c1cffe694855406522b573e3a5721..2809608bfe9b9b0e3044f8e964700490623405e2 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn @@ -58,9 +58,13 @@ ohos_unittest("ResourceManagerTest") { "eventhandler:libeventhandler", "hilog:libhilog", "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/transport/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/transport/BUILD.gn index f08822a40eada405adc0f745c19eaadf4fe5912f..46bb8b2e5a34142333f83c775c421a01a66054db 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/transport/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/transport/BUILD.gn @@ -58,9 +58,13 @@ ohos_unittest("TransportTest") { "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("transport_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/utils/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/utils/BUILD.gn index b2dfa8a421a7f0c09bb05bdfa3bd52f719bb4956..0e6182f62dd953beaee8397670f0b4338835b202 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/utils/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/utils/BUILD.gn @@ -65,10 +65,14 @@ ohos_unittest("DhContextTest") { "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("dh_context_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn index 686532febae55eaad4f1bcfb6b5ffa5623cdbdd2..12ed28dc9bfa35150dc4cc7943852f5cd202777e 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn @@ -50,10 +50,14 @@ 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" ] + } + cflags = [ "-Wall", "-Werror", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn index 59998f9a3b4f4077c31f5485296be6f12d262633..8889e7731bc7f3874702d6d75242a285414f54c9 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn @@ -52,10 +52,14 @@ ohos_unittest("VersioninfoManagerTest") { "eventhandler:libeventhandler", "hilog:libhilog", "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" ] + } + cflags = [ "-Wall", "-Werror",