From 2ceb8c1d13f8907ce4f2affd8f5d9f8c4972496c Mon Sep 17 00:00:00 2001 From: hongtao Date: Thu, 21 Jul 2022 10:45:52 +0800 Subject: [PATCH] change utils path Signed-off-by: hongtao Change-Id: Id90c62060d4f9cf528cbd32d8150fe4a9c54abcb --- frameworks/ans/BUILD.gn | 8 ++--- frameworks/ans/test/unittest/BUILD.gn | 6 ++-- frameworks/core/BUILD.gn | 5 ++- frameworks/js/napi/BUILD.gn | 2 +- frameworks/js/napi/src/reminder/BUILD.gn | 2 +- frameworks/test/moduletest/BUILD.gn | 34 +++++++++---------- services/ans/BUILD.gn | 4 +-- services/ans/test/unittest/BUILD.gn | 6 ++-- services/distributed/BUILD.gn | 4 +-- services/distributed/test/unittest/BUILD.gn | 4 +-- services/test/moduletest/BUILD.gn | 6 ++-- .../notification_publish_test/BUILD.gn | 2 +- .../notification_services_test/BUILD.gn | 2 +- test/common/acts/BUILD.gn | 2 +- .../acts/actsnotificationfuzztest/BUILD.gn | 4 +-- .../addnotificationslotgroups_fuzzer/BUILD.gn | 6 ++-- .../addnotificationslots_fuzzer/BUILD.gn | 6 ++-- test/fuzztest/addslotbytype_fuzzer/BUILD.gn | 6 ++-- .../cancelnotification_fuzzer/BUILD.gn | 6 ++-- .../getnotificationslot_fuzzer/BUILD.gn | 6 ++-- .../getnotificationslotgroup_fuzzer/BUILD.gn | 6 ++-- .../BUILD.gn | 6 ++-- .../publishnotification_fuzzer/BUILD.gn | 6 ++-- .../removenotification_fuzzer/BUILD.gn | 6 ++-- .../removenotificationslot_fuzzer/BUILD.gn | 6 ++-- .../BUILD.gn | 6 ++-- .../setnotificationbadgenum_fuzzer/BUILD.gn | 6 ++-- test/resource/ansSTSlotGroupTest/BUILD.gn | 2 +- test/systemtest/acts/ansDump/BUILD.gn | 4 +-- tools/dump/BUILD.gn | 6 ++-- tools/test/unittest/dump/BUILD.gn | 2 +- 31 files changed, 74 insertions(+), 103 deletions(-) diff --git a/frameworks/ans/BUILD.gn b/frameworks/ans/BUILD.gn index 19a46aee3..04bae7ef2 100644 --- a/frameworks/ans/BUILD.gn +++ b/frameworks/ans/BUILD.gn @@ -72,21 +72,19 @@ ohos_shared_library("ans_innerkits") { ] configs = [ - "//utils/native/base:utils_config", + "//commonlibrary/c_utils/base:utils_config", "${core_path}:public_ans_core_config", ] public_configs = [ ":ans_innerkits_public_config" ] - deps = [ - "${core_path}:ans_core", - "//utils/native/base:utils", - ] + deps = [ "${core_path}:ans_core" ] external_deps = [ "ability_base:want", "ability_base:zuri", "ability_runtime:wantagent_innerkits", + "c_utils:utils", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/frameworks/ans/test/unittest/BUILD.gn b/frameworks/ans/test/unittest/BUILD.gn index 8d52837aa..5520e9351 100644 --- a/frameworks/ans/test/unittest/BUILD.gn +++ b/frameworks/ans/test/unittest/BUILD.gn @@ -27,7 +27,7 @@ ohos_unittest("ans_reminder_unit_test") { include_dirs = [ ".", "include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "/${services_path}/ans/include", "${services_path}/ans/test/unittest/mock/include", @@ -41,7 +41,7 @@ ohos_unittest("ans_reminder_unit_test") { ] configs = [ - "//utils/native/base:utils_config", + "//commonlibrary/c_utils/base:utils_config", ":exception", ] @@ -49,7 +49,6 @@ ohos_unittest("ans_reminder_unit_test") { "${core_path}:ans_core", "${frameworks_module_ans_path}:ans_innerkits", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] external_deps = [ @@ -58,6 +57,7 @@ ohos_unittest("ans_reminder_unit_test") { "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", diff --git a/frameworks/core/BUILD.gn b/frameworks/core/BUILD.gn index ea5bb5a5d..4a432b1d1 100644 --- a/frameworks/core/BUILD.gn +++ b/frameworks/core/BUILD.gn @@ -23,7 +23,7 @@ config("public_ans_core_config") { "${core_path}/include", "${inner_api_path}", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//third_party/json/single_include", ] } @@ -79,14 +79,13 @@ ohos_shared_library("ans_core") { public_configs = [ ":public_ans_core_config" ] - deps = [ "//utils/native/base:utils" ] - external_deps = [ "ability_base:base", "ability_base:want", "ability_base:zuri", "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", + "c_utils:utils", "eventhandler:libeventhandler", "hicollie_native:libhicollie", "hisysevent_native:libhisysevent", diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn index 66e861db5..d940e3950 100644 --- a/frameworks/js/napi/BUILD.gn +++ b/frameworks/js/napi/BUILD.gn @@ -77,7 +77,6 @@ ohos_shared_library("notification") { "${frameworks_module_ans_path}:ans_innerkits", "//foundation/multimedia/image_standard/interfaces/innerkits:image", "//third_party/libuv:uv_static", - "//utils/native/base:utils", ] external_deps = [ @@ -86,6 +85,7 @@ ohos_shared_library("notification") { "ability_base:zuri", "ability_runtime:abilitykit_native", "ability_runtime:wantagent_innerkits", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "napi:ace_napi", diff --git a/frameworks/js/napi/src/reminder/BUILD.gn b/frameworks/js/napi/src/reminder/BUILD.gn index ce267f591..4c6bfbc64 100644 --- a/frameworks/js/napi/src/reminder/BUILD.gn +++ b/frameworks/js/napi/src/reminder/BUILD.gn @@ -57,7 +57,6 @@ ohos_shared_library("reminderagent") { "${frameworks_module_ans_path}:ans_innerkits", "//foundation/multimedia/image_standard/interfaces/innerkits:image", "//third_party/libuv:uv_static", - "//utils/native/base:utils", ] external_deps = [ @@ -66,6 +65,7 @@ ohos_shared_library("reminderagent") { "ability_runtime:abilitykit_native", "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "napi:ace_napi", diff --git a/frameworks/test/moduletest/BUILD.gn b/frameworks/test/moduletest/BUILD.gn index e5c39c97b..4a802beb3 100644 --- a/frameworks/test/moduletest/BUILD.gn +++ b/frameworks/test/moduletest/BUILD.gn @@ -20,7 +20,7 @@ module_output_path = "${component_name}/moduletest" config("public_ans_config") { include_dirs = [ "${core_path}/common/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "${services_path}/ans/include", "${core_path}/include", ] @@ -34,7 +34,7 @@ ohos_moduletest("ans_fw_module_test") { "${inner_api_path}", "${core_path}/common/include", "${core_path}/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${component_path}/services/ans/include", "//third_party/json/include", @@ -42,7 +42,7 @@ ohos_moduletest("ans_fw_module_test") { "${core_path}/common/include", "${core_path}/include", "${inner_api_path}", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "${frameworks_path}/test/moduletest/mock/include", ] @@ -61,14 +61,13 @@ ohos_moduletest("ans_fw_module_test") { "mock/mock_single_kv_store.cpp", ] - configs = [ "//utils/native/base:utils_config" ] + configs = [ "//commonlibrary/c_utils/base:utils_config" ] deps = [ "${core_path}:ans_core", "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/ans:libans", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] defines = [] @@ -84,6 +83,7 @@ ohos_moduletest("ans_fw_module_test") { "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", @@ -107,7 +107,7 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "${inner_api_path}", "${core_path}/common/include", "${core_path}/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${component_path}/services/ans/include", "//third_party/json/include", @@ -115,7 +115,7 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "${core_path}/common/include", "${core_path}/include", "${inner_api_path}", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "${frameworks_path}/test/moduletest/mock/include", ] @@ -134,7 +134,7 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "mock/mock_single_kv_store.cpp", ] - configs = [ "//utils/native/base:utils_config" ] + configs = [ "//commonlibrary/c_utils/base:utils_config" ] deps = [ "${ability_runtime_path}/frameworks/native/appkit:app_context", @@ -142,7 +142,6 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/ans:libans", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] defines = [] @@ -159,6 +158,7 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", @@ -182,7 +182,7 @@ ohos_moduletest("ans_innerkits_module_slot_test") { "${inner_api_path}", "${frameworks_path}/ans/core/common/include", "${frameworks_path}/ans/core/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${component_path}/services/ans/include", "//third_party/json/include", @@ -190,7 +190,7 @@ ohos_moduletest("ans_innerkits_module_slot_test") { "${core_path}/common/include", "${core_path}/include", "${inner_api_path}", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "${frameworks_path}/test/moduletest/mock/include", ] @@ -209,14 +209,13 @@ ohos_moduletest("ans_innerkits_module_slot_test") { "mock/mock_single_kv_store.cpp", ] - configs = [ "//utils/native/base:utils_config" ] + configs = [ "//commonlibrary/c_utils/base:utils_config" ] deps = [ "${core_path}:ans_core", "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/ans:libans", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] defines = [] @@ -232,6 +231,7 @@ ohos_moduletest("ans_innerkits_module_slot_test") { "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", @@ -255,7 +255,7 @@ ohos_moduletest("ans_innerkits_module_setting_test") { "${inner_api_path}", "${frameworks_path}/ans/core/common/include", "${frameworks_path}/ans/core/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${component_path}/services/ans/include", "//third_party/json/include", @@ -263,7 +263,7 @@ ohos_moduletest("ans_innerkits_module_setting_test") { "${core_path}/common/include", "${core_path}/include", "${inner_api_path}", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "${frameworks_path}/test/moduletest/mock/include", ] @@ -281,14 +281,13 @@ ohos_moduletest("ans_innerkits_module_setting_test") { "mock/mock_single_kv_store.cpp", ] - configs = [ "//utils/native/base:utils_config" ] + configs = [ "//commonlibrary/c_utils/base:utils_config" ] deps = [ "${core_path}:ans_core", "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/ans:libans", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] defines = [] @@ -304,6 +303,7 @@ ohos_moduletest("ans_innerkits_module_setting_test") { "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", diff --git a/services/ans/BUILD.gn b/services/ans/BUILD.gn index cdf752d7e..85000ca18 100644 --- a/services/ans/BUILD.gn +++ b/services/ans/BUILD.gn @@ -49,7 +49,7 @@ ohos_shared_library("libans") { configs = [ ":public_ans_config", - "//utils/native/base:utils_config", + "//commonlibrary/c_utils/base:utils_config", ] defines = [] @@ -62,7 +62,6 @@ ohos_shared_library("libans") { "${core_path}:ans_core", "${services_path}/dialog/dialog_ui/js:dialog_js_files_etc", "//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr", - "//utils/native/base:utils", ] if (is_double_framework) { @@ -78,6 +77,7 @@ ohos_shared_library("libans") { external_deps = [ "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", + "c_utils:utils", "distributeddatamgr:distributeddata_inner", "hitrace_native:hitrace_meter", "multimedia_image_standard:image_native", diff --git a/services/ans/test/unittest/BUILD.gn b/services/ans/test/unittest/BUILD.gn index f819ff520..6a92edaf1 100644 --- a/services/ans/test/unittest/BUILD.gn +++ b/services/ans/test/unittest/BUILD.gn @@ -22,7 +22,7 @@ ohos_unittest("ans_unit_test") { include_dirs = [ ".", "include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "/${services_path}/ans/include", "${services_path}/ans/test/unittest/mock/include", @@ -61,14 +61,13 @@ ohos_unittest("ans_unit_test") { "permission_filter_test.cpp", ] - configs = [ "//utils/native/base:utils_config" ] + configs = [ "//commonlibrary/c_utils/base:utils_config" ] deps = [ "${core_path}:ans_core", "${frameworks_module_ans_path}:ans_innerkits", "//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] if (distributed_notification_supported) { @@ -86,6 +85,7 @@ ohos_unittest("ans_unit_test") { "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", diff --git a/services/distributed/BUILD.gn b/services/distributed/BUILD.gn index cceac28cc..454698f91 100644 --- a/services/distributed/BUILD.gn +++ b/services/distributed/BUILD.gn @@ -17,7 +17,7 @@ import("//build/ohos.gni") config("ans_distributed_config") { include_dirs = [ "${services_path}/distributed/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] } @@ -47,13 +47,13 @@ ohos_shared_library("libans_distributed") { external_deps = [ "ability_base:want", "ability_base:zuri", + "c_utils:utils", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "multimedia_image_standard:image_native", - "utils_base:utils", ] subsystem_name = "${subsystem_name}" diff --git a/services/distributed/test/unittest/BUILD.gn b/services/distributed/test/unittest/BUILD.gn index b8157b5ef..21c2ae19a 100644 --- a/services/distributed/test/unittest/BUILD.gn +++ b/services/distributed/test/unittest/BUILD.gn @@ -28,7 +28,7 @@ ohos_unittest("ans_distributed_unit_test") { module_out_path = "${component_name}/unittest" include_dirs = [ "/${services_path}/distributed/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] sources = [ @@ -61,7 +61,6 @@ ohos_unittest("ans_distributed_unit_test") { deps = [ "${core_path}:ans_core", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] external_deps = [ @@ -69,6 +68,7 @@ ohos_unittest("ans_distributed_unit_test") { "ability_base:want", "ability_base:zuri", "bundle_framework:appexecfwk_base", + "c_utils:utils", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", diff --git a/services/test/moduletest/BUILD.gn b/services/test/moduletest/BUILD.gn index c3f8e9130..3481ca0a7 100644 --- a/services/test/moduletest/BUILD.gn +++ b/services/test/moduletest/BUILD.gn @@ -21,7 +21,7 @@ ohos_moduletest("ans_module_test") { module_out_path = module_output_path include_dirs = [ "include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${services_path}/ans/include", "${services_path}/test/moduletest/mock/include", @@ -53,13 +53,12 @@ ohos_moduletest("ans_module_test") { "mock/mock_single_kv_store.cpp", ] - configs = [ "//utils/native/base:utils_config" ] + configs = [ "//commonlibrary/c_utils/base:utils_config" ] deps = [ "${core_path}:ans_core", "${frameworks_module_ans_path}:ans_innerkits", "//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr", - "//utils/native/base:utils", ] external_deps = [ @@ -71,6 +70,7 @@ ohos_moduletest("ans_module_test") { "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", diff --git a/test/bechmarktest/notification_publish_test/BUILD.gn b/test/bechmarktest/notification_publish_test/BUILD.gn index d20571377..08c26a40e 100644 --- a/test/bechmarktest/notification_publish_test/BUILD.gn +++ b/test/bechmarktest/notification_publish_test/BUILD.gn @@ -30,13 +30,13 @@ ohos_benchmarktest("Benchmark_Publish_Test") { "${frameworks_module_ans_path}:ans_innerkits", "//third_party/benchmark:benchmark", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] external_deps = [ "ability_base:want", "ability_base:zuri", "ability_runtime:wantagent_innerkits", + "c_utils:utils", "multimedia_image_standard:image_native", "relational_store:native_rdb", ] diff --git a/test/bechmarktest/notification_services_test/BUILD.gn b/test/bechmarktest/notification_services_test/BUILD.gn index 37a959691..5db99f446 100644 --- a/test/bechmarktest/notification_services_test/BUILD.gn +++ b/test/bechmarktest/notification_services_test/BUILD.gn @@ -36,13 +36,13 @@ ohos_benchmarktest("Benchmark_Notification_Servece_Test") { "${services_path}/ans:libans", "//third_party/benchmark:benchmark", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] external_deps = [ "ability_base:want", "ability_base:zuri", "ability_runtime:wantagent_innerkits", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "multimedia_image_standard:image_native", "relational_store:native_rdb", diff --git a/test/common/acts/BUILD.gn b/test/common/acts/BUILD.gn index d8b4ffc88..e38062f94 100644 --- a/test/common/acts/BUILD.gn +++ b/test/common/acts/BUILD.gn @@ -17,7 +17,7 @@ config("ansfwk_kits_test_config") { visibility = [ ":*" ] include_dirs = [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${services_path}/include", "//foundation/distributedschedule/safwk/services/safwk/include", diff --git a/test/common/acts/actsnotificationfuzztest/BUILD.gn b/test/common/acts/actsnotificationfuzztest/BUILD.gn index 2026181f2..3539bde9b 100644 --- a/test/common/acts/actsnotificationfuzztest/BUILD.gn +++ b/test/common/acts/actsnotificationfuzztest/BUILD.gn @@ -39,7 +39,7 @@ ohos_systemtest("ActsNotificationFuzzTest") { "${services_path}/ans/include", "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include", "//third_party/json/single_include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", ] cflags = [] @@ -57,7 +57,6 @@ ohos_systemtest("ActsNotificationFuzzTest") { "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] defines = [ @@ -71,6 +70,7 @@ ohos_systemtest("ActsNotificationFuzzTest") { "ability_runtime:abilitykit_native", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", diff --git a/test/fuzztest/addnotificationslotgroups_fuzzer/BUILD.gn b/test/fuzztest/addnotificationslotgroups_fuzzer/BUILD.gn index ec9d22247..c03d4364f 100644 --- a/test/fuzztest/addnotificationslotgroups_fuzzer/BUILD.gn +++ b/test/fuzztest/addnotificationslotgroups_fuzzer/BUILD.gn @@ -32,14 +32,12 @@ ohos_fuzztest("AddNotificationSlotGroupsFuzzTest") { ] sources = [ "addnotificationslotgroups_fuzzer.cpp" ] - deps = [ - "${frameworks_module_ans_path}:ans_innerkits", - "//utils/native/base:utils", - ] + deps = [ "${frameworks_module_ans_path}:ans_innerkits" ] external_deps = [ "ability_base:want", "ability_base:zuri", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "multimedia_image_standard:image_native", "relational_store:native_rdb", diff --git a/test/fuzztest/addnotificationslots_fuzzer/BUILD.gn b/test/fuzztest/addnotificationslots_fuzzer/BUILD.gn index 4d91b98a8..9122535cb 100644 --- a/test/fuzztest/addnotificationslots_fuzzer/BUILD.gn +++ b/test/fuzztest/addnotificationslots_fuzzer/BUILD.gn @@ -32,14 +32,12 @@ ohos_fuzztest("AddNotificationSlotsFuzzTest") { ] sources = [ "addnotificationslots_fuzzer.cpp" ] - deps = [ - "${frameworks_module_ans_path}:ans_innerkits", - "//utils/native/base:utils", - ] + deps = [ "${frameworks_module_ans_path}:ans_innerkits" ] external_deps = [ "ability_base:want", "ability_base:zuri", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "multimedia_image_standard:image_native", "relational_store:native_rdb", diff --git a/test/fuzztest/addslotbytype_fuzzer/BUILD.gn b/test/fuzztest/addslotbytype_fuzzer/BUILD.gn index bfd38d724..fda93e854 100644 --- a/test/fuzztest/addslotbytype_fuzzer/BUILD.gn +++ b/test/fuzztest/addslotbytype_fuzzer/BUILD.gn @@ -31,14 +31,12 @@ ohos_fuzztest("AddSlotByTypeFuzzTest") { ] sources = [ "addslotbytype_fuzzer.cpp" ] - deps = [ - "${frameworks_module_ans_path}:ans_innerkits", - "//utils/native/base:utils", - ] + deps = [ "${frameworks_module_ans_path}:ans_innerkits" ] external_deps = [ "ability_base:want", "ability_base:zuri", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "multimedia_image_standard:image_native", "relational_store:native_rdb", diff --git a/test/fuzztest/cancelnotification_fuzzer/BUILD.gn b/test/fuzztest/cancelnotification_fuzzer/BUILD.gn index bb9ca5f56..93ff2aca5 100644 --- a/test/fuzztest/cancelnotification_fuzzer/BUILD.gn +++ b/test/fuzztest/cancelnotification_fuzzer/BUILD.gn @@ -31,14 +31,12 @@ ohos_fuzztest("CancelNotificationFuzzTest") { ] sources = [ "cancelnotification_fuzzer.cpp" ] - deps = [ - "${frameworks_module_ans_path}:ans_innerkits", - "//utils/native/base:utils", - ] + deps = [ "${frameworks_module_ans_path}:ans_innerkits" ] external_deps = [ "ability_base:want", "ability_base:zuri", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "multimedia_image_standard:image_native", "relational_store:native_rdb", diff --git a/test/fuzztest/getnotificationslot_fuzzer/BUILD.gn b/test/fuzztest/getnotificationslot_fuzzer/BUILD.gn index be0cae9bb..7b6605c2d 100644 --- a/test/fuzztest/getnotificationslot_fuzzer/BUILD.gn +++ b/test/fuzztest/getnotificationslot_fuzzer/BUILD.gn @@ -32,14 +32,12 @@ ohos_fuzztest("GetNotificationSlotFuzzTest") { ] sources = [ "getnotificationslot_fuzzer.cpp" ] - deps = [ - "${frameworks_module_ans_path}:ans_innerkits", - "//utils/native/base:utils", - ] + deps = [ "${frameworks_module_ans_path}:ans_innerkits" ] external_deps = [ "ability_base:want", "ability_base:zuri", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "multimedia_image_standard:image_native", "relational_store:native_rdb", diff --git a/test/fuzztest/getnotificationslotgroup_fuzzer/BUILD.gn b/test/fuzztest/getnotificationslotgroup_fuzzer/BUILD.gn index f67a8b4c0..caa0f2b1f 100644 --- a/test/fuzztest/getnotificationslotgroup_fuzzer/BUILD.gn +++ b/test/fuzztest/getnotificationslotgroup_fuzzer/BUILD.gn @@ -32,14 +32,12 @@ ohos_fuzztest("GetNotificationSlotGroupFuzzTest") { ] sources = [ "getnotificationslotgroup_fuzzer.cpp" ] - deps = [ - "${frameworks_module_ans_path}:ans_innerkits", - "//utils/native/base:utils", - ] + deps = [ "${frameworks_module_ans_path}:ans_innerkits" ] external_deps = [ "ability_base:want", "ability_base:zuri", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "multimedia_image_standard:image_native", "relational_store:native_rdb", diff --git a/test/fuzztest/getnotificationslotnumasbundle_fuzzer/BUILD.gn b/test/fuzztest/getnotificationslotnumasbundle_fuzzer/BUILD.gn index 318121444..5a1a638d3 100644 --- a/test/fuzztest/getnotificationslotnumasbundle_fuzzer/BUILD.gn +++ b/test/fuzztest/getnotificationslotnumasbundle_fuzzer/BUILD.gn @@ -32,14 +32,12 @@ ohos_fuzztest("GetNotificationSlotNumAsBundleFuzzTest") { ] sources = [ "getnotificationslotnumasbundle_fuzzer.cpp" ] - deps = [ - "${frameworks_module_ans_path}:ans_innerkits", - "//utils/native/base:utils", - ] + deps = [ "${frameworks_module_ans_path}:ans_innerkits" ] external_deps = [ "ability_base:want", "ability_base:zuri", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "multimedia_image_standard:image_native", "relational_store:native_rdb", diff --git a/test/fuzztest/publishnotification_fuzzer/BUILD.gn b/test/fuzztest/publishnotification_fuzzer/BUILD.gn index 084064f98..18e28369a 100644 --- a/test/fuzztest/publishnotification_fuzzer/BUILD.gn +++ b/test/fuzztest/publishnotification_fuzzer/BUILD.gn @@ -32,14 +32,12 @@ ohos_fuzztest("PublishNotificationFuzzTest") { ] sources = [ "publishnotification_fuzzer.cpp" ] - deps = [ - "${frameworks_module_ans_path}:ans_innerkits", - "//utils/native/base:utils", - ] + deps = [ "${frameworks_module_ans_path}:ans_innerkits" ] external_deps = [ "ability_base:want", "ability_base:zuri", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "multimedia_image_standard:image_native", "relational_store:native_rdb", diff --git a/test/fuzztest/removenotification_fuzzer/BUILD.gn b/test/fuzztest/removenotification_fuzzer/BUILD.gn index de591d3f7..fcb4f7dff 100644 --- a/test/fuzztest/removenotification_fuzzer/BUILD.gn +++ b/test/fuzztest/removenotification_fuzzer/BUILD.gn @@ -31,14 +31,12 @@ ohos_fuzztest("RemoveNotificationFuzzTest") { ] sources = [ "removenotification_fuzzer.cpp" ] - deps = [ - "${frameworks_module_ans_path}:ans_innerkits", - "//utils/native/base:utils", - ] + deps = [ "${frameworks_module_ans_path}:ans_innerkits" ] external_deps = [ "ability_base:want", "ability_base:zuri", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "multimedia_image_standard:image_native", "relational_store:native_rdb", diff --git a/test/fuzztest/removenotificationslot_fuzzer/BUILD.gn b/test/fuzztest/removenotificationslot_fuzzer/BUILD.gn index 0bd40661f..ca8f1b94e 100644 --- a/test/fuzztest/removenotificationslot_fuzzer/BUILD.gn +++ b/test/fuzztest/removenotificationslot_fuzzer/BUILD.gn @@ -32,14 +32,12 @@ ohos_fuzztest("RemoveNotificationSlotFuzzTest") { ] sources = [ "removenotificationslot_fuzzer.cpp" ] - deps = [ - "${frameworks_module_ans_path}:ans_innerkits", - "//utils/native/base:utils", - ] + deps = [ "${frameworks_module_ans_path}:ans_innerkits" ] external_deps = [ "ability_base:want", "ability_base:zuri", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "multimedia_image_standard:image_native", "relational_store:native_rdb", diff --git a/test/fuzztest/removenotificationslotgroup_fuzzer/BUILD.gn b/test/fuzztest/removenotificationslotgroup_fuzzer/BUILD.gn index c98614bf5..d4b2558ff 100644 --- a/test/fuzztest/removenotificationslotgroup_fuzzer/BUILD.gn +++ b/test/fuzztest/removenotificationslotgroup_fuzzer/BUILD.gn @@ -32,14 +32,12 @@ ohos_fuzztest("RemoveNotificationSlotGroupFuzzTest") { ] sources = [ "removenotificationslotgroup_fuzzer.cpp" ] - deps = [ - "${frameworks_module_ans_path}:ans_innerkits", - "//utils/native/base:utils", - ] + deps = [ "${frameworks_module_ans_path}:ans_innerkits" ] external_deps = [ "ability_base:want", "ability_base:zuri", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "multimedia_image_standard:image_native", "relational_store:native_rdb", diff --git a/test/fuzztest/setnotificationbadgenum_fuzzer/BUILD.gn b/test/fuzztest/setnotificationbadgenum_fuzzer/BUILD.gn index a6996f4a0..744555069 100644 --- a/test/fuzztest/setnotificationbadgenum_fuzzer/BUILD.gn +++ b/test/fuzztest/setnotificationbadgenum_fuzzer/BUILD.gn @@ -32,14 +32,12 @@ ohos_fuzztest("SetNotificationBadgeNumFuzzTest") { ] sources = [ "setnotificationbadgenum_fuzzer.cpp" ] - deps = [ - "${frameworks_module_ans_path}:ans_innerkits", - "//utils/native/base:utils", - ] + deps = [ "${frameworks_module_ans_path}:ans_innerkits" ] external_deps = [ "ability_base:want", "ability_base:zuri", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "multimedia_image_standard:image_native", "relational_store:native_rdb", diff --git a/test/resource/ansSTSlotGroupTest/BUILD.gn b/test/resource/ansSTSlotGroupTest/BUILD.gn index a1afa13ed..afc270eca 100644 --- a/test/resource/ansSTSlotGroupTest/BUILD.gn +++ b/test/resource/ansSTSlotGroupTest/BUILD.gn @@ -46,7 +46,6 @@ ohos_shared_library("libraryAnsSTSlotGroupTest") { "${ability_runtime_path}/frameworks/native/appkit:appkit_native", "${core_path}:ans_core", "${frameworks_module_ans_path}:ans_innerkits", - "//utils/native/base:utilsbase", ] external_deps = [ @@ -55,6 +54,7 @@ ohos_shared_library("libraryAnsSTSlotGroupTest") { "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "c_utils:utilsbase", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/systemtest/acts/ansDump/BUILD.gn b/test/systemtest/acts/ansDump/BUILD.gn index 417356181..64415c50e 100644 --- a/test/systemtest/acts/ansDump/BUILD.gn +++ b/test/systemtest/acts/ansDump/BUILD.gn @@ -22,7 +22,7 @@ ohos_systemtest("AnsDumpTest") { include_dirs = [ "//third_party/json/single_include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", ] @@ -35,13 +35,13 @@ ohos_systemtest("AnsDumpTest") { deps = [ "${core_path}:ans_core", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] external_deps = [ "ability_base:want", "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_core", + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "samgr_standard:samgr_proxy", diff --git a/tools/dump/BUILD.gn b/tools/dump/BUILD.gn index b2031fa5e..c13860b62 100644 --- a/tools/dump/BUILD.gn +++ b/tools/dump/BUILD.gn @@ -36,10 +36,7 @@ ohos_executable("anm") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "${core_path}:ans_core", - "//utils/native/base:utils", - ] + deps = [ "${core_path}:ans_core" ] configs = [ "${core_path}:public_ans_core_config", @@ -52,6 +49,7 @@ ohos_executable("anm") { } external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "multimedia_image_standard:image_native", "relational_store:native_rdb", diff --git a/tools/test/unittest/dump/BUILD.gn b/tools/test/unittest/dump/BUILD.gn index 9a77709ff..314e2d4cd 100644 --- a/tools/test/unittest/dump/BUILD.gn +++ b/tools/test/unittest/dump/BUILD.gn @@ -54,13 +54,13 @@ ohos_unittest("notification_shell_command_dump_test") { "${frameworks_module_ans_path}:ans_innerkits", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", - "//utils/native/base:utils", ] external_deps = [ "ability_base:base", "ability_base:want", "ability_base:zuri", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", -- Gitee