From 6c269129e86b74f53725be024447ac0ef8ae9157 Mon Sep 17 00:00:00 2001 From: wangjingchang Date: Tue, 15 Jul 2025 12:16:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8Dclient=E4=B8=8D?= =?UTF-8?q?=E9=85=8D=E7=BD=AEcfi=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjingchang --- interfaces/inner_api/BUILD.gn | 96 +++++++++++++++- .../inner_api}/IPowerMgr.idl | 0 services/BUILD.gn | 6 +- services/zidl/BUILD.gn | 105 ------------------ .../asyncshutdowncallback_fuzzer/BUILD.gn | 2 +- .../createrunninglock_fuzzer/BUILD.gn | 2 +- .../forcesuspenddevice_fuzzer/BUILD.gn | 2 +- .../fuzztest/getsetdevicemode_fuzzer/BUILD.gn | 2 +- test/fuzztest/getstate_fuzzer/BUILD.gn | 2 +- test/fuzztest/hibernate_fuzzer/BUILD.gn | 2 +- .../iscollaborationscreenon_fuzzer/BUILD.gn | 2 +- test/fuzztest/isfoldscreenon_fuzzer/BUILD.gn | 2 +- test/fuzztest/isforcesleeping_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- test/fuzztest/isscreenon_fuzzer/BUILD.gn | 2 +- test/fuzztest/isstandby_fuzzer/BUILD.gn | 2 +- .../lockscreenaftertimingout_fuzzer/BUILD.gn | 2 +- .../fuzztest/lockunlockisused_fuzzer/BUILD.gn | 2 +- .../overridescreenofftime_fuzzer/BUILD.gn | 2 +- .../powermodecallback_fuzzer/BUILD.gn | 2 +- .../powerstatecallback_fuzzer/BUILD.gn | 2 +- .../fuzztest/proxyrunninglock_fuzzer/BUILD.gn | 2 +- .../proxyrunninglocks_fuzzer/BUILD.gn | 2 +- .../queryrunninglocklists_fuzzer/BUILD.gn | 2 +- test/fuzztest/rebootdevice_fuzzer/BUILD.gn | 2 +- test/fuzztest/refreshactivity_fuzzer/BUILD.gn | 2 +- .../releaserunninglock_fuzzer/BUILD.gn | 2 +- .../resetrunninglocks_fuzzer/BUILD.gn | 2 +- .../runninglockcallback_fuzzer/BUILD.gn | 2 +- .../screenstatecallback_fuzzer/BUILD.gn | 2 +- .../setdisplaysuspend_fuzzer/BUILD.gn | 2 +- .../setforcetimingout_fuzzer/BUILD.gn | 2 +- test/fuzztest/setsuspendtag_fuzzer/BUILD.gn | 2 +- test/fuzztest/shelldump_fuzzer/BUILD.gn | 2 +- test/fuzztest/shutdowndevice_fuzzer/BUILD.gn | 2 +- test/fuzztest/suspenddevice_fuzzer/BUILD.gn | 2 +- .../synchibernatecallback_fuzzer/BUILD.gn | 2 +- .../syncshutdowncallback_fuzzer/BUILD.gn | 2 +- .../syncsleepcallback_fuzzer/BUILD.gn | 2 +- .../takeovershutdowncallback_fuzzer/BUILD.gn | 2 +- test/fuzztest/wakeupdevice_fuzzer/BUILD.gn | 2 +- test/systemtest/BUILD.gn | 20 ++-- test/unittest/BUILD.gn | 74 ++++++------ test/unittest/src/servicetest/BUILD.gn | 4 +- 44 files changed, 181 insertions(+), 198 deletions(-) rename {services/zidl => interfaces/inner_api}/IPowerMgr.idl (100%) delete mode 100644 services/zidl/BUILD.gn diff --git a/interfaces/inner_api/BUILD.gn b/interfaces/inner_api/BUILD.gn index 2b8f0a8a..bc4f7673 100644 --- a/interfaces/inner_api/BUILD.gn +++ b/interfaces/inner_api/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//build/config/components/idl_tool/idl.gni") import("../../powermgr.gni") config("powermgr_public_config") { @@ -27,13 +28,97 @@ config("powermgr_private_config") { ] } -ohos_shared_library("powermgr_client") { +config("powermgr_ipc_config") { + include_dirs = [ + "native/include", + "native/include/hibernate", + "native/include/shutdown", + "native/include/suspend", + "${powermgr_service_path}/native/include", + "${powermgr_service_zidl}/include", + "${target_gen_dir}", + ] +} + +idl_gen_interface("powermgr_interface") { + sources = [ "IPowerMgr.idl" ] + + log_domainid = "0xD002902" + log_tag = "PowerSvc" + subsystem_name = "powermgr" + part_name = "${powermgr_part_name}" +} + +ohos_source_set("powermgr_proxy") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } + output_values = get_target_outputs(":powermgr_interface") + sources = filter_include(output_values, [ "*_proxy.cpp" ]) + configs = [ + "${powermgr_utils_path}:utils_config", + "${powermgr_utils_path}:coverage_flags", + ] + + public_configs = [ ":powermgr_ipc_config" ] + + deps = [ ":powermgr_interface" ] + + external_deps = [ + "c_utils:utils", + "hilog:libhilog", + "ipc:ipc_core", + "ipc:ipc_single", + ] + + subsystem_name = "powermgr" + part_name = "${powermgr_part_name}" +} + +ohos_source_set("powermgr_stub") { sanitize = { cfi = true cfi_cross_dso = true debug = false } + output_values = get_target_outputs(":powermgr_interface") + sources = filter_include(output_values, [ "*_stub.cpp" ]) + sources += [ + "${powermgr_service_zidl}/src/power_mgr_async_reply.cpp", + "${powermgr_service_zidl}/src/power_mode_callback_stub.cpp", + "${powermgr_service_zidl}/src/power_runninglock_callback_stub.cpp", + "${powermgr_service_zidl}/src/power_state_callback_stub.cpp", + "${powermgr_service_zidl}/src/screen_off_pre_callback_stub.cpp", + "${powermgr_service_zidl}/src/sync_sleep_callback_stub.cpp", + ] + + configs = [ + "${powermgr_utils_path}:utils_config", + "${powermgr_utils_path}:coverage_flags", + ] + + public_configs = [ ":powermgr_ipc_config" ] + deps = [ + ":powermgr_interface", + ":powermgr_client", + ] + + external_deps = [ + "c_utils:utils", + "hicollie:libhicollie", + "hilog:libhilog", + "ipc:ipc_core", + "ipc:ipc_single", + ] + + subsystem_name = "powermgr" + part_name = "${powermgr_part_name}" +} + +ohos_shared_library("powermgr_client") { branch_protector_ret = "pac_ret" sources = [ @@ -64,19 +149,22 @@ ohos_shared_library("powermgr_client") { "${powermgr_service_zidl}/src/sync_sleep_callback_stub.cpp", ] + output_values = get_target_outputs(":powermgr_interface") + sources += filter_include(output_values, [ "*_proxy.cpp" ]) + configs = [ - "${powermgr_service_zidl}:powermgr_ipc_config", "${powermgr_utils_path}:coverage_flags", + ":powermgr_ipc_config", ":powermgr_private_config", ] public_configs = [ + ":powermgr_ipc_config", ":powermgr_public_config", - "${powermgr_service_zidl}:powermgr_ipc_config", "${powermgr_utils_path}:utils_config", ] - deps = [ "${powermgr_service_zidl}:powermgr_proxy" ] + deps = [ ":powermgr_interface" ] external_deps = [ "ability_base:want", diff --git a/services/zidl/IPowerMgr.idl b/interfaces/inner_api/IPowerMgr.idl similarity index 100% rename from services/zidl/IPowerMgr.idl rename to interfaces/inner_api/IPowerMgr.idl diff --git a/services/BUILD.gn b/services/BUILD.gn index cb146038..9ac56a36 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -87,14 +87,14 @@ ohos_shared_library("powermgrservice") { public_configs = [ ":powermgr_public_config", - "zidl:powermgr_ipc_config" + "${powermgr_inner_api}:powermgr_ipc_config" ] public_deps = [ "${powermgr_utils_path}/setting:power_setting" ] deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_utils_path}:power_utils", "${powermgr_utils_path}/ffrt:power_ffrt", "${powermgr_utils_path}/hookmgr:power_hookmgr", @@ -272,6 +272,6 @@ group("service") { deps = [ ":powermgrservice", "native/profile:power_service_config", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", ] } diff --git a/services/zidl/BUILD.gn b/services/zidl/BUILD.gn deleted file mode 100644 index 285eda84..00000000 --- a/services/zidl/BUILD.gn +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright (c) 2025 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/config/components/idl_tool/idl.gni") -import("../../powermgr.gni") - -config("powermgr_ipc_config") { - include_dirs = [ - "../native/include", - "include", - "${powermgr_inner_api}/native/include", - "${powermgr_inner_api}/native/include/hibernate", - "${powermgr_inner_api}/native/include/shutdown", - "${powermgr_inner_api}/native/include/suspend", - "${target_gen_dir}", - ] -} - -idl_gen_interface("powermgr_interface") { - sources = [ "IPowerMgr.idl" ] - - log_domainid = "0xD002902" - log_tag = "PowerSvc" - subsystem_name = "powermgr" - part_name = "${powermgr_part_name}" -} - -ohos_source_set("powermgr_proxy") { - sanitize = { - cfi = true - cfi_cross_dso = true - debug = false - } - output_values = get_target_outputs(":powermgr_interface") - sources = filter_include(output_values, [ "*_proxy.cpp" ]) - configs = [ - "${powermgr_utils_path}:utils_config", - "${powermgr_utils_path}:coverage_flags", - ] - - public_configs = [ ":powermgr_ipc_config" ] - - deps = [ ":powermgr_interface" ] - - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - "ipc:ipc_core", - "ipc:ipc_single", - ] - - subsystem_name = "powermgr" - part_name = "${powermgr_part_name}" -} - -ohos_source_set("powermgr_stub") { - sanitize = { - cfi = true - cfi_cross_dso = true - debug = false - } - output_values = get_target_outputs(":powermgr_interface") - sources = filter_include(output_values, [ "*_stub.cpp" ]) - sources += [ - "src/power_mgr_async_reply.cpp", - "src/power_mode_callback_stub.cpp", - "src/power_runninglock_callback_stub.cpp", - "src/power_state_callback_stub.cpp", - "src/screen_off_pre_callback_stub.cpp", - "src/sync_sleep_callback_stub.cpp", - ] - - configs = [ - "${powermgr_utils_path}:utils_config", - "${powermgr_utils_path}:coverage_flags", - ] - - public_configs = [ ":powermgr_ipc_config" ] - - deps = [ - ":powermgr_interface", - "${powermgr_inner_api}:powermgr_client", - ] - - external_deps = [ - "c_utils:utils", - "hicollie:libhicollie", - "hilog:libhilog", - "ipc:ipc_core", - "ipc:ipc_single", - ] - - subsystem_name = "powermgr" - part_name = "${powermgr_part_name}" -} \ No newline at end of file diff --git a/test/fuzztest/asyncshutdowncallback_fuzzer/BUILD.gn b/test/fuzztest/asyncshutdowncallback_fuzzer/BUILD.gn index 1aca8c71..e42b1a77 100644 --- a/test/fuzztest/asyncshutdowncallback_fuzzer/BUILD.gn +++ b/test/fuzztest/asyncshutdowncallback_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("AsyncShutdownCallbackFuzzTest") { "./asyncshutdowncallback_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/createrunninglock_fuzzer/BUILD.gn b/test/fuzztest/createrunninglock_fuzzer/BUILD.gn index 8590b1c5..d4d1aa21 100644 --- a/test/fuzztest/createrunninglock_fuzzer/BUILD.gn +++ b/test/fuzztest/createrunninglock_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("CreateRunningLockFuzzTest") { "./createrunninglock_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/forcesuspenddevice_fuzzer/BUILD.gn b/test/fuzztest/forcesuspenddevice_fuzzer/BUILD.gn index eeb1ffd3..0a787a0e 100644 --- a/test/fuzztest/forcesuspenddevice_fuzzer/BUILD.gn +++ b/test/fuzztest/forcesuspenddevice_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("ForceSuspendDeviceFuzzTest") { "./forcesuspenddevice_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/getsetdevicemode_fuzzer/BUILD.gn b/test/fuzztest/getsetdevicemode_fuzzer/BUILD.gn index bc6f2337..b87645bb 100644 --- a/test/fuzztest/getsetdevicemode_fuzzer/BUILD.gn +++ b/test/fuzztest/getsetdevicemode_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("GetSetDeviceModeFuzzTest") { "./getsetdevicemode_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/getstate_fuzzer/BUILD.gn b/test/fuzztest/getstate_fuzzer/BUILD.gn index 0a7517b7..d40950de 100644 --- a/test/fuzztest/getstate_fuzzer/BUILD.gn +++ b/test/fuzztest/getstate_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("GetStateFuzzTest") { "./getstate_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/hibernate_fuzzer/BUILD.gn b/test/fuzztest/hibernate_fuzzer/BUILD.gn index adb00eb6..6f54217d 100644 --- a/test/fuzztest/hibernate_fuzzer/BUILD.gn +++ b/test/fuzztest/hibernate_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("HibernateFuzzTest") { "./hibernate_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/iscollaborationscreenon_fuzzer/BUILD.gn b/test/fuzztest/iscollaborationscreenon_fuzzer/BUILD.gn index 5cfe7fde..6d573e6c 100644 --- a/test/fuzztest/iscollaborationscreenon_fuzzer/BUILD.gn +++ b/test/fuzztest/iscollaborationscreenon_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("IsCollaborationScreenOnFuzzTest") { "./iscollaborationscreenon_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/isfoldscreenon_fuzzer/BUILD.gn b/test/fuzztest/isfoldscreenon_fuzzer/BUILD.gn index bbf138d6..840c3b33 100644 --- a/test/fuzztest/isfoldscreenon_fuzzer/BUILD.gn +++ b/test/fuzztest/isfoldscreenon_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("IsFoldScreenOnFuzzTest") { "./isfoldscreenon_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/isforcesleeping_fuzzer/BUILD.gn b/test/fuzztest/isforcesleeping_fuzzer/BUILD.gn index 1ce2fcf4..c89c0ee8 100644 --- a/test/fuzztest/isforcesleeping_fuzzer/BUILD.gn +++ b/test/fuzztest/isforcesleeping_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("IsForceSleepingFuzzTest") { "./isforcesleeping_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/isrunninglocktypesupported_fuzzer/BUILD.gn b/test/fuzztest/isrunninglocktypesupported_fuzzer/BUILD.gn index fdb221b0..9aa765a2 100644 --- a/test/fuzztest/isrunninglocktypesupported_fuzzer/BUILD.gn +++ b/test/fuzztest/isrunninglocktypesupported_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("IsRunningLockTypeSupportedFuzzTest") { "./isrunninglocktypesupported_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/isscreenon_fuzzer/BUILD.gn b/test/fuzztest/isscreenon_fuzzer/BUILD.gn index 555a0cc9..1599f25d 100644 --- a/test/fuzztest/isscreenon_fuzzer/BUILD.gn +++ b/test/fuzztest/isscreenon_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("IsScreenOnFuzzTest") { "./isscreenon_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/isstandby_fuzzer/BUILD.gn b/test/fuzztest/isstandby_fuzzer/BUILD.gn index 1483b0f1..648f592f 100644 --- a/test/fuzztest/isstandby_fuzzer/BUILD.gn +++ b/test/fuzztest/isstandby_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("IsStandbyFuzzTest") { "./isstandby_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/lockscreenaftertimingout_fuzzer/BUILD.gn b/test/fuzztest/lockscreenaftertimingout_fuzzer/BUILD.gn index de19bb8a..26fa6392 100644 --- a/test/fuzztest/lockscreenaftertimingout_fuzzer/BUILD.gn +++ b/test/fuzztest/lockscreenaftertimingout_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("LockScreenAfterTimingOutFuzzTest") { "./lockscreenaftertimingout_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/lockunlockisused_fuzzer/BUILD.gn b/test/fuzztest/lockunlockisused_fuzzer/BUILD.gn index e2befcd4..bf3d34dc 100644 --- a/test/fuzztest/lockunlockisused_fuzzer/BUILD.gn +++ b/test/fuzztest/lockunlockisused_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("LockUnLockIsUsedFuzzTest") { "./lockunlockisused_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/overridescreenofftime_fuzzer/BUILD.gn b/test/fuzztest/overridescreenofftime_fuzzer/BUILD.gn index 64d0ab52..28e171be 100644 --- a/test/fuzztest/overridescreenofftime_fuzzer/BUILD.gn +++ b/test/fuzztest/overridescreenofftime_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("OverrideScreenOffTimeFuzzTest") { "./overridescreenofftime_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/powermodecallback_fuzzer/BUILD.gn b/test/fuzztest/powermodecallback_fuzzer/BUILD.gn index 328eafb9..77bf87a5 100644 --- a/test/fuzztest/powermodecallback_fuzzer/BUILD.gn +++ b/test/fuzztest/powermodecallback_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("PowerModeCallbackFuzzTest") { "./powermodecallback_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/powerstatecallback_fuzzer/BUILD.gn b/test/fuzztest/powerstatecallback_fuzzer/BUILD.gn index 30dab9d4..c2fbad08 100644 --- a/test/fuzztest/powerstatecallback_fuzzer/BUILD.gn +++ b/test/fuzztest/powerstatecallback_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("PowerStateCallbackFuzzTest") { "./powerstatecallback_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/proxyrunninglock_fuzzer/BUILD.gn b/test/fuzztest/proxyrunninglock_fuzzer/BUILD.gn index e2b9cef7..1e39f55e 100644 --- a/test/fuzztest/proxyrunninglock_fuzzer/BUILD.gn +++ b/test/fuzztest/proxyrunninglock_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("ProxyRunningLockFuzzTest") { "./proxyrunninglock_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/proxyrunninglocks_fuzzer/BUILD.gn b/test/fuzztest/proxyrunninglocks_fuzzer/BUILD.gn index 5b108031..febe4d93 100644 --- a/test/fuzztest/proxyrunninglocks_fuzzer/BUILD.gn +++ b/test/fuzztest/proxyrunninglocks_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("ProxyRunningLocksFuzzTest") { "./proxyrunninglocks_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/queryrunninglocklists_fuzzer/BUILD.gn b/test/fuzztest/queryrunninglocklists_fuzzer/BUILD.gn index 5a112ad8..9f0bd8f2 100644 --- a/test/fuzztest/queryrunninglocklists_fuzzer/BUILD.gn +++ b/test/fuzztest/queryrunninglocklists_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("QueryRunningLockListsFuzzTest") { "./queryrunninglocklists_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/rebootdevice_fuzzer/BUILD.gn b/test/fuzztest/rebootdevice_fuzzer/BUILD.gn index 02420ae4..861dd71d 100644 --- a/test/fuzztest/rebootdevice_fuzzer/BUILD.gn +++ b/test/fuzztest/rebootdevice_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("RebootDeviceFuzzTest") { "./rebootdevice_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/refreshactivity_fuzzer/BUILD.gn b/test/fuzztest/refreshactivity_fuzzer/BUILD.gn index 233b3e69..a1d95ba7 100644 --- a/test/fuzztest/refreshactivity_fuzzer/BUILD.gn +++ b/test/fuzztest/refreshactivity_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("RefreshActivityFuzzTest") { "./refreshactivity_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/releaserunninglock_fuzzer/BUILD.gn b/test/fuzztest/releaserunninglock_fuzzer/BUILD.gn index d258c055..e4e0f2c9 100644 --- a/test/fuzztest/releaserunninglock_fuzzer/BUILD.gn +++ b/test/fuzztest/releaserunninglock_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("ReleaseRunningLockFuzzTest") { "./releaserunninglock_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/resetrunninglocks_fuzzer/BUILD.gn b/test/fuzztest/resetrunninglocks_fuzzer/BUILD.gn index 0053f919..f0042f2b 100644 --- a/test/fuzztest/resetrunninglocks_fuzzer/BUILD.gn +++ b/test/fuzztest/resetrunninglocks_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("ResetRunningLocksFuzzTest") { "./resetrunninglocks_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/runninglockcallback_fuzzer/BUILD.gn b/test/fuzztest/runninglockcallback_fuzzer/BUILD.gn index 939f6e02..96a84929 100644 --- a/test/fuzztest/runninglockcallback_fuzzer/BUILD.gn +++ b/test/fuzztest/runninglockcallback_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("RunningLockCallbackFuzzTest") { "./runninglockcallback_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/screenstatecallback_fuzzer/BUILD.gn b/test/fuzztest/screenstatecallback_fuzzer/BUILD.gn index 79cccde9..a3190965 100644 --- a/test/fuzztest/screenstatecallback_fuzzer/BUILD.gn +++ b/test/fuzztest/screenstatecallback_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("ScreenStateCallbackFuzzTest") { "./screenstatecallback_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/setdisplaysuspend_fuzzer/BUILD.gn b/test/fuzztest/setdisplaysuspend_fuzzer/BUILD.gn index 36ba969b..4fe3f063 100644 --- a/test/fuzztest/setdisplaysuspend_fuzzer/BUILD.gn +++ b/test/fuzztest/setdisplaysuspend_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("SetDisplaySuspendFuzzTest") { "./setdisplaysuspend_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/setforcetimingout_fuzzer/BUILD.gn b/test/fuzztest/setforcetimingout_fuzzer/BUILD.gn index 06dc25a7..a2dd912e 100644 --- a/test/fuzztest/setforcetimingout_fuzzer/BUILD.gn +++ b/test/fuzztest/setforcetimingout_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("SetForceTimingOutFuzzTest") { "./setforcetimingout_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/setsuspendtag_fuzzer/BUILD.gn b/test/fuzztest/setsuspendtag_fuzzer/BUILD.gn index bc95a0c9..5f743cb3 100644 --- a/test/fuzztest/setsuspendtag_fuzzer/BUILD.gn +++ b/test/fuzztest/setsuspendtag_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("SetSuspendTagFuzzTest") { "./setsuspendtag_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/shelldump_fuzzer/BUILD.gn b/test/fuzztest/shelldump_fuzzer/BUILD.gn index c59d2dc8..c4354fdd 100644 --- a/test/fuzztest/shelldump_fuzzer/BUILD.gn +++ b/test/fuzztest/shelldump_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("ShellDumpFuzzTest") { "./shelldump_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/shutdowndevice_fuzzer/BUILD.gn b/test/fuzztest/shutdowndevice_fuzzer/BUILD.gn index 5ae48105..4f2b8db7 100644 --- a/test/fuzztest/shutdowndevice_fuzzer/BUILD.gn +++ b/test/fuzztest/shutdowndevice_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("ShutDownDeviceFuzzTest") { "./shutdowndevice_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/suspenddevice_fuzzer/BUILD.gn b/test/fuzztest/suspenddevice_fuzzer/BUILD.gn index 92414cb6..e9a31c31 100644 --- a/test/fuzztest/suspenddevice_fuzzer/BUILD.gn +++ b/test/fuzztest/suspenddevice_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("SuspendDeviceFuzzTest") { "./suspenddevice_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/synchibernatecallback_fuzzer/BUILD.gn b/test/fuzztest/synchibernatecallback_fuzzer/BUILD.gn index bf720f3f..f5134469 100644 --- a/test/fuzztest/synchibernatecallback_fuzzer/BUILD.gn +++ b/test/fuzztest/synchibernatecallback_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("SyncHibernateCallbackFuzzTest") { "./synchibernatecallback_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/syncshutdowncallback_fuzzer/BUILD.gn b/test/fuzztest/syncshutdowncallback_fuzzer/BUILD.gn index d4bac8fb..200865b3 100644 --- a/test/fuzztest/syncshutdowncallback_fuzzer/BUILD.gn +++ b/test/fuzztest/syncshutdowncallback_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("SyncShutdownCallbackFuzzTest") { "./syncshutdowncallback_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/syncsleepcallback_fuzzer/BUILD.gn b/test/fuzztest/syncsleepcallback_fuzzer/BUILD.gn index eeb07c11..4f2fdd5e 100644 --- a/test/fuzztest/syncsleepcallback_fuzzer/BUILD.gn +++ b/test/fuzztest/syncsleepcallback_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("SyncSleepCallbackFuzzTest") { "./syncsleepcallback_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/takeovershutdowncallback_fuzzer/BUILD.gn b/test/fuzztest/takeovershutdowncallback_fuzzer/BUILD.gn index 3fd51ece..81fcac99 100644 --- a/test/fuzztest/takeovershutdowncallback_fuzzer/BUILD.gn +++ b/test/fuzztest/takeovershutdowncallback_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("TakeOverShutdownCallbackFuzzTest") { "./takeovershutdowncallback_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/fuzztest/wakeupdevice_fuzzer/BUILD.gn b/test/fuzztest/wakeupdevice_fuzzer/BUILD.gn index 1dd3fe82..130c2541 100644 --- a/test/fuzztest/wakeupdevice_fuzzer/BUILD.gn +++ b/test/fuzztest/wakeupdevice_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("WakeupDeviceFuzzTest") { "./wakeupdevice_fuzzer_test.cpp", ] deps = [ - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/systemtest/BUILD.gn b/test/systemtest/BUILD.gn index 1725cc16..afc2715b 100644 --- a/test/systemtest/BUILD.gn +++ b/test/systemtest/BUILD.gn @@ -88,7 +88,7 @@ ohos_systemtest("ces_system") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -118,7 +118,7 @@ ohos_systemtest("test_power_mgr_mock_system") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -148,7 +148,7 @@ ohos_systemtest("test_power_mgr_powersavemode") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -178,7 +178,7 @@ ohos_systemtest("test_power_mgr_powersetdevicemode") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -211,7 +211,7 @@ ohos_systemtest("test_power_mgr_system") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -241,7 +241,7 @@ ohos_systemtest("test_power_mgr_shutdown_fast") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -271,7 +271,7 @@ ohos_systemtest("test_power_level_event_system_test_off") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -301,7 +301,7 @@ ohos_systemtest("test_power_level_event_system_test_on") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -330,7 +330,7 @@ ohos_systemtest("test_power_st_mgr_mock") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -359,7 +359,7 @@ ohos_systemtest("test_power_st_mgr_mock_suspend") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index e8f6036d..8a74ccad 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -110,7 +110,7 @@ ohos_unittest("test_power_mgr_client") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -146,7 +146,7 @@ ohos_unittest("test_register_callback_mode") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -174,7 +174,7 @@ ohos_unittest("test_power_get_mode") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -202,7 +202,7 @@ ohos_unittest("test_power_set_mode") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -268,7 +268,7 @@ ohos_unittest("test_running_lock") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_proxy", + "${powermgr_inner_api}:powermgr_proxy", "${powermgr_service_path}:powermgrservice", ] @@ -404,7 +404,7 @@ ohos_unittest("test_power_state_machine") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", ] @@ -431,7 +431,7 @@ ohos_unittest("test_power_mgr_mock") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -459,7 +459,7 @@ ohos_unittest("test_power_mgr_fail_check") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -630,8 +630,8 @@ ohos_unittest("test_power_mock_object") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_proxy", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_proxy", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", ] @@ -663,8 +663,8 @@ ohos_unittest("test_mock_parcel") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_proxy", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_proxy", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_utils_path}/permission:power_permission", ] @@ -696,8 +696,8 @@ ohos_unittest("test_mock_peer") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_proxy", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_proxy", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", ] @@ -734,8 +734,8 @@ ohos_unittest("test_mock_proxy") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_proxy", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_proxy", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", ] @@ -763,7 +763,7 @@ ohos_unittest("power_state_machine_native_test") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", ] @@ -791,7 +791,7 @@ ohos_unittest("test_running_lock_native") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", ] @@ -822,7 +822,7 @@ ohos_unittest("test_power_mgr_service_native") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", ] @@ -854,7 +854,7 @@ ohos_unittest("test_device_state_action_native") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", ] @@ -903,7 +903,7 @@ ohos_unittest("test_power_mgr_client_native") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", ] @@ -929,7 +929,7 @@ ohos_unittest("power_mode_module_native_test") { ] deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", ] external_deps = deps_ex @@ -961,7 +961,7 @@ ohos_unittest("test_running_lock_hub_native") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", ] @@ -988,7 +988,7 @@ ohos_unittest("test_running_lock_mock") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -1020,7 +1020,7 @@ ohos_unittest("test_power_suspend_parse") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", "${powermgr_utils_path}/setting:power_setting", @@ -1063,7 +1063,7 @@ ohos_unittest("test_power_wakeup_parse") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", "${powermgr_utils_path}/setting:power_setting", @@ -1107,7 +1107,7 @@ ohos_unittest("test_power_suspend_controller") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", "${powermgr_utils_path}/setting:power_setting", @@ -1155,7 +1155,7 @@ ohos_unittest("test_power_suspend") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", "${powermgr_utils_path}/setting:power_setting", @@ -1203,7 +1203,7 @@ ohos_unittest("test_power_wakeup_controller") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", "${powermgr_utils_path}/setting:power_setting", @@ -1249,7 +1249,7 @@ ohos_unittest("test_power_wakeup_controller_oninputevent") { "${powermgr_inner_api}:powermgr_client", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_utils_path}/setting:power_setting", ] @@ -1289,7 +1289,7 @@ ohos_unittest("test_power_wakeup") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", "${powermgr_utils_path}/setting:power_setting", @@ -1351,7 +1351,7 @@ ohos_unittest("test_power_getcontroller_mock") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", "${powermgr_utils_path}/permission:power_permission", @@ -1395,7 +1395,7 @@ ohos_unittest("test_power_screenon_mock") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", "${powermgr_utils_path}/permission:power_permission", @@ -1437,7 +1437,7 @@ ohos_unittest("test_power_parsesources_mock") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", "${powermgr_utils_path}/permission:power_permission", @@ -1481,7 +1481,7 @@ ohos_unittest("test_power_mgr_powerdialog") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", "${powermgr_utils_path}/param:power_sysparam", @@ -1516,7 +1516,7 @@ ohos_unittest("test_power_coordination_lock") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", ] @@ -1606,7 +1606,7 @@ ohos_unittest("test_power_config_parse") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", "${powermgr_service_path}/native/src/actions:powermgr_actions", "${powermgr_utils_path}/setting:power_setting", diff --git a/test/unittest/src/servicetest/BUILD.gn b/test/unittest/src/servicetest/BUILD.gn index 50057cd9..9156d44d 100644 --- a/test/unittest/src/servicetest/BUILD.gn +++ b/test/unittest/src/servicetest/BUILD.gn @@ -94,7 +94,7 @@ ohos_unittest("powermgr_native_test") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", ] @@ -134,7 +134,7 @@ ohos_unittest("powermgr_native_mock_parcel_test") { deps = [ "${powermgr_inner_api}:powermgr_client", - "${powermgr_service_zidl}:powermgr_stub", + "${powermgr_inner_api}:powermgr_stub", "${powermgr_service_path}:powermgrservice", ] -- Gitee