diff --git a/dm/BUILD.gn b/dm/BUILD.gn index e6d57c97..a8d25af4 100644 --- a/dm/BUILD.gn +++ b/dm/BUILD.gn @@ -54,12 +54,12 @@ ohos_shared_library("libdm") { ] external_deps = [ + "c_utils:utils", "hilog_native:libhilog", "ipc:ipc_core", "multimedia_image_standard:image_native", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "utils_base:utils", ] part_name = "window_manager" diff --git a/dm/test/unittest/BUILD.gn b/dm/test/unittest/BUILD.gn index 601927b2..a4839c74 100644 --- a/dm/test/unittest/BUILD.gn +++ b/dm/test/unittest/BUILD.gn @@ -92,6 +92,7 @@ ohos_static_library("dm_unittest_common") { sources = [ "screen_manager_utils.cpp" ] public_deps = [ + "//commonlibrary/c_utils/base:utils", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", # PixelMap "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", @@ -104,7 +105,6 @@ ohos_static_library("dm_unittest_common") { "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", # png - "//utils/native/base:utils", ] external_deps = [ diff --git a/dmserver/BUILD.gn b/dmserver/BUILD.gn index 17d86ad3..cb6a8e70 100644 --- a/dmserver/BUILD.gn +++ b/dmserver/BUILD.gn @@ -60,6 +60,7 @@ ohos_shared_library("libdms") { external_deps = [ "access_token:libaccesstoken_sdk", + "c_utils:utils", "config_policy:configpolicy_util", "graphic_standard:surface", "hilog_native:libhilog", @@ -68,7 +69,6 @@ ohos_shared_library("libdms") { "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "sensor:sensor_interface_native", - "utils_base:utils", ] if (is_standard_system) { diff --git a/dmserver/test/unittest/BUILD.gn b/dmserver/test/unittest/BUILD.gn index 083e83c5..27f8a80e 100644 --- a/dmserver/test/unittest/BUILD.gn +++ b/dmserver/test/unittest/BUILD.gn @@ -56,6 +56,7 @@ ohos_static_library("dmserver_unittest_common") { sources = [ "screen_manager_utils.cpp" ] public_deps = [ + "//commonlibrary/c_utils/base:utils", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", # PixelMap "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", @@ -68,7 +69,6 @@ ohos_static_library("dmserver_unittest_common") { "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", # png - "//utils/native/base:utils", ] external_deps = [ diff --git a/extension/window_extension/BUILD.gn b/extension/window_extension/BUILD.gn index 3e9dc2dd..09371780 100644 --- a/extension/window_extension/BUILD.gn +++ b/extension/window_extension/BUILD.gn @@ -59,11 +59,11 @@ ohos_shared_library("libwindow_extension") { "ability_runtime:ability_manager", "ability_runtime:abilitykit_native", "ability_runtime:runtime", + "c_utils:utils", "graphic_standard:surface", "hilog_native:libhilog", "hitrace_native:hitrace_meter", "input:libmmi-client", - "utils_base:utils", ] part_name = "window_manager" diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index fd9837bb..5b58de60 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -24,11 +24,11 @@ ohos_shared_library("wm_interface") { include_dirs = [ "//foundation/window/window_manager/interfaces/innerkits" ] public_deps = [ + "//commonlibrary/c_utils/base:utils", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", - "//utils/native/base:utils", ] part_name = "window_manager" diff --git a/interfaces/kits/napi/window_runtime/BUILD.gn b/interfaces/kits/napi/window_runtime/BUILD.gn index 1bcc858f..c7e3b0e0 100644 --- a/interfaces/kits/napi/window_runtime/BUILD.gn +++ b/interfaces/kits/napi/window_runtime/BUILD.gn @@ -64,12 +64,12 @@ ohos_shared_library("window_native_kit") { "ability_runtime:runtime", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "ipc_js:rpc", "multimedia_image_standard:image", "napi:ace_napi", - "utils_base:utils", ] part_name = "window_manager" @@ -94,7 +94,6 @@ ohos_shared_library("window_napi") { "${ability_runtime_path}/frameworks/native/appkit:appkit_native", "//foundation/window/window_manager/utils:libwmutil", "//foundation/window/window_manager/wm:libwm", - "//utils/native/base:utils", ] external_deps = [ @@ -102,6 +101,7 @@ ohos_shared_library("window_napi") { "ability_runtime:ability_context_native", "ability_runtime:ability_manager", "ability_runtime:runtime", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "napi:ace_napi", ] @@ -130,10 +130,10 @@ ohos_shared_library("windowstage_kit") { external_deps = [ "ability_runtime:ability_manager", "ability_runtime:runtime", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "napi:ace_napi", - "utils_base:utils", ] part_name = "window_manager" diff --git a/snapshot/BUILD.gn b/snapshot/BUILD.gn index c360d5e7..3ab3dc65 100644 --- a/snapshot/BUILD.gn +++ b/snapshot/BUILD.gn @@ -34,8 +34,8 @@ ohos_executable("snapshot_display") { ] external_deps = [ + "c_utils:utils", "multimedia_image_standard:image_native", - "utils_base:utils", ] part_name = "window_manager" @@ -76,9 +76,9 @@ ohos_shared_library("libsnapshot_util") { ] external_deps = [ + "c_utils:utils", "hitrace_native:hitrace_meter", "multimedia_image_standard:image_native", - "utils_base:utils", ] part_name = "window_manager" diff --git a/snapshot/test/unittest/BUILD.gn b/snapshot/test/unittest/BUILD.gn index b82c2bec..3e1d24db 100644 --- a/snapshot/test/unittest/BUILD.gn +++ b/snapshot/test/unittest/BUILD.gn @@ -63,6 +63,7 @@ ohos_static_library("utils_unittest_common") { ] public_deps = [ + "//commonlibrary/c_utils/base:utils", "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics", "//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", @@ -72,7 +73,6 @@ ohos_static_library("utils_unittest_common") { "//foundation/window/window_manager/utils:libwmutil", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] external_deps = [ diff --git a/test/fuzztest/dms/displaymanager_fuzzer/BUILD.gn b/test/fuzztest/dms/displaymanager_fuzzer/BUILD.gn index 747e79f7..9cf05319 100644 --- a/test/fuzztest/dms/displaymanager_fuzzer/BUILD.gn +++ b/test/fuzztest/dms/displaymanager_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("DisplayManagerFuzzTest") { module_out_path = module_output_path include_dirs = [ "//foundation/window/window_manager/interfaces/innerkits/dm", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", ] @@ -35,8 +35,8 @@ ohos_fuzztest("DisplayManagerFuzzTest") { deps = [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/window/window_manager/dm:libdm", - "//utils/native/base:utils", ] + external_deps = [ "c_utils:utils" ] } ############################################################################### diff --git a/test/fuzztest/dms/screen_fuzzer/BUILD.gn b/test/fuzztest/dms/screen_fuzzer/BUILD.gn index 12b63f2a..70ef9dd1 100644 --- a/test/fuzztest/dms/screen_fuzzer/BUILD.gn +++ b/test/fuzztest/dms/screen_fuzzer/BUILD.gn @@ -23,7 +23,7 @@ ohos_fuzztest("ScreenFuzzTest") { module_out_path = module_output_path include_dirs = [ "//foundation/window/window_manager/interfaces/innerkits/dm", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", ] @@ -36,8 +36,8 @@ ohos_fuzztest("ScreenFuzzTest") { deps = [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/window/window_manager/dm:libdm", - "//utils/native/base:utils", ] + external_deps = [ "c_utils:utils" ] } ############################################################################### diff --git a/test/fuzztest/dms/screenmanager_fuzzer/BUILD.gn b/test/fuzztest/dms/screenmanager_fuzzer/BUILD.gn index 4044e22a..e45c77cb 100644 --- a/test/fuzztest/dms/screenmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/dms/screenmanager_fuzzer/BUILD.gn @@ -22,7 +22,7 @@ ohos_fuzztest("ScreenManagerFuzzTest") { module_out_path = module_output_path include_dirs = [ "//foundation/window/window_manager/interfaces/innerkits/dm", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", ] @@ -35,8 +35,8 @@ ohos_fuzztest("ScreenManagerFuzzTest") { deps = [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/window/window_manager/dm:libdm", - "//utils/native/base:utils", ] + external_deps = [ "c_utils:utils" ] } ############################################################################### diff --git a/test/fuzztest/wms/window_fuzzer/BUILD.gn b/test/fuzztest/wms/window_fuzzer/BUILD.gn index 4040b49f..d87e9854 100644 --- a/test/fuzztest/wms/window_fuzzer/BUILD.gn +++ b/test/fuzztest/wms/window_fuzzer/BUILD.gn @@ -24,7 +24,7 @@ ohos_fuzztest("WindowFuzzTest") { include_dirs = [ "//foundation/window/window_manager/wmserver/include", "//foundation/window/window_manager/interfaces/innerkits/wm", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] configs = [ @@ -33,11 +33,9 @@ ohos_fuzztest("WindowFuzzTest") { ] sources = [ "window_fuzzer.cpp" ] - deps = [ - "//foundation/window/window_manager/wm:libwm", - "//utils/native/base:utils", - ] + deps = [ "//foundation/window/window_manager/wm:libwm" ] external_deps = [ + "c_utils:utils", "ipc:ipc_core", "multimedia_image_standard:image", ] diff --git a/test/fuzztest/wms/windowmanager_fuzzer/BUILD.gn b/test/fuzztest/wms/windowmanager_fuzzer/BUILD.gn index bd59149a..684f0a17 100644 --- a/test/fuzztest/wms/windowmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/wms/windowmanager_fuzzer/BUILD.gn @@ -23,7 +23,7 @@ ohos_fuzztest("WindowManagerFuzzTest") { include_dirs = [ "//foundation/window/window_manager/wmserver/include", "//foundation/window/window_manager/interfaces/innerkits/wm", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] configs = [ @@ -32,12 +32,12 @@ ohos_fuzztest("WindowManagerFuzzTest") { ] sources = [ "windowmanager_fuzzer.cpp" ] - deps = [ - "//foundation/window/window_manager/wm:libwm", - "//utils/native/base:utils", - ] + deps = [ "//foundation/window/window_manager/wm:libwm" ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } ############################################################################### diff --git a/test/fuzztest/wms/windowscene_fuzzer/BUILD.gn b/test/fuzztest/wms/windowscene_fuzzer/BUILD.gn index fafddb03..79e563a6 100644 --- a/test/fuzztest/wms/windowscene_fuzzer/BUILD.gn +++ b/test/fuzztest/wms/windowscene_fuzzer/BUILD.gn @@ -26,7 +26,7 @@ ohos_fuzztest("WindowSceneFuzzTest") { "//foundation/window/window_manager/interfaces/innerkits/dm", "//foundation/window/window_manager/interfaces/innerkits/wm", "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] configs = [ @@ -39,10 +39,12 @@ ohos_fuzztest("WindowSceneFuzzTest") { "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/window/window_manager/dm:libdm", "//foundation/window/window_manager/wm:libwm", - "//utils/native/base:utils", ] - external_deps = [ "ipc:ipc_core" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } ############################################################################### diff --git a/test/systemtest/dms/BUILD.gn b/test/systemtest/dms/BUILD.gn index 27c44c58..29b1bf35 100644 --- a/test/systemtest/dms/BUILD.gn +++ b/test/systemtest/dms/BUILD.gn @@ -112,6 +112,7 @@ ohos_static_library("dms_systemtest_common") { ] public_deps = [ + "//commonlibrary/c_utils/base:utils", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", "//foundation/window/window_manager/dm:libdm", @@ -121,7 +122,6 @@ ohos_static_library("dms_systemtest_common") { "//foundation/window/window_manager/wm:libwm", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] external_deps = [ diff --git a/test/systemtest/extension/BUILD.gn b/test/systemtest/extension/BUILD.gn index fc4304c2..631393e5 100644 --- a/test/systemtest/extension/BUILD.gn +++ b/test/systemtest/extension/BUILD.gn @@ -56,8 +56,8 @@ ohos_systemtest("window_extension_connection_test") { external_deps = [ "ability_base:want", + "c_utils:utils", "input:libmmi-client", - "utils_base:utils", ] } diff --git a/test/systemtest/wms/BUILD.gn b/test/systemtest/wms/BUILD.gn index 62c5eb9b..42c93a78 100644 --- a/test/systemtest/wms/BUILD.gn +++ b/test/systemtest/wms/BUILD.gn @@ -216,7 +216,7 @@ config("wms_systemtest_common_public_config") { "//foundation/window/window_manager/wmserver/include", "//foundation/window/window_manager/interfaces/innerkits/wm", "//foundation/window/window_manager/utils/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//third_party/googletest/googlemock/include", @@ -257,6 +257,7 @@ ohos_static_library("wms_systemtest_common") { # need delete it for abilitycontext "${ability_runtime_inner_api_path}/ability_manager:ability_manager", + "//commonlibrary/c_utils/base:utils", "//foundation/arkui/napi:ace_napi", "//foundation/graphic/graphic_2d/rosen/modules/animation/window_animation:window_animation", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", @@ -267,7 +268,6 @@ ohos_static_library("wms_systemtest_common") { "//foundation/window/window_manager/wm:libwm", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] external_deps = [ "ability_base:base", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 211ae53d..8cd36546 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -58,12 +58,12 @@ ohos_shared_library("libwmutil") { external_deps = [ "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", + "c_utils:utils", "graphic_standard:surface", "hilog_native:libhilog", "ipc:ipc_core", "multimedia_image_standard:image_native", "safwk:system_ability_fwk", - "utils_base:utils", ] part_name = "window_manager" diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index 196191f8..9018b5bb 100644 --- a/utils/test/unittest/BUILD.gn +++ b/utils/test/unittest/BUILD.gn @@ -95,13 +95,13 @@ ohos_static_library("utils_unittest_common") { ] public_deps = [ + "//commonlibrary/c_utils/base:utils", "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics", "//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/window/window_manager/utils:libwmutil", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] subsystem_name = "window" diff --git a/wm/BUILD.gn b/wm/BUILD.gn index a0e32e8e..6e56f965 100644 --- a/wm/BUILD.gn +++ b/wm/BUILD.gn @@ -91,10 +91,10 @@ ohos_shared_library("libwm") { "napi:ace_napi", # because appexecfwk_core depends on global_resmgr + "c_utils:utils", "resource_management:global_resmgr", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "utils_base:utils", ] defines = [] diff --git a/wm/test/unittest/BUILD.gn b/wm/test/unittest/BUILD.gn index ad6850cb..df48d04a 100644 --- a/wm/test/unittest/BUILD.gn +++ b/wm/test/unittest/BUILD.gn @@ -102,7 +102,7 @@ config("wm_unittest_common_public_config") { "//foundation/window/window_manager/wmserver/include/window_snapshot", "//foundation/window/window_manager/interfaces/innerkits/wm", "//foundation/window/window_manager/utils/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//third_party/googletest/googlemock/include", @@ -140,6 +140,7 @@ ohos_static_library("wm_unittest_common") { # need delete it for abilitycontext "${ability_runtime_inner_api_path}/ability_manager:ability_manager", + "//commonlibrary/c_utils/base:utils", "//foundation/arkui/ace_engine/interfaces/inner_api/ace:ace_uicontent", "//foundation/arkui/napi:ace_napi", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", @@ -153,7 +154,6 @@ ohos_static_library("wm_unittest_common") { "//foundation/window/window_manager/wmserver:libwms", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] external_deps = [ diff --git a/wmserver/BUILD.gn b/wmserver/BUILD.gn index c7c5bdf7..c88efb0b 100644 --- a/wmserver/BUILD.gn +++ b/wmserver/BUILD.gn @@ -82,6 +82,7 @@ ohos_shared_library("libwms") { external_deps = [ "ability_base:want", "ability_runtime:ability_manager", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", "display_manager:displaymgr", @@ -96,7 +97,6 @@ ohos_shared_library("libwms") { "power_manager:powermgr_client", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "utils_base:utils", ] if (is_standard_system) { diff --git a/wmserver/test/unittest/BUILD.gn b/wmserver/test/unittest/BUILD.gn index 0583e1a1..9a5cc87c 100644 --- a/wmserver/test/unittest/BUILD.gn +++ b/wmserver/test/unittest/BUILD.gn @@ -37,7 +37,7 @@ config("wmserver_unittest_common_public_config") { "//foundation/window/window_manager/wmserver/include/window_snapshot", "//foundation/window/window_manager/interfaces/innerkits/wm", "//foundation/window/window_manager/utils/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//third_party/googletest/googlemock/include", @@ -75,6 +75,7 @@ ohos_static_library("wmserver_unittest_common") { # need delete it for abilitycontext "${ability_runtime_inner_api_path}/ability_manager:ability_manager", + "//commonlibrary/c_utils/base:utils", "//foundation/arkui/ace_engine/interfaces/inner_api/ace:ace_uicontent", "//foundation/arkui/napi:ace_napi", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", @@ -88,7 +89,6 @@ ohos_static_library("wmserver_unittest_common") { "//foundation/window/window_manager/wmserver:libwms", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] external_deps = [