From 6e41fe246ae0fababc7ad400d35484c6d0c24abf Mon Sep 17 00:00:00 2001 From: junyi233 Date: Sun, 24 Apr 2022 10:53:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=965.0=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=8C=85=E7=AE=A1=E7=90=86=E4=BE=9D=E8=B5=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: junyi233 --- test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn | 4 +--- test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn | 3 --- test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn | 3 --- test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn | 3 --- test/fuzztest/ipccmdregister_fuzzer/BUILD.gn | 3 --- test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn | 3 --- test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn | 3 --- test/fuzztest/ipcserverstub_fuzzer/BUILD.gn | 3 --- .../fuzztest/nativedevicemanagerjs_fuzzer/BUILD.gn | 3 --- test/unittest/BUILD.gn | 14 +++++++++++--- 10 files changed, 12 insertions(+), 30 deletions(-) diff --git a/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn b/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn index 4a669037b..38fe7317d 100644 --- a/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn +++ b/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn @@ -57,12 +57,9 @@ ohos_fuzztest("DeviceManagerImplFuzzTest") { "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", "//foundation/distributedhardware/devicemanager/test/unittest/mock", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "//foundation/distributedhardware/devicemanager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/distributedhardware/devicemanager/ext/mini/common/include", "//base/security/deviceauth/interfaces/innerkits", "${services_path}/include/ability", @@ -113,6 +110,7 @@ ohos_fuzztest("DeviceManagerImplFuzzTest") { external_deps = [ "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "ipc:ipc_core", diff --git a/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn b/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn index 81c5b2a5f..69548dff3 100644 --- a/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn +++ b/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn @@ -55,12 +55,9 @@ ohos_fuzztest("DeviceManagerNotifyFuzzTest") { "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", "//foundation/distributedhardware/devicemanager/test/unittest/mock", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "//foundation/distributedhardware/devicemanager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/distributedhardware/devicemanager/ext/mini/common/include", "//base/security/deviceauth/interfaces/innerkits", "${services_path}/include/ability", diff --git a/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn b/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn index ada13c730..d439df5b0 100644 --- a/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn +++ b/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn @@ -55,12 +55,9 @@ ohos_fuzztest("DeviceManagerServiceFuzzTest") { "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", "//foundation/distributedhardware/devicemanager/test/unittest/mock", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "//foundation/distributedhardware/devicemanager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/distributedhardware/devicemanager/ext/mini/common/include", "//base/security/deviceauth/interfaces/innerkits", "${services_path}/include/ability", diff --git a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn index 52efb6e4b..d2fb15d64 100644 --- a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn @@ -56,12 +56,9 @@ ohos_fuzztest("IpcClientManagerFuzzTest") { "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", "//foundation/distributedhardware/devicemanager/test/unittest/mock", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "//foundation/distributedhardware/devicemanager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/distributedhardware/devicemanager/ext/mini/common/include", "//base/security/deviceauth/interfaces/innerkits", "${services_path}/include/ability", diff --git a/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn b/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn index 02ed42753..f5aace22f 100644 --- a/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn +++ b/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn @@ -56,12 +56,9 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") { "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", "//foundation/distributedhardware/devicemanager/test/unittest/mock", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "//foundation/distributedhardware/devicemanager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/distributedhardware/devicemanager/ext/mini/common/include", "//base/security/deviceauth/interfaces/innerkits", "${services_path}/include/ability", diff --git a/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn b/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn index 330bffd6b..c4b3946c6 100644 --- a/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn @@ -56,12 +56,9 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") { "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", "//foundation/distributedhardware/devicemanager/test/unittest/mock", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "//foundation/distributedhardware/devicemanager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/distributedhardware/devicemanager/ext/mini/common/include", "//base/security/deviceauth/interfaces/innerkits", "${services_path}/include/ability", diff --git a/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn b/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn index 804d2b453..d40e6c7cd 100644 --- a/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn @@ -56,12 +56,9 @@ ohos_fuzztest("IpcServerListenerFuzzTest") { "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", "//foundation/distributedhardware/devicemanager/test/unittest/mock", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "//foundation/distributedhardware/devicemanager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/distributedhardware/devicemanager/ext/mini/common/include", "//base/security/deviceauth/interfaces/innerkits", "${services_path}/include/ability", diff --git a/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn b/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn index dabc2a15f..d23d8906e 100644 --- a/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn @@ -56,12 +56,9 @@ ohos_fuzztest("IpcServerStubFuzzTest") { "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", "//foundation/distributedhardware/devicemanager/test/unittest/mock", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "//foundation/distributedhardware/devicemanager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/distributedhardware/devicemanager/ext/mini/common/include", "//base/security/deviceauth/interfaces/innerkits", "${services_path}/include/ability", diff --git a/test/fuzztest/nativedevicemanagerjs_fuzzer/BUILD.gn b/test/fuzztest/nativedevicemanagerjs_fuzzer/BUILD.gn index 1659eca5b..19fa3fb39 100644 --- a/test/fuzztest/nativedevicemanagerjs_fuzzer/BUILD.gn +++ b/test/fuzztest/nativedevicemanagerjs_fuzzer/BUILD.gn @@ -56,12 +56,9 @@ ohos_fuzztest("NativeDevicemanagerJsFuzzTest") { "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", "//foundation/distributedhardware/devicemanager/test/unittest/mock", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "//foundation/distributedhardware/devicemanager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/distributedhardware/devicemanager/ext/mini/common/include", "//base/security/deviceauth/interfaces/innerkits", "${services_path}/include/ability", diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 67ec39b7b..8d76c8f46 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -279,6 +279,11 @@ ohos_unittest("UTTest_profile_connector") { sources = [ "UTTest_profile_connector.cpp" ] deps = [ ":device_manager_test_common" ] + external_deps = [ + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", + "eventhandler:libeventhandler", + ] } ## UnitTest UTTest_profile_connector }}} @@ -290,6 +295,12 @@ ohos_unittest("UTTest_device_profile_adapter") { sources = [ "UTTest_device_profile_adapter.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", + "eventhandler:libeventhandler", + ] } ## UnitTest UTTest_device_profile_adapter }}} @@ -477,12 +488,9 @@ config("device_manager_test_common_public_config") { "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", "//foundation/distributedhardware/devicemanager/test/unittest/mock", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", "//foundation/distributedhardware/devicemanager/ext/mini/services/devicemanagerservice/include/dispatch", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "//foundation/distributedhardware/devicemanager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/distributedhardware/devicemanager/ext/mini/common/include", "//base/security/deviceauth/interfaces/innerkits", "${services_path}/include/ability", -- Gitee