From 8595c2fdc5a87571c0674d668f3b6537d938b986 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Tue, 6 Sep 2022 14:40:18 +0800 Subject: [PATCH] =?UTF-8?q?BUILD.gn=E4=B8=AD=E5=8E=BB=E9=99=A4=E5=86=97?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- interfaces/inner_kits/BUILD.gn | 2 -- .../distributedhardwarefwkkit_fuzzer/BUILD.gn | 13 +------------ .../common/distributedhardwarefwkkit/BUILD.gn | 4 ---- .../distributedhardwarefwkservice/BUILD.gn | 10 +++------- .../distributed_hardware_manager_factory.cpp | 1 - .../fuzztest/accessmanager_fuzzer/BUILD.gn | 17 ++--------------- .../fuzztest/componentloader_fuzzer/BUILD.gn | 11 +---------- .../fuzztest/componentmanager_fuzzer/BUILD.gn | 11 ++--------- .../fuzztest/resourcemanager_fuzzer/BUILD.gn | 19 +++++-------------- .../test/fuzztest/task_fuzzer/BUILD.gn | 10 +--------- .../versioninfomanager_fuzzer/BUILD.gn | 18 ++++-------------- .../unittest/common/accessmanager/BUILD.gn | 16 ++++------------ .../unittest/common/componentloader/BUILD.gn | 6 ------ .../unittest/common/componentmanager/BUILD.gn | 10 +++------- .../distributedhardwaremanager/BUILD.gn | 10 +--------- .../distributedhardwareservice/BUILD.gn | 11 +---------- .../unittest/common/resourcemanager/BUILD.gn | 12 +++--------- .../common/versioninfomanager/BUILD.gn | 14 ++++---------- .../unittest/common/versionmanager/BUILD.gn | 7 ++----- utils/BUILD.gn | 5 ++--- 20 files changed, 39 insertions(+), 168 deletions(-) diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index 24bb4f56..3c78bfa8 100644 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -50,9 +50,7 @@ ohos_shared_library("libdhfwk_sdk") { external_deps = [ "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn index 19966eef..815c6b4f 100644 --- a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn @@ -43,12 +43,7 @@ ohos_fuzztest("DistributedHardwareFwkKitFuzzTest") { ] sources = [ "distributedhardwarefwkkit_fuzzer.cpp" ] - deps = [ - "${innerkits_path}:libdhfwk_sdk", - "${utils_path}:distributedhardwareutils", - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", - ] + deps = [ "${innerkits_path}:libdhfwk_sdk" ] defines = [ "HI_LOG_ENABLE", @@ -57,14 +52,8 @@ ohos_fuzztest("DistributedHardwareFwkKitFuzzTest") { ] external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "c_utils:utils", - "hisysevent_native:libhisysevent", - "init:libbegetutil", "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] } diff --git a/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn b/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn index 332e4afa..88a2f53a 100644 --- a/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn @@ -42,7 +42,6 @@ ohos_unittest("DistributedHardwareFwkKitTest") { deps = [ "${innerkits_path}:libdhfwk_sdk", - "${utils_path}:distributedhardwareutils", "//third_party/googletest:gtest_main", ] @@ -54,10 +53,7 @@ ohos_unittest("DistributedHardwareFwkKitTest") { external_deps = [ "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] } diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index eb4226e5..d3bc93dc 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -18,7 +18,10 @@ import( ohos_shared_library("distributedhardwarefwksvr") { include_dirs = [ + "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", + "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", "//commonlibrary/c_utils/base/include", + "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include", "//utils/system/safwk/native/include", "include", "include/accessmanager", @@ -80,8 +83,6 @@ ohos_shared_library("distributedhardwarefwksvr") { deps = [ "${utils_path}:distributedhardwareutils", - "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager:ability_manager", - "//foundation/ability/ability_runtime/services/abilitymgr:abilityms", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] @@ -93,13 +94,8 @@ ohos_shared_library("distributedhardwarefwksvr") { ] external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", - "hitrace_native:hitrace_meter", - "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "ipc:ipc_core", "kv_store:distributeddata_inner", diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp index eca8778d..03686484 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp @@ -22,7 +22,6 @@ #include #include "dm_device_info.h" -#include "hisysevent.h" #include "anonymous_string.h" #include "constants.h" diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn index 06ac5f64..abe2abd4 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn @@ -42,12 +42,7 @@ ohos_fuzztest("AccessmanagerFuzzTest") { ] sources = [ "accessmanager_fuzzer.cpp" ] - deps = [ - "${utils_path}:distributedhardwareutils", - "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", - ] + deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr" ] defines = [ "HI_LOG_ENABLE", @@ -55,15 +50,7 @@ ohos_fuzztest("AccessmanagerFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", - "hisysevent_native:libhisysevent", - "init:libbegetutil", - "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - ] + external_deps = [ "init:libbegetutil" ] } ############################################################################### diff --git a/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/BUILD.gn index b257a425..7eb1b468 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/BUILD.gn @@ -44,22 +44,13 @@ ohos_fuzztest("ComponentloaderFuzzTest") { ] sources = [ "componentloader_fuzzer.cpp" ] - deps = [ - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", - "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", - ] + deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr" ] defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"ComponentloaderFuzzTest\"", "LOG_DOMAIN=0xD004100", ] - - external_deps = [ - "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", - "kv_store:distributeddata_inner", - ] } ############################################################################### diff --git a/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn index da1d72f0..c7981ec7 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn @@ -33,6 +33,7 @@ ohos_fuzztest("ComponentmanagerFuzzTest") { "${common_path}/log/include", "//third_party/json/include", "//commonlibrary/c_utils/base/include", + "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] cflags = [ "-g", @@ -42,21 +43,13 @@ ohos_fuzztest("ComponentmanagerFuzzTest") { ] sources = [ "componentmanager_fuzzer.cpp" ] - deps = [ - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", - "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", - ] + deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr" ] defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"ComponentmanagerFuzzTest\"", "LOG_DOMAIN=0xD004100", ] - - external_deps = [ - "hisysevent_native:libhisysevent", - "ipc:ipc_core", - ] } ############################################################################### diff --git a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn index 74e6ad0e..cd2bba41 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn @@ -31,9 +31,11 @@ ohos_fuzztest("ResourcemanagerFuzzTest") { "${services_path}/distributedhardwarefwkservice/include/utils", "${common_path}/utils/include", "${common_path}/log/include", + "//base/notification/eventhandler/interfaces/inner_api", "//commonlibrary/c_utils/base/include", + "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", + "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include", "//third_party/json/include", - "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", ] cflags = [ @@ -44,10 +46,7 @@ ohos_fuzztest("ResourcemanagerFuzzTest") { ] sources = [ "resourcemanager_fuzzer.cpp" ] - deps = [ - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", - "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", - ] + deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr" ] defines = [ "HI_LOG_ENABLE", @@ -55,15 +54,7 @@ ohos_fuzztest("ResourcemanagerFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", - "c_utils:utils", - "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", - "hiviewdfx_hilog_native:libhilog", - "kv_store:distributeddata_inner", - ] + external_deps = [ "c_utils:utils" ] } ############################################################################### diff --git a/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/BUILD.gn index ffae50ef..30dd02cb 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/BUILD.gn @@ -42,21 +42,13 @@ ohos_fuzztest("TaskFuzzTest") { ] sources = [ "task_fuzzer.cpp" ] - deps = [ - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", - "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", - ] + deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr" ] defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"TaskFuzzTest\"", "LOG_DOMAIN=0xD004100", ] - - external_deps = [ - "hisysevent_native:libhisysevent", - "ipc:ipc_core", - ] } ############################################################################### diff --git a/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn index 7a1c5a30..9b71d23d 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn @@ -23,6 +23,8 @@ ohos_fuzztest("VersioninfoManagerFuzzTest") { fuzz_config_file = "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer" include_dirs = [ + "//base/notification/eventhandler/interfaces/inner_api", + "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include", "${utils_path}/include", "${utils_path}/include/log", "${utils_path}/include/eventbus", @@ -43,11 +45,7 @@ ohos_fuzztest("VersioninfoManagerFuzzTest") { ] sources = [ "versioninfomanager_fuzzer.cpp" ] - deps = [ - "${utils_path}:distributedhardwareutils", - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", - ] + deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr" ] defines = [ "HI_LOG_ENABLE", @@ -55,15 +53,7 @@ ohos_fuzztest("VersioninfoManagerFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", - "c_utils:utils", - "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", - "hiviewdfx_hilog_native:libhilog", - "kv_store:distributeddata_inner", - ] + external_deps = [ "c_utils:utils" ] } ############################################################################### diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index 75078689..212af2c6 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -19,6 +19,9 @@ module_out_path = "distributed_hardware_fwk/access_manager_test" config("module_private_config") { include_dirs = [ + "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", + "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", + "//base/notification/eventhandler/interfaces/inner_api", "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", @@ -50,7 +53,6 @@ ohos_unittest("AccessManagerTest") { "${utils_path}:distributedhardwareutils", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//third_party/googletest:gtest_main", ] defines = [ @@ -59,17 +61,7 @@ ohos_unittest("AccessManagerTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", - "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", - "hitrace_native:hitrace_meter", - "init:libbegetutil", - "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - ] + external_deps = [ "init:libbegetutil" ] } group("unittest") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn index ff7e1f00..55056e87 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn @@ -47,12 +47,6 @@ ohos_unittest("ComponentLoaderTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ - "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", - "kv_store:distributeddata_inner", - ] - defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"ComponentLoaderTest\"", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn index 0fe794d6..ac41e439 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn @@ -20,6 +20,9 @@ module_out_path = "distributed_hardware_fwk/component_manager_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ + "//base/notification/eventhandler/interfaces/inner_api", + "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", + "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include", "include", "${utils_path}/include", "${utils_path}/include/log", @@ -56,13 +59,6 @@ ohos_unittest("ComponentManagerTest") { "DH_LOG_TAG=\"ComponentManagerTest\"", "LOG_DOMAIN=0xD004100", ] - - external_deps = [ - "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", - "ipc:ipc_core", - "kv_store:distributeddata_inner", - ] } group("component_manager_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn index 1027b085..ecf7d4aa 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn @@ -20,6 +20,7 @@ module_out_path = "distributed_hardware_fwk/dh_manager_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ + "//base/notification/eventhandler/interfaces/inner_api", "include", "${utils_path}/include", "${utils_path}/include/log", @@ -43,7 +44,6 @@ ohos_unittest("DistributedHardwareManagerTest") { deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", - "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] @@ -53,14 +53,6 @@ ohos_unittest("DistributedHardwareManagerTest") { "DH_LOG_TAG=\"DistributedHardwareManagerTest\"", "LOG_DOMAIN=0xD004100", ] - - external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", - "dsoftbus:softbus_client", - "eventhandler:libeventhandler", - "hiviewdfx_hilog_native:libhilog", - ] } 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 543fd5cc..66965cda 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn @@ -31,6 +31,7 @@ config("module_private_config") { "${services_path}/distributedhardwarefwkservice/include/utils", "//third_party/json/include", "//commonlibrary/c_utils/base/include", + "//base/notification/eventhandler/interfaces/inner_api", ] } @@ -43,7 +44,6 @@ ohos_unittest("DistributedHardwareServiceTest") { deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", - "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] @@ -55,18 +55,9 @@ ohos_unittest("DistributedHardwareServiceTest") { ] external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "c_utils:utils", - "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", - "hitrace_native:hitrace_meter", - "hiviewdfx_hilog_native:libhilog", - "init:libbegetutil", "ipc:ipc_core", - "kv_store:distributeddata_inner", "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn index 6fd96114..ecc7de1a 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn @@ -20,6 +20,8 @@ module_out_path = "distributed_hardware_fwk/resource_manager_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ + "//base/notification/eventhandler/interfaces/inner_api", + "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include", "include", "${utils_path}/include", "${utils_path}/include/log", @@ -50,15 +52,7 @@ ohos_unittest("ResourceManagerTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", - "c_utils:utils", - "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", - "hiviewdfx_hilog_native:libhilog", - "kv_store:distributeddata_inner", - ] + external_deps = [ "c_utils:utils" ] } group("resource_manager_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn index 4abe5dec..c2562bac 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn @@ -30,8 +30,10 @@ config("module_private_config") { "${services_path}/distributedhardwarefwkservice/include/versionmanager", "${common_path}/utils/include", "${common_path}/log/include", - "//third_party/json/include", + "//base/notification/eventhandler/interfaces/inner_api", "//commonlibrary/c_utils/base/include", + "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include", + "//third_party/json/include", "//utils/system/safwk/native/include", ] } @@ -53,15 +55,7 @@ ohos_unittest("VersioninfoManagerTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", - "c_utils:utils", - "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", - "hiviewdfx_hilog_native:libhilog", - "kv_store:distributeddata_inner", - ] + external_deps = [ "c_utils:utils" ] } group("versioninfo_manager_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn index 9435ce6a..d55ea127 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn @@ -20,6 +20,8 @@ module_out_path = "distributed_hardware_fwk/version_manager_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ + "//base/notification/eventhandler/interfaces/inner_api", + "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include", "include", "${utils_path}/include", "${utils_path}/include/eventbus", @@ -48,11 +50,6 @@ ohos_unittest("VersionManagerTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ - "eventhandler:libeventhandler", - "kv_store:distributeddata_inner", - ] - defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"VersionManagerTest\"", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 0ebf6958..789d4a80 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -17,6 +17,8 @@ import( ohos_shared_library("distributedhardwareutils") { include_dirs = [ + "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", + "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", "//third_party/openssl:libcrypto_static", "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", @@ -44,11 +46,8 @@ ohos_shared_library("distributedhardwareutils") { ] external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "c_utils:utils", "dsoftbus:softbus_client", - "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", -- Gitee