diff --git a/bundle.json b/bundle.json index a312c03c8efda187aee92ca60208b749f679756f..f0e17f4ee0694306756810754c5bceff1c443d6b 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 197abbb097f37442b691e072dcf633e6e794939d..18f9bbfb92f4260e1dd7b50841160b6617e8199a 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 030000239d93bd7fc18256bb11d9012df39307aa..bc9a6d4de561cddac3c782605923417f4d426d51 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 a549ef94cb5272d5e4334337fd9f3998b3daa20d..b70c21f12fd6b85d0c9c4afc8e4bc6a6677f91a8 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 de4feefc52e3f3e8d1ed74dc90e8e2e44227c589..0c5df0f8f29b2fb020cdbe38c91b2cbc17658b25 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 966c91ec6b17ad3fa96853056f9c0b587c286060..d83c63a0359eb28ccdc6dfa97593c83c868ed4b8 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", ] }