From 0d5b1126d3c1cb0da30160938d6b577ba04072f3 Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Tue, 10 May 2022 19:31:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUILD.gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- services/distributedhardwarefwkservice/BUILD.gn | 2 +- .../test/fuzztest/accessmanager_fuzzer/BUILD.gn | 2 +- .../test/unittest/common/accessmanager/BUILD.gn | 2 +- services/distributedhardwarefwkserviceimpl/BUILD.gn | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index 3fd69ff7..f254b489 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -61,7 +61,7 @@ ohos_shared_library("distributedhardwarefwksvr") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "startup_l2:syspara", + "init:libbegetutil", ] subsystem_name = "distributedhardware" diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn index 53d89fa2..6e5a3243 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn @@ -61,7 +61,7 @@ ohos_fuzztest("AccessmanagerFuzzTest") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "startup_l2:syspara", + "init:libbegetutil", ] } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index 5fc00a80..edd7bd54 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -62,7 +62,7 @@ ohos_unittest("AccessManagerTest") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "startup_l2:syspara", + "init:libbegetutil", ] } diff --git a/services/distributedhardwarefwkserviceimpl/BUILD.gn b/services/distributedhardwarefwkserviceimpl/BUILD.gn index 19efe651..a377d26b 100644 --- a/services/distributedhardwarefwkserviceimpl/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/BUILD.gn @@ -84,7 +84,7 @@ ohos_shared_library("distributedhardwarefwksvr_impl") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "startup_l2:syspara", + "init:libbegetutil", ] subsystem_name = "distributedhardware" -- Gitee From ecfef8842b90f2f5118b76edd4b9f0f846fb80cc Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Mon, 16 May 2022 19:24:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUILD.gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- services/distributedhardwarefwkservice/BUILD.gn | 2 +- .../test/fuzztest/accessmanager_fuzzer/BUILD.gn | 2 +- .../test/unittest/common/accessmanager/BUILD.gn | 15 ++++++++------- .../distributedhardwarefwkserviceimpl/BUILD.gn | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index f254b489..21c65c10 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -58,10 +58,10 @@ ohos_shared_library("distributedhardwarefwksvr") { "bundle_framework:appexecfwk_core", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", + "init:libbegetutil", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "init:libbegetutil", ] subsystem_name = "distributedhardware" diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn index 6e5a3243..3fdc2cc0 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn @@ -58,10 +58,10 @@ ohos_fuzztest("AccessmanagerFuzzTest") { external_deps = [ "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "init:libbegetutil", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "init:libbegetutil", ] } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index edd7bd54..f09c76ce 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") +import( + "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") module_out_path = "distributed_hardware_fwk/access_manager_test" @@ -35,20 +36,20 @@ ohos_unittest("AccessManagerTest") { module_out_path = module_out_path sources = [ - "${services_path}/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp", "${services_path}/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp", + "${services_path}/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp", ] - sources += ["access_manager_test.cpp"] + sources += [ "access_manager_test.cpp" ] - configs = [":module_private_config"] + configs = [ ":module_private_config" ] deps = [ - "//third_party/googletest:gtest_main", "${utils_path}:distributedhardwareutils", + "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", + "//third_party/googletest:gtest_main", ] defines = [ "HI_LOG_ENABLE", @@ -59,10 +60,10 @@ ohos_unittest("AccessManagerTest") { external_deps = [ "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "init:libbegetutil", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "init:libbegetutil", ] } diff --git a/services/distributedhardwarefwkserviceimpl/BUILD.gn b/services/distributedhardwarefwkserviceimpl/BUILD.gn index a377d26b..f4484101 100644 --- a/services/distributedhardwarefwkserviceimpl/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/BUILD.gn @@ -81,10 +81,10 @@ ohos_shared_library("distributedhardwarefwksvr_impl") { "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", + "init:libbegetutil", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "init:libbegetutil", ] subsystem_name = "distributedhardware" -- Gitee