From d1a1a0958b22041389e0cd3d14fd026b965928c9 Mon Sep 17 00:00:00 2001 From: hongtao Date: Thu, 21 Jul 2022 10:47:32 +0800 Subject: [PATCH] build:change utils path Signed-off-by: hongtao Change-Id: I1eb2e1b1ca8905b7ad2f4446a7db70e0c331634f --- bundle.json | 4 ++-- interfaces/innerkits/BUILD.gn | 3 +-- service/BUILD.gn | 2 +- test/unittest/common/display_fuzzer/BUILD.gn | 10 +++++----- test/unittest/common/native/BUILD.gn | 2 +- utils/BUILD.gn | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/bundle.json b/bundle.json index a312c03..f0e17f4 100755 --- a/bundle.json +++ b/bundle.json @@ -28,6 +28,7 @@ "deps": { "components": [ "bundle_framework", + "c_utils", "eventhandler", "graphic_graphic_2d", "hicollie_native", @@ -41,7 +42,6 @@ "safwk", "samgr_standard", "sensor", - "utils_base", "window_manager" ], "third_party": [ @@ -76,4 +76,4 @@ ] } } -} \ No newline at end of file +} diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index 197abbb..18f9bbf 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -40,9 +40,8 @@ ohos_shared_library("displaymgr") { public_configs = [ ":displaymgr_public_config" ] - deps = [ "//utils/native/base:utils" ] - external_deps = [ + "c_utils:utils", "hicollie_native:libhicollie", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/service/BUILD.gn b/service/BUILD.gn index 0300002..bc9a6d4 100644 --- a/service/BUILD.gn +++ b/service/BUILD.gn @@ -55,11 +55,11 @@ ohos_shared_library("displaymgrservice") { "//foundation/graphic/graphic_2d:libsurface", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/window/window_manager/utils:libwmutil", - "//utils/native/base:utils", ] external_deps = [ "bundle_framework:appexecfwk_base", + "c_utils:utils", "eventhandler:libeventhandler", "hicollie_native:libhicollie", "hisysevent_native:libhisysevent", diff --git a/test/unittest/common/display_fuzzer/BUILD.gn b/test/unittest/common/display_fuzzer/BUILD.gn index a549ef9..b70c21f 100644 --- a/test/unittest/common/display_fuzzer/BUILD.gn +++ b/test/unittest/common/display_fuzzer/BUILD.gn @@ -34,12 +34,12 @@ ohos_fuzztest("DisplayFuzzTest") { "-fno-omit-frame-pointer", ] sources = [ "./display_fuzzer.cpp" ] - deps = [ - "${displaymgr_native_innerkits_path}:displaymgr", - "//utils/native/base:utils", - ] + deps = [ "${displaymgr_native_innerkits_path}:displaymgr" ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } ############################################################################### diff --git a/test/unittest/common/native/BUILD.gn b/test/unittest/common/native/BUILD.gn index de4feef..0c5df0f 100644 --- a/test/unittest/common/native/BUILD.gn +++ b/test/unittest/common/native/BUILD.gn @@ -46,10 +46,10 @@ ohos_unittest("unittest_display_mgr_service") { "${displaymgr_native_innerkits_path}:displaymgr", "${displaymgr_service_path}:displaymgrservice", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] external_deps = [ + "c_utils:utils", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 966c91e..d83c63a 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -16,6 +16,6 @@ import("//base/powermgr/display_manager/displaymgr.gni") config("utils_config") { include_dirs = [ "native/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] } -- Gitee