From 1f9beb92e1d232aaa2c6218e3fc74c4f5e51bfec Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 1 Sep 2022 15:21:30 +0800 Subject: [PATCH 01/13] =?UTF-8?q?BUILD.gn=E4=B8=AD=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=86=97=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 -- services/distributedhardwarefwkservice/BUILD.gn | 7 ------- utils/BUILD.gn | 3 --- 3 files changed, 12 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/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index eb4226e5..b6199a09 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -80,8 +80,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 +91,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/utils/BUILD.gn b/utils/BUILD.gn index 0ebf6958..0c694346 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -44,11 +44,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 From d4cf195423da9b0cf042ca2386dcb65b967b3091 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Fri, 2 Sep 2022 10:35:41 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=20BUILD.gn=E4=B8=AD=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=86=97=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 --- services/distributedhardwarefwkservice/BUILD.gn | 2 ++ .../src/distributed_hardware_manager_factory.cpp | 1 - utils/BUILD.gn | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index b6199a09..a7048362 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -18,6 +18,8 @@ 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", "//utils/system/safwk/native/include", "include", 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/utils/BUILD.gn b/utils/BUILD.gn index 0c694346..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", -- Gitee From 7bc45d1764fb56ddb0a17b662c72d40a4a0c3056 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 5 Sep 2022 16:05:56 +0800 Subject: [PATCH 03/13] =?UTF-8?q?BUILD.gn=E4=B8=AD=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=86=97=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 --- .../distributedhardwarefwkkit_fuzzer/BUILD.gn | 9 --------- .../common/distributedhardwarefwkkit/BUILD.gn | 4 ---- services/distributedhardwarefwkservice/BUILD.gn | 1 + .../test/fuzztest/accessmanager_fuzzer/BUILD.gn | 9 --------- .../test/fuzztest/componentloader_fuzzer/BUILD.gn | 11 +---------- .../fuzztest/componentmanager_fuzzer/BUILD.gn | 10 +--------- .../test/fuzztest/resourcemanager_fuzzer/BUILD.gn | 15 ++------------- .../test/fuzztest/task_fuzzer/BUILD.gn | 10 +--------- .../fuzztest/versioninfomanager_fuzzer/BUILD.gn | 14 +++----------- .../test/unittest/common/accessmanager/BUILD.gn | 14 ++------------ .../test/unittest/common/componentloader/BUILD.gn | 6 ------ .../unittest/common/componentmanager/BUILD.gn | 9 ++------- .../common/distributedhardwaremanager/BUILD.gn | 10 +--------- .../common/distributedhardwareservice/BUILD.gn | 10 ---------- .../test/unittest/common/resourcemanager/BUILD.gn | 11 ++--------- .../unittest/common/versioninfomanager/BUILD.gn | 13 +++---------- .../test/unittest/common/versionmanager/BUILD.gn | 7 ++----- 17 files changed, 21 insertions(+), 142 deletions(-) diff --git a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn index 19966eef..a7e526bd 100644 --- a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn @@ -45,9 +45,6 @@ ohos_fuzztest("DistributedHardwareFwkKitFuzzTest") { 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", ] defines = [ @@ -57,14 +54,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 a7048362..d3bc93dc 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -21,6 +21,7 @@ ohos_shared_library("distributedhardwarefwksvr") { "//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", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn index 06ac5f64..b569758a 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn @@ -43,10 +43,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", ] defines = [ @@ -56,13 +53,7 @@ ohos_fuzztest("AccessmanagerFuzzTest") { ] 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", ] } 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..1e8c95ac 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn @@ -42,21 +42,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..764e77b0 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn @@ -44,10 +44,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 +52,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..b9cda241 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", @@ -56,13 +54,7 @@ ohos_fuzztest("VersioninfoManagerFuzzTest") { ] 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", ] } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index 75078689..97fc6a71 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -19,6 +19,7 @@ module_out_path = "distributed_hardware_fwk/access_manager_test" config("module_private_config") { include_dirs = [ + "//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 +51,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 +59,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..ee3a4252 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn @@ -20,6 +20,8 @@ module_out_path = "distributed_hardware_fwk/component_manager_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ + "//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 +58,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..1816ffdb 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn @@ -43,7 +43,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 +54,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..40823c02 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn @@ -20,6 +20,7 @@ module_out_path = "distributed_hardware_fwk/resource_manager_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ + "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include", "include", "${utils_path}/include", "${utils_path}/include/log", @@ -50,15 +51,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..11f7ddbe 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn @@ -30,8 +30,9 @@ config("module_private_config") { "${services_path}/distributedhardwarefwkservice/include/versionmanager", "${common_path}/utils/include", "${common_path}/log/include", - "//third_party/json/include", "//commonlibrary/c_utils/base/include", + "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include", + "//third_party/json/include", "//utils/system/safwk/native/include", ] } @@ -53,15 +54,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\"", -- Gitee From 6c713a442bd962b0c15267bb92553493398058ad Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 5 Sep 2022 16:37:09 +0800 Subject: [PATCH 04/13] =?UTF-8?q?BUILD.gn=E4=B8=AD=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=86=97=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 --- .../test/fuzztest/componentmanager_fuzzer/BUILD.gn | 1 + .../test/fuzztest/resourcemanager_fuzzer/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn index 1e8c95ac..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", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn index 764e77b0..2b1d97c1 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn @@ -32,8 +32,8 @@ ohos_fuzztest("ResourcemanagerFuzzTest") { "${common_path}/utils/include", "${common_path}/log/include", "//commonlibrary/c_utils/base/include", + "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include", "//third_party/json/include", - "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", ] cflags = [ -- Gitee From 44010d0ac050d83489175e5e13d12935f13cee5e Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 5 Sep 2022 16:45:34 +0800 Subject: [PATCH 05/13] =?UTF-8?q?BUILD.gn=E4=B8=AD=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=86=97=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 --- .../test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn index a7e526bd..815c6b4f 100644 --- a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn @@ -43,9 +43,7 @@ ohos_fuzztest("DistributedHardwareFwkKitFuzzTest") { ] sources = [ "distributedhardwarefwkkit_fuzzer.cpp" ] - deps = [ - "${innerkits_path}:libdhfwk_sdk", - ] + deps = [ "${innerkits_path}:libdhfwk_sdk" ] defines = [ "HI_LOG_ENABLE", -- Gitee From e0b4e55f3a3e5315f12166665db5d8f5ebdc2715 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 5 Sep 2022 16:56:59 +0800 Subject: [PATCH 06/13] =?UTF-8?q?BUILD.gn=E4=B8=AD=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=86=97=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 --- .../test/fuzztest/accessmanager_fuzzer/BUILD.gn | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn index b569758a..abe2abd4 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn @@ -42,9 +42,7 @@ ohos_fuzztest("AccessmanagerFuzzTest") { ] sources = [ "accessmanager_fuzzer.cpp" ] - deps = [ - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", - ] + deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr" ] defines = [ "HI_LOG_ENABLE", @@ -52,9 +50,7 @@ ohos_fuzztest("AccessmanagerFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ - "init:libbegetutil", - ] + external_deps = [ "init:libbegetutil" ] } ############################################################################### -- Gitee From c50084dc5794a66b142a98fdde6325d9ee22e852 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 5 Sep 2022 17:02:24 +0800 Subject: [PATCH 07/13] =?UTF-8?q?BUILD.gn=E4=B8=AD=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=86=97=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 --- .../test/fuzztest/versioninfomanager_fuzzer/BUILD.gn | 4 +--- .../test/unittest/common/versioninfomanager/BUILD.gn | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn index b9cda241..9b71d23d 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn @@ -53,9 +53,7 @@ ohos_fuzztest("VersioninfoManagerFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ - "c_utils:utils", - ] + external_deps = [ "c_utils:utils" ] } ############################################################################### diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn index 11f7ddbe..c2562bac 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn @@ -30,6 +30,7 @@ config("module_private_config") { "${services_path}/distributedhardwarefwkservice/include/versionmanager", "${common_path}/utils/include", "${common_path}/log/include", + "//base/notification/eventhandler/interfaces/inner_api", "//commonlibrary/c_utils/base/include", "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include", "//third_party/json/include", -- Gitee From d47db9df1a104f6dcd70f5490b0316da31acd537 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 5 Sep 2022 17:25:55 +0800 Subject: [PATCH 08/13] =?UTF-8?q?BUILD.gn=E4=B8=AD=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=86=97=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 --- .../test/unittest/common/componentmanager/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn index ee3a4252..ac41e439 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn @@ -20,6 +20,7 @@ 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", -- Gitee From e6b0ccb2ffeb85f5a541effb406a84995ef71b30 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 5 Sep 2022 17:36:02 +0800 Subject: [PATCH 09/13] =?UTF-8?q?BUILD.gn=E4=B8=AD=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=86=97=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 --- .../test/unittest/common/resourcemanager/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn index 40823c02..ecc7de1a 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn @@ -20,6 +20,7 @@ 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", -- Gitee From 1f0022b34d69553ebe55540a69ef10f40079e3f9 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 5 Sep 2022 18:11:09 +0800 Subject: [PATCH 10/13] =?UTF-8?q?BUILD.gn=E4=B8=AD=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=86=97=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 --- .../test/fuzztest/resourcemanager_fuzzer/BUILD.gn | 2 ++ .../test/unittest/common/accessmanager/BUILD.gn | 1 + 2 files changed, 3 insertions(+) diff --git a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn index 2b1d97c1..cd2bba41 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn @@ -31,7 +31,9 @@ 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", "//utils/system/safwk/native/include", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index 97fc6a71..bd5d8d2a 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -19,6 +19,7 @@ module_out_path = "distributed_hardware_fwk/access_manager_test" config("module_private_config") { include_dirs = [ + "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", "//base/notification/eventhandler/interfaces/inner_api", "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", -- Gitee From b58d119fc95dead48a43f4c0099400dfc80c72f5 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Tue, 6 Sep 2022 09:03:44 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=20BUILD.gn=E4=B8=AD=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=86=97=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 --- .../test/unittest/common/accessmanager/BUILD.gn | 1 + .../test/unittest/common/distributedhardwareservice/BUILD.gn | 1 + 2 files changed, 2 insertions(+) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index bd5d8d2a..212af2c6 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -20,6 +20,7 @@ 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", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn index 1816ffdb..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", ] } -- Gitee From d3e8868158838448f6d74f81107a9dcc72dc0ef9 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Tue, 6 Sep 2022 17:00:13 +0800 Subject: [PATCH 12/13] =?UTF-8?q?BUILD.gn=E4=B8=AD=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=86=97=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 --- .../test/unittest/common/accessmanager/access_manager_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp index 8f732ff7..9f90ccd8 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp @@ -248,4 +248,4 @@ HWTEST_F(AccessManagerTest, AccessManagerUnInit, TestSize.Level0) EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->UnInit()); } } // namespace DistributedHardware -} // namespace OHOS +} // namespace OHOS \ No newline at end of file -- Gitee From 84e2b58a0d710610b32895a3b8d539c440e933d5 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 22 Sep 2022 20:59:58 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=8E=92=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- .../include/distributed_hardware_errno.h | 4 +++ .../src/ipc/distributed_hardware_proxy.cpp | 26 +++++++---------- .../include/resourcemanager/version_info.h | 2 +- .../src/componentloader/component_loader.cpp | 7 ++++- .../componentmanager/component_manager.cpp | 19 +++++++++++++ .../src/resourcemanager/capability_info.cpp | 7 ++++- .../capability_info_manager.cpp | 8 ++++++ .../src/resourcemanager/capability_utils.cpp | 5 ++++ .../src/resourcemanager/version_info.cpp | 9 ++++-- .../resourcemanager/version_info_manager.cpp | 28 +++++++++++++------ .../src/task/monitor_task_timer.cpp | 5 ++++ .../src/task/task_board.cpp | 3 ++ utils/include/eventbus/event_bus.h | 4 ++- 13 files changed, 96 insertions(+), 31 deletions(-) diff --git a/common/utils/include/distributed_hardware_errno.h b/common/utils/include/distributed_hardware_errno.h index 224e6be5..64046d93 100644 --- a/common/utils/include/distributed_hardware_errno.h +++ b/common/utils/include/distributed_hardware_errno.h @@ -29,6 +29,7 @@ namespace DistributedHardware { constexpr int32_t ERR_DH_FWK_REMOTE_NETWORK_ID_IS_EMPTY = -10001; constexpr int32_t ERR_DH_FWK_REMOTE_DEVICE_ID_IS_EMPTY = -10002; constexpr int32_t ERR_DH_FWK_TYPE_NOT_EXIST = -10003; + constexpr int32_t ERR_DH_FWK_JSON_PARSE_FAILED = -10004; /* VersionManager errno, range: [-10200, -10299] */ constexpr int32_t ERR_DH_FWK_VERSION_DEVICE_ID_NOT_EXIST = -10200; @@ -45,6 +46,7 @@ namespace DistributedHardware { constexpr int32_t ERR_DH_FWK_COMPONENT_GET_REMOTE_SA_FAILED = -10008; constexpr int32_t ERR_DH_FWK_COMPONENT_GET_SINK_VERSION_FAILED = -10009; constexpr int32_t ERR_DH_FWK_COMPONENT_DHTYPE_NOT_FOUND = -10010; + constexpr int32_t ERR_DH_FWK_COMPONENT_MONITOR_NULL = -10011; /* ResourceManager errno, range: [-10400, -10499] */ constexpr int32_t ERR_DH_FWK_RESOURCE_DB_ADAPTER_POINTER_NULL = -10400; @@ -61,6 +63,7 @@ namespace DistributedHardware { constexpr int32_t ERR_DH_FWK_RESOURCE_SYNC_VERSIONINFO_FAIL = -10411; constexpr int32_t ERR_DH_FWK_RESOURCE_DEVICE_ID_NOT_EXIST = -10412; constexpr int32_t ERR_DH_FWK_RESOURCE_UUID_NOT_FOUND = -10413; + constexpr int32_t ERR_DH_FWK_RESOURCE_CAPINFO_POINTER_NULL = -10414; /* DistributedHardwareManager errno, range: [-10500, -10599] */ constexpr int32_t ERR_DH_FWK_HARDWARE_MANAGER_DEVICE_REPEAT_ONLINE = -10500; @@ -85,6 +88,7 @@ namespace DistributedHardware { constexpr int32_t ERR_DH_FWK_SERVICE_WRITE_TOKEN_FAIL = -10805; constexpr int32_t ERR_DH_FWK_SERVICE_REMOTE_IS_NULL = -10806; constexpr int32_t ERR_DH_FWK_SERVICE_WRITE_INFO_FAIL = -10807; + constexpr int32_t ERR_DH_FWK_PUBLISHER_LISTENER_IS_NULL = -10808; /* AccessManager errno, range: [-10900, -10999] */ constexpr int32_t ERR_DH_FWK_ACCESS_INIT_DM_FAILED = -10900; diff --git a/interfaces/inner_kits/src/ipc/distributed_hardware_proxy.cpp b/interfaces/inner_kits/src/ipc/distributed_hardware_proxy.cpp index c47f2a5a..219eb5b5 100644 --- a/interfaces/inner_kits/src/ipc/distributed_hardware_proxy.cpp +++ b/interfaces/inner_kits/src/ipc/distributed_hardware_proxy.cpp @@ -36,6 +36,11 @@ const std::unordered_set DH_TYPE_SET { int32_t DistributedHardwareProxy::RegisterPublisherListener(const DHTopic topic, const sptr &listener) { + if (listener == nullptr) { + DHLOGE("publisher listener is null"); + return ERR_DH_FWK_PUBLISHER_LISTENER_IS_NULL; + } + sptr remote = Remote(); if (remote == nullptr) { DHLOGE("remote service is null"); @@ -76,6 +81,11 @@ int32_t DistributedHardwareProxy::RegisterPublisherListener(const DHTopic topic, int32_t DistributedHardwareProxy::UnregisterPublisherListener(const DHTopic topic, const sptr &listener) { + if (listener == nullptr) { + DHLOGE("publisher listener is null"); + return ERR_DH_FWK_PUBLISHER_LISTENER_IS_NULL; + } + sptr remote = Remote(); if (remote == nullptr) { DHLOGE("remote service is null"); @@ -151,21 +161,5 @@ int32_t DistributedHardwareProxy::PublishMessage(const DHTopic topic, const std: return ret; } - -void from_json(const nlohmann::json &jsonObj, std::unordered_map &versionMap) -{ - for (const auto &item : jsonObj.value(DH_COMPONENT_VERSIONS, nlohmann::json {})) { - DHType dhType = (DH_TYPE_SET.find(item.value(DH_COMPONENT_TYPE, DHType::UNKNOWN)) != DH_TYPE_SET.end()) ? - item.value(DH_COMPONENT_TYPE, DHType::UNKNOWN) : - DHType::UNKNOWN; - std::string sinkVersion = item.value(DH_COMPONENT_SINK_VER, DH_COMPONENT_DEFAULT_VERSION); - versionMap.emplace(std::pair(dhType, sinkVersion)); - } -} - -std::unordered_map DistributedHardwareProxy::FromJson(const std::string &json) const -{ - return nlohmann::json::parse(json).get>(); -} } // namespace DistributedHardware } // namespace OHOS diff --git a/services/distributedhardwarefwkservice/include/resourcemanager/version_info.h b/services/distributedhardwarefwkservice/include/resourcemanager/version_info.h index 08909227..0bfa76b0 100644 --- a/services/distributedhardwarefwkservice/include/resourcemanager/version_info.h +++ b/services/distributedhardwarefwkservice/include/resourcemanager/version_info.h @@ -27,7 +27,7 @@ struct VersionInfo { std::string dhVersion; std::unordered_map compVersions; - void FromJsonString(const std::string &jsonStr); + int32_t FromJsonString(const std::string &jsonStr); std::string ToJsonString() const; }; diff --git a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp index 69f7d300..9308e3a9 100644 --- a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp +++ b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp @@ -128,7 +128,12 @@ CompVersion ComponentLoader::GetCompVersionFromComConfig(const CompConfig& cCfg) int32_t ComponentLoader::GetCompPathAndVersion(const std::string &jsonStr, std::map &dhtypeMap) { - auto jsonCfg = json::parse(jsonStr); + auto jsonCfg = json::parse(jsonStr, nullptr, false); + if (jsonCfg.is_discarded()) { + DHLOGE("jsonStr parse failed"); + return ERR_DH_FWK_JSON_PARSE_FAILED; + } + if (jsonCfg.find(COMPONENTSLOAD_DISTRIBUTED_COMPONENTS) == jsonCfg.end()) { DHLOGE("not find distributed_components"); return ERR_DH_FWK_PARA_INVALID; diff --git a/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp b/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp index d9ae9c92..e07a9a54 100644 --- a/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp +++ b/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp @@ -84,6 +84,10 @@ int32_t ComponentManager::Init() return ERR_DH_FWK_COMPONENT_INIT_SINK_FAILED; } + if (compMonitorPtr_ == nullptr) { + DHLOGE("compMonitorPtr_ is null."); + return ERR_DH_FWK_COMPONENT_MONITOR_NULL; + } for (const auto &comp : compSource_) { if (compSrcSaId_.find(comp.first) == compSrcSaId_.end()) { continue; @@ -113,6 +117,10 @@ int32_t ComponentManager::Init() int32_t ComponentManager::UnInit() { DHLOGI("start."); + if (compMonitorPtr_ == nullptr) { + DHLOGE("compMonitorPtr_ is null."); + return ERR_DH_FWK_COMPONENT_MONITOR_NULL; + } for (const auto &comp : compSource_) { if (compSrcSaId_.find(comp.first) == compSrcSaId_.end()) { continue; @@ -331,6 +339,10 @@ int32_t ComponentManager::Enable(const std::string &networkId, const std::string } auto compEnable = std::make_shared(); + if (compEnable == nullptr) { + DHLOGE("compEnable is null"); + return ERR_DH_FWK_PARA_INVALID; + } auto result = compEnable->Enable(networkId, dhId, param, find->second); if (result != DH_FWK_SUCCESS) { for (int32_t retryCount = 0; retryCount < ENABLE_RETRY_MAX_TIMES; retryCount++) { @@ -364,6 +376,10 @@ int32_t ComponentManager::Disable(const std::string &networkId, const std::strin } auto compDisable = std::make_shared(); + if (compDisable == nullptr) { + DHLOGE("compDisable is null"); + return ERR_DH_FWK_PARA_INVALID; + } auto result = compDisable->Disable(networkId, dhId, find->second); if (result != DH_FWK_SUCCESS) { for (int32_t retryCount = 0; retryCount < DISABLE_RETRY_MAX_TIMES; retryCount++) { @@ -532,6 +548,9 @@ void ComponentManager::RecoverDistributedHardware(DHType dhType) CapabilityInfoMap capabilityMap; CapabilityInfoManager::GetInstance()->GetDataByDHType(dhType, capabilityMap); for (const auto &capInfo : capabilityMap) { + if (capInfo.second == nullptr) { + continue; + } std::string uuid = DHContext::GetInstance().GetUUIDByDeviceId(capInfo.second->GetDeviceId()); if (uuid.empty()) { DHLOGE("Can not find uuid by capability deviceId: %s", diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/capability_info.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info.cpp index 50eefa1a..fb2783f0 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/capability_info.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info.cpp @@ -109,7 +109,12 @@ std::string CapabilityInfo::GetAnonymousKey() const int32_t CapabilityInfo::FromJsonString(const std::string &jsonStr) { - nlohmann::json jsonObj = nlohmann::json::parse(jsonStr); + nlohmann::json jsonObj = nlohmann::json::parse(jsonStr, nullptr, false); + if (jsonObj.is_discarded()) { + DHLOGE("jsonStr parse failed"); + return ERR_DH_FWK_JSON_PARSE_FAILED; + } + FromJson(jsonObj, *this); return DH_FWK_SUCCESS; } diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp index faf56955..bc351d38 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp @@ -58,6 +58,10 @@ int32_t CapabilityInfoManager::Init() DHLOGI("CapabilityInfoManager instance init!"); std::lock_guard lock(capInfoMgrMutex_); dbAdapterPtr_ = std::make_shared(APP_ID, GLOBAL_CAPABILITY_ID, shared_from_this()); + if (dbAdapterPtr_ == nullptr) { + DHLOGE("dbAdapterPtr_ is null"); + return ERR_DH_FWK_RESOURCE_DB_ADAPTER_POINTER_NULL; + } if (dbAdapterPtr_->Init() != DH_FWK_SUCCESS) { DHLOGE("Init dbAdapterPtr_ failed"); return ERR_DH_FWK_RESOURCE_INIT_DB_FAILED; @@ -432,6 +436,10 @@ void CapabilityInfoManager::HandleCapabilityDeleteChange(const std::vector &cap, const CapabilityInfoFilter &filter, const std::string &value) { + if (cap == nullptr) { + return false; + } + bool isMatch = false; switch (filter) { case CapabilityInfoFilter::FILTER_DH_ID: { diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/capability_utils.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/capability_utils.cpp index 21dc4259..19d5d292 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/capability_utils.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/capability_utils.cpp @@ -17,6 +17,7 @@ #include "capability_info.h" #include "constants.h" +#include "distributed_hardware_errno.h" #include "distributed_hardware_log.h" namespace OHOS { @@ -27,6 +28,10 @@ namespace DistributedHardware { int32_t CapabilityUtils::GetCapabilityByValue(const std::string &value, std::shared_ptr &capPtr) { capPtr = std::make_shared(); + if (capPtr == nullptr) { + DHLOGE("capPtr is null"); + return ERR_DH_FWK_RESOURCE_CAPINFO_POINTER_NULL; + } return capPtr->FromJsonString(value); } diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/version_info.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/version_info.cpp index 649f3519..64fef82e 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/version_info.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/version_info.cpp @@ -29,10 +29,15 @@ namespace DistributedHardware { #undef DH_LOG_TAG #define DH_LOG_TAG "VersionInfo" -void VersionInfo::FromJsonString(const std::string &jsonStr) +int32_t VersionInfo::FromJsonString(const std::string &jsonStr) { - nlohmann::json jsonObj = nlohmann::json::parse(jsonStr); + nlohmann::json jsonObj = nlohmann::json::parse(jsonStr, nullptr, false); + if (jsonObj.is_discarded()) { + DHLOGE("json string parse failed"); + return ERR_DH_FWK_JSON_PARSE_FAILED; + } FromJson(jsonObj, *this); + return DH_FWK_SUCCESS; } std::string VersionInfo::ToJsonString() const diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/version_info_manager.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/version_info_manager.cpp index d9e3d109..8f38a175 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/version_info_manager.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/version_info_manager.cpp @@ -116,8 +116,7 @@ int32_t VersionInfoManager::GetVersionInfoByDeviceId(const std::string &deviceId DHLOGE("Query data from DB by deviceId failed, deviceId: %s", GetAnonyString(deviceId).c_str()); return ERR_DH_FWK_RESOURCE_DB_ADAPTER_OPERATION_FAIL; } - versionInfo.FromJsonString(data); - return DH_FWK_SUCCESS; + return versionInfo.FromJsonString(data); } void VersionInfoManager::UpdateVersionCache(const VersionInfo &versionInfo) @@ -176,7 +175,10 @@ int32_t VersionInfoManager::SyncVersionInfoFromDB(const std::string &deviceId) DHLOGI("Query data from DB by deviceId success, deviceId: %s", GetAnonyString(deviceId).c_str()); VersionInfo versionInfo; - versionInfo.FromJsonString(data); + int32_t ret = versionInfo.FromJsonString(data); + if (ret != DH_FWK_SUCCESS) { + return ret; + } UpdateVersionCache(versionInfo); return DH_FWK_SUCCESS; } @@ -197,7 +199,9 @@ int32_t VersionInfoManager::SyncRemoteVersionInfos() for (const auto &data : dataVector) { VersionInfo versionInfo; - versionInfo.FromJsonString(data); + if (versionInfo.FromJsonString(data) != DH_FWK_SUCCESS) { + continue; + } const std::string &deviceId = versionInfo.deviceId; const std::string &localDeviceId = DHContext::GetInstance().GetDeviceInfo().deviceId; if (deviceId.compare(localDeviceId) == 0) { @@ -272,7 +276,9 @@ void VersionInfoManager::HandleVersionAddChange(const std::vector lock(monitorTaskTimerMutex_); eventHandler_ = std::make_shared(busRunner); diff --git a/services/distributedhardwarefwkservice/src/task/task_board.cpp b/services/distributedhardwarefwkservice/src/task/task_board.cpp index f11e9698..2ada769c 100644 --- a/services/distributedhardwarefwkservice/src/task/task_board.cpp +++ b/services/distributedhardwarefwkservice/src/task/task_board.cpp @@ -90,6 +90,9 @@ void TaskBoard::DumpAllTasks(std::vector &taskInfos) { std::lock_guard lock(tasksMtx_); for (auto t : tasks_) { + if (t.second == nullptr) { + continue; + } TaskDump taskInfo = { .id = t.second->GetId(), .taskType = t.second->GetTaskType(), diff --git a/utils/include/eventbus/event_bus.h b/utils/include/eventbus/event_bus.h index 08fc5a15..363159e0 100644 --- a/utils/include/eventbus/event_bus.h +++ b/utils/include/eventbus/event_bus.h @@ -72,7 +72,9 @@ public: ~EventBus() { ULOGI("dtor EventBus"); - eventbusHandler_->GetEventRunner()->Stop(); + if (!eventbusHandler_) { + eventbusHandler_->GetEventRunner()->Stop(); + } eventThread_.join(); eventbusHandler_ = nullptr; } -- Gitee