From ebbf3fb9021bc4cd269a0e68af886f060078a4e7 Mon Sep 17 00:00:00 2001 From: xianghengliang Date: Fri, 21 Jan 2022 09:47:19 +0800 Subject: [PATCH 1/2] add deps samgr_standard:samgr_proxy Signed-off-by: xianghengliang --- services/distributedfiledaemon/BUILD.gn | 2 +- services/distributedfiledaemon/test/unittest/BUILD.gn | 4 +++- test/moduletest/BUILD.gn | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/services/distributedfiledaemon/BUILD.gn b/services/distributedfiledaemon/BUILD.gn index ec2db464a..135b4f3db 100755 --- a/services/distributedfiledaemon/BUILD.gn +++ b/services/distributedfiledaemon/BUILD.gn @@ -19,7 +19,6 @@ ohos_shared_library("libdistributedfiledaemon") { "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include", "//base/security/deviceauth/interfaces/innerkits", "//third_party/json/include", - "//utils/system/safwk/native/include", ] sources = [ @@ -46,6 +45,7 @@ ohos_shared_library("libdistributedfiledaemon") { "dsoftbus_standard:softbus_client", "ipc:ipc_core", "safwk:system_ability_fwk", + "samgr_standard:samgr_proxy", ] configs = [ "${utils_path}:compiler_configs" ] diff --git a/services/distributedfiledaemon/test/unittest/BUILD.gn b/services/distributedfiledaemon/test/unittest/BUILD.gn index b37b27de1..f0b461b98 100644 --- a/services/distributedfiledaemon/test/unittest/BUILD.gn +++ b/services/distributedfiledaemon/test/unittest/BUILD.gn @@ -23,7 +23,6 @@ config("module_private_config") { "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include", "//base/security/deviceauth/interfaces/innerkits", "//third_party/json/include", - "//utils/system/safwk/native/include", ] } @@ -46,6 +45,9 @@ ohos_unittest("DeviceManagerAgentTest") { "//third_party/googletest:gtest_main", ] + external_deps = [ + "samgr_standard:samgr_proxy", + ] defines = [ "private=public" ] } diff --git a/test/moduletest/BUILD.gn b/test/moduletest/BUILD.gn index f6b76d4a3..1e39a9a80 100644 --- a/test/moduletest/BUILD.gn +++ b/test/moduletest/BUILD.gn @@ -26,7 +26,6 @@ config("module_private_config") { "//foundation/communication/dsoftbus/interfaces/kits/common", "//base/security/deviceauth/interfaces/innerkits", "//third_party/json/include", - "//utils/system/safwk/native/include", ] } @@ -70,6 +69,7 @@ ohos_moduletest("DistributedFileDaemonServiceTest") { "dsoftbus_standard:softbus_client", "ipc:ipc_core", "safwk:system_ability_fwk", + "samgr_standard:samgr_proxy", ] } -- Gitee From c2579532ca87ac9749a3d70eac9e020732f1cf89 Mon Sep 17 00:00:00 2001 From: xianghengliang Date: Fri, 21 Jan 2022 10:50:16 +0800 Subject: [PATCH 2/2] test module gn fix Signed-off-by: xianghengliang --- services/distributedfiledaemon/test/unittest/BUILD.gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/distributedfiledaemon/test/unittest/BUILD.gn b/services/distributedfiledaemon/test/unittest/BUILD.gn index f0b461b98..cf078929a 100644 --- a/services/distributedfiledaemon/test/unittest/BUILD.gn +++ b/services/distributedfiledaemon/test/unittest/BUILD.gn @@ -45,9 +45,7 @@ ohos_unittest("DeviceManagerAgentTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ - "samgr_standard:samgr_proxy", - ] + external_deps = [ "samgr_standard:samgr_proxy" ] defines = [ "private=public" ] } -- Gitee