From d90f68c554784a7a108643ce17d2a5f952e4b61c Mon Sep 17 00:00:00 2001 From: joe49 Date: Fri, 12 Aug 2022 15:37:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=9F=BA=E7=A1=80=E5=BA=93=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=92=8C=E9=83=A8=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: joe49 --- interfaces/inner_kits/BUILD.gn | 4 ++-- .../test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn | 4 ++-- .../test/unittest/common/distributedhardwarefwkkit/BUILD.gn | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index ef2930cd..161e3b88 100644 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -17,7 +17,7 @@ import( ohos_shared_library("libdhfwk_sdk") { include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${innerkits_path}/include", "${innerkits_path}/include/ipc", @@ -40,7 +40,6 @@ ohos_shared_library("libdhfwk_sdk") { "${services_path}/distributedhardwarefwkservice:distributedhardwarefwksvr", "${utils_path}:distributedhardwareutils", "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//utils/native/base:utils", ] defines = [ @@ -50,6 +49,7 @@ ohos_shared_library("libdhfwk_sdk") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn index f2e8f66a..ad2f1194 100644 --- a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn @@ -24,7 +24,7 @@ ohos_fuzztest("DistributedHardwareFwkKitFuzzTest") { include_dirs = [ "include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${utils_path}/include", "${utils_path}/include/log", @@ -48,7 +48,6 @@ ohos_fuzztest("DistributedHardwareFwkKitFuzzTest") { "${utils_path}:distributedhardwareutils", "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//utils/native/base:utils", ] defines = [ @@ -60,6 +59,7 @@ ohos_fuzztest("DistributedHardwareFwkKitFuzzTest") { external_deps = [ "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", "hisysevent_native:libhisysevent", "init:libbegetutil", "ipc:ipc_core", diff --git a/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn b/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn index 3e8ba2e8..91fb45a1 100644 --- a/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn @@ -21,7 +21,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${utils_path}/include", "${utils_path}/include/log", @@ -47,7 +47,6 @@ ohos_unittest("DistributedHardwareFwkKitTest") { "${innerkits_path}:libdhfwk_sdk", "${utils_path}:distributedhardwareutils", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] defines = [ @@ -57,6 +56,7 @@ ohos_unittest("DistributedHardwareFwkKitTest") { ] external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", -- Gitee From b8f5b9a9243c82b8e12d64f15c4f2b00d83703ea Mon Sep 17 00:00:00 2001 From: joe Date: Fri, 12 Aug 2022 07:42:03 +0000 Subject: [PATCH 2/4] update interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn. Signed-off-by: joe --- .../test/unittest/common/distributedhardwarefwkkit/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn b/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn index 91fb45a1..96513b9c 100644 --- a/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn @@ -56,7 +56,7 @@ ohos_unittest("DistributedHardwareFwkKitTest") { ] external_deps = [ - "c_utils:utils", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", -- Gitee From b88c3945bfa0bb8b2610650ff7a3cdb8a8236b64 Mon Sep 17 00:00:00 2001 From: joe Date: Fri, 12 Aug 2022 07:43:27 +0000 Subject: [PATCH 3/4] update interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn. Signed-off-by: joe --- .../test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn index ad2f1194..19966eef 100644 --- a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("DistributedHardwareFwkKitFuzzTest") { external_deps = [ "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", - "c_utils:utils", + "c_utils:utils", "hisysevent_native:libhisysevent", "init:libbegetutil", "ipc:ipc_core", -- Gitee From 7c679632c280df57abc4d7c078d401023925e77b Mon Sep 17 00:00:00 2001 From: joe Date: Fri, 12 Aug 2022 07:43:58 +0000 Subject: [PATCH 4/4] update interfaces/inner_kits/BUILD.gn. Signed-off-by: joe --- interfaces/inner_kits/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index 161e3b88..24bb4f56 100644 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -49,7 +49,7 @@ ohos_shared_library("libdhfwk_sdk") { ] external_deps = [ - "c_utils:utils", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", -- Gitee