From 14704857c2a134623bdca5786b0e0ffe02ddf0f7 Mon Sep 17 00:00:00 2001 From: heguokai Date: Mon, 5 May 2025 11:16:42 +0800 Subject: [PATCH] gn chage Signed-off-by: heguokai --- bundle.json | 4 +- .../ans_notification_annex_test/BUILD.gn | 3 +- frameworks/test/moduletest/BUILD.gn | 11 ++-- services/ans/BUILD.gn | 2 +- services/ans/test/unittest/BUILD.gn | 54 ++++++------------- services/distributed/test/unittest/BUILD.gn | 19 ++++--- .../notification_publish_test/BUILD.gn | 6 +-- .../notification_services_test/BUILD.gn | 6 +-- .../BUILD.gn | 4 +- tools/test/unittest/dump/BUILD.gn | 7 +-- 10 files changed, 43 insertions(+), 73 deletions(-) diff --git a/bundle.json b/bundle.json index 63bff0fb9..2617c996d 100644 --- a/bundle.json +++ b/bundle.json @@ -106,7 +106,9 @@ "libuv", "json", "libxml2", - "node" + "node", + "googletest", + "icu" ], "third_party": [ "libuv", diff --git a/frameworks/core/test/unittest/ans_notification_annex_test/BUILD.gn b/frameworks/core/test/unittest/ans_notification_annex_test/BUILD.gn index c0c8cbe8e..eaca78cd0 100644 --- a/frameworks/core/test/unittest/ans_notification_annex_test/BUILD.gn +++ b/frameworks/core/test/unittest/ans_notification_annex_test/BUILD.gn @@ -31,14 +31,13 @@ ohos_unittest("ans_notification_annex_test") { "ability_base:zuri", "ability_runtime:wantagent_innerkits", "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", "image_framework:image_native", "ipc:ipc_single", "relational_store:native_rdb", ] - public_external_deps = [ "googletest:gtest_main" ] - subsystem_name = "${subsystem_name}" part_name = "${component_name}" } diff --git a/frameworks/test/moduletest/BUILD.gn b/frameworks/test/moduletest/BUILD.gn index 70065c51c..f925a8d00 100644 --- a/frameworks/test/moduletest/BUILD.gn +++ b/frameworks/test/moduletest/BUILD.gn @@ -79,6 +79,7 @@ ohos_moduletest("ans_fw_module_test") { "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gtest_main", "hilog:libhilog", "image_framework:image_native", "ipc:ipc_core", @@ -89,8 +90,6 @@ ohos_moduletest("ans_fw_module_test") { "samgr:samgr_proxy", ] - public_external_deps = [ "googletest:gtest_main" ] - subsystem_name = "${subsystem_name}" part_name = "${component_name}" } @@ -131,10 +130,8 @@ ohos_moduletest("ans_innerkits_module_publish_test") { ] deps = [ - "${ability_runtime_path}/frameworks/native/appkit:app_context", "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/ans:libans", - "//third_party/googletest:gtest_main", ] defines = [] @@ -147,6 +144,10 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "ability_base:base", "ability_base:want", "ability_base:zuri", + "ability_runtime:ability_context_native", + "ability_runtime:abilitykit_native", + "ability_runtime:app_context", + "ability_runtime:appkit_native", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", @@ -157,6 +158,7 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gtest_main", "hilog:libhilog", "image_framework:image_native", "ipc:ipc_core", @@ -180,7 +182,6 @@ ohos_moduletest("ans_innerkits_module_slot_test") { "${frameworks_path}/ans/core/common/include", "${frameworks_path}/ans/core/include", "${component_path}/services/ans/include", - "//third_party/json/include", "${inner_api_path}", "${core_path}/common/include", "${core_path}/include", diff --git a/services/ans/BUILD.gn b/services/ans/BUILD.gn index 14e002917..6721735f4 100644 --- a/services/ans/BUILD.gn +++ b/services/ans/BUILD.gn @@ -298,7 +298,6 @@ ohos_shared_library("libans") { "../ans:ans.para", "../ans:ans.para.dac", "../ans:external.json", - "//third_party/icu/icu4c:shared_icuuc", ] if (distributed_notification_supported) { @@ -326,6 +325,7 @@ ohos_shared_library("libans") { "device_manager:devicemanagersdk", "ffrt:libffrt", "i18n:intl_util", + "icu:shared_icuuc", "image_framework:image_native", "init:libbegetutil", "kv_store:distributeddata_inner", diff --git a/services/ans/test/unittest/BUILD.gn b/services/ans/test/unittest/BUILD.gn index 1a911cadd..58a18318e 100644 --- a/services/ans/test/unittest/BUILD.gn +++ b/services/ans/test/unittest/BUILD.gn @@ -81,6 +81,8 @@ ohos_unittest("ans_unit_test") { "device_manager:devicemanagersdk", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -94,11 +96,6 @@ ohos_unittest("ans_unit_test") { "time_service:time_client", ] - public_external_deps = [ - "googletest:gmock_main", - "googletest:gtest_main", - ] - if (device_usage) { external_deps += [ "device_usage_statistics:usagestatsinner" ] defines += [ "DEVICE_USAGE_STATISTICS_ENABLE" ] @@ -171,6 +168,8 @@ ohos_unittest("notification_preferences_database_test") { "device_manager:devicemanagersdk", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -184,11 +183,6 @@ ohos_unittest("notification_preferences_database_test") { "time_service:time_client", ] - public_external_deps = [ - "googletest:gmock_main", - "googletest:gtest_main", - ] - if (device_usage) { external_deps += [ "device_usage_statistics:usagestatsinner" ] defines += [ "DEVICE_USAGE_STATISTICS_ENABLE" ] @@ -263,6 +257,8 @@ ohos_unittest("notification_subscriber_manager_test") { "device_manager:devicemanagersdk", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -276,11 +272,6 @@ ohos_unittest("notification_subscriber_manager_test") { "time_service:time_client", ] - public_external_deps = [ - "googletest:gmock_main", - "googletest:gtest_main", - ] - if (device_usage) { external_deps += [ "device_usage_statistics:usagestatsinner" ] defines += [ "DEVICE_USAGE_STATISTICS_ENABLE" ] @@ -366,6 +357,7 @@ ohos_unittest("notification_service_test") { "device_manager:devicemanagersdk", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -379,8 +371,6 @@ ohos_unittest("notification_service_test") { "time_service:time_client", ] - public_external_deps = [ "googletest:gtest_main" ] - if (device_usage) { external_deps += [ "device_usage_statistics:usagestatsinner" ] defines += [ "DEVICE_USAGE_STATISTICS_ENABLE" ] @@ -466,6 +456,7 @@ ohos_unittest("notification_publish_service_test") { "device_manager:devicemanagersdk", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -479,8 +470,6 @@ ohos_unittest("notification_publish_service_test") { "time_service:time_client", ] - public_external_deps = [ "googletest:gtest_main" ] - if (device_usage) { external_deps += [ "device_usage_statistics:usagestatsinner" ] defines += [ "DEVICE_USAGE_STATISTICS_ENABLE" ] @@ -562,6 +551,7 @@ ohos_unittest("notification_service_publish_test") { "device_manager:devicemanagersdk", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -575,8 +565,6 @@ ohos_unittest("notification_service_publish_test") { "time_service:time_client", ] - public_external_deps = [ "googletest:gtest_main" ] - if (device_usage) { external_deps += [ "device_usage_statistics:usagestatsinner" ] defines += [ "DEVICE_USAGE_STATISTICS_ENABLE" ] @@ -652,6 +640,7 @@ ohos_unittest("notification_preferences_test") { "device_manager:devicemanagersdk", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -665,8 +654,6 @@ ohos_unittest("notification_preferences_test") { "time_service:time_client", ] - public_external_deps = [ "googletest:gtest_main" ] - if (device_usage) { external_deps += [ "device_usage_statistics:usagestatsinner" ] defines += [ "DEVICE_USAGE_STATISTICS_ENABLE" ] @@ -772,6 +759,7 @@ ohos_unittest("bundle_manager_helper_branch_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -785,8 +773,6 @@ ohos_unittest("bundle_manager_helper_branch_test") { "time_service:time_client", ] - public_external_deps = [ "googletest:gtest_main" ] - if (player_framework) { external_deps += [ "player_framework:media_client" ] defines = [ "PLAYER_FRAMEWORK_ENABLE" ] @@ -829,6 +815,7 @@ ohos_unittest("notification_dialog_test") { "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -842,8 +829,6 @@ ohos_unittest("notification_dialog_test") { "time_service:time_client", ] - public_external_deps = [ "googletest:gtest_main" ] - if (player_framework) { external_deps += [ "player_framework:media_client" ] defines = [ "PLAYER_FRAMEWORK_ENABLE" ] @@ -899,6 +884,7 @@ ohos_unittest("notification_subscriber_manager_branch_test") { "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -912,8 +898,6 @@ ohos_unittest("notification_subscriber_manager_branch_test") { "time_service:time_client", ] - public_external_deps = [ "googletest:gtest_main" ] - if (player_framework) { external_deps += [ "player_framework:media_client" ] defines += [ "PLAYER_FRAMEWORK_ENABLE" ] @@ -1033,6 +1017,7 @@ ohos_unittest("notification_preferences_database_branch_test") { "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -1047,8 +1032,6 @@ ohos_unittest("notification_preferences_database_branch_test") { "time_service:time_client", ] - public_external_deps = [ "googletest:gtest_main" ] - if (player_framework) { external_deps += [ "player_framework:media_client" ] defines = [ "PLAYER_FRAMEWORK_ENABLE" ] @@ -1084,6 +1067,7 @@ ohos_unittest("push_callback_stub_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -1097,8 +1081,6 @@ ohos_unittest("push_callback_stub_test") { "time_service:time_client", ] - public_external_deps = [ "googletest:gtest_main" ] - if (player_framework) { external_deps += [ "player_framework:media_client" ] defines = [ "PLAYER_FRAMEWORK_ENABLE" ] @@ -1140,6 +1122,7 @@ ohos_unittest("notification_rdb_data_mgr_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -1153,8 +1136,6 @@ ohos_unittest("notification_rdb_data_mgr_test") { "time_service:time_client", ] - public_external_deps = [ "googletest:gtest_main" ] - if (player_framework) { external_deps += [ "player_framework:media_client" ] defines = [ "PLAYER_FRAMEWORK_ENABLE" ] @@ -1194,6 +1175,7 @@ ohos_unittest("notification_config_parse_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -1208,8 +1190,6 @@ ohos_unittest("notification_config_parse_test") { "time_service:time_client", ] - public_external_deps = [ "googletest:gtest_main" ] - if (player_framework) { external_deps += [ "player_framework:media_client" ] defines = [ "PLAYER_FRAMEWORK_ENABLE" ] diff --git a/services/distributed/test/unittest/BUILD.gn b/services/distributed/test/unittest/BUILD.gn index 35996cfb1..aaae1d003 100644 --- a/services/distributed/test/unittest/BUILD.gn +++ b/services/distributed/test/unittest/BUILD.gn @@ -79,6 +79,7 @@ ohos_unittest("ans_distributed_unit_test") { "device_manager:devicemanagersdk", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -87,8 +88,6 @@ ohos_unittest("ans_distributed_unit_test") { "kv_store:distributeddata_inner", ] - public_external_deps = [ "googletest:gtest_main" ] - subsystem_name = "${subsystem_name}" part_name = "${component_name}" } @@ -115,7 +114,6 @@ ohos_unittest("distributed_preferences_database_test") { deps = [ "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/distributed:libans_distributed", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -126,6 +124,7 @@ ohos_unittest("distributed_preferences_database_test") { "c_utils:utils", "device_manager:devicemanagersdk", "eventhandler:libeventhandler", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -161,7 +160,6 @@ ohos_unittest("distributed_screen_status_manager_branch_test") { deps = [ "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/distributed:libans_distributed", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -172,6 +170,7 @@ ohos_unittest("distributed_screen_status_manager_branch_test") { "c_utils:utils", "device_manager:devicemanagersdk", "eventhandler:libeventhandler", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -207,7 +206,6 @@ ohos_unittest("distributed_database_branch_test") { deps = [ "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/distributed:libans_distributed", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -218,6 +216,7 @@ ohos_unittest("distributed_database_branch_test") { "c_utils:utils", "device_manager:devicemanagersdk", "eventhandler:libeventhandler", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -247,7 +246,6 @@ ohos_unittest("distributed_preferences_branch_test") { deps = [ "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/distributed:libans_distributed", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -258,6 +256,7 @@ ohos_unittest("distributed_preferences_branch_test") { "c_utils:utils", "device_manager:devicemanagersdk", "eventhandler:libeventhandler", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -284,7 +283,6 @@ ohos_unittest("distributed_device_callback_test") { deps = [ "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/distributed:libans_distributed", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -295,6 +293,7 @@ ohos_unittest("distributed_device_callback_test") { "c_utils:utils", "device_manager:devicemanagersdk", "eventhandler:libeventhandler", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -321,7 +320,6 @@ ohos_unittest("distributed_database_callback_test") { deps = [ "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/distributed:libans_distributed", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -331,6 +329,7 @@ ohos_unittest("distributed_database_callback_test") { "bundle_framework:appexecfwk_base", "c_utils:utils", "eventhandler:libeventhandler", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -357,7 +356,6 @@ ohos_unittest("distributed_flow_control_test") { deps = [ "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/distributed:libans_distributed", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -367,6 +365,7 @@ ohos_unittest("distributed_flow_control_test") { "bundle_framework:appexecfwk_base", "c_utils:utils", "eventhandler:libeventhandler", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", @@ -396,7 +395,6 @@ ohos_unittest("distributed_notification_manager_branch_test") { deps = [ "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/distributed:libans_distributed", - "//third_party/googletest:gtest_main", ] external_deps = [ @@ -408,6 +406,7 @@ ohos_unittest("distributed_notification_manager_branch_test") { "device_manager:devicemanagersdk", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "hitrace:libhitracechain", diff --git a/test/bechmarktest/notification_publish_test/BUILD.gn b/test/bechmarktest/notification_publish_test/BUILD.gn index a05f38167..1cd96d741 100644 --- a/test/bechmarktest/notification_publish_test/BUILD.gn +++ b/test/bechmarktest/notification_publish_test/BUILD.gn @@ -33,15 +33,11 @@ ohos_benchmarktest("Benchmark_Publish_Test") { "ability_base:zuri", "ability_runtime:wantagent_innerkits", "c_utils:utils", + "googletest:gtest_main", "image_framework:image_native", "relational_store:native_rdb", ] - public_external_deps = [ - "benchmark:benchmark", - "googletest:gtest_main", - ] - subsystem_name = "${subsystem_name}" part_name = "${component_name}" } diff --git a/test/bechmarktest/notification_services_test/BUILD.gn b/test/bechmarktest/notification_services_test/BUILD.gn index 0706d6630..414e4629a 100644 --- a/test/bechmarktest/notification_services_test/BUILD.gn +++ b/test/bechmarktest/notification_services_test/BUILD.gn @@ -47,16 +47,12 @@ ohos_benchmarktest("Benchmark_Notification_Servece_Test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", + "googletest:gtest_main", "image_framework:image_native", "kv_store:distributeddata_inner", "relational_store:native_rdb", ] - public_external_deps = [ - "benchmark:benchmark", - "googletest:gtest_main", - ] - subsystem_name = "${subsystem_name}" part_name = "${component_name}" } diff --git a/test/fuzztest/advancednotificationservice_fuzzer/BUILD.gn b/test/fuzztest/advancednotificationservice_fuzzer/BUILD.gn index 93162dca8..1e5617b37 100644 --- a/test/fuzztest/advancednotificationservice_fuzzer/BUILD.gn +++ b/test/fuzztest/advancednotificationservice_fuzzer/BUILD.gn @@ -38,8 +38,6 @@ ohos_fuzztest("AdvancedNotificationServiceFuzzTest") { "${component_path}/test/fuzztest/fuzz_common_base:fuzz_common_base", "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/ans:ans_service_sources", - "//third_party/icu/icu4c:shared_icuuc", - "//third_party/libxml2:libxml2", ] if (is_double_framework) { @@ -78,9 +76,11 @@ ohos_fuzztest("AdvancedNotificationServiceFuzzTest") { "ffrt:libffrt", "hilog:libhilog", "i18n:intl_util", + "icu:shared_icuuc", "image_framework:image_native", "init:libbegetutil", "kv_store:distributeddata_inner", + "libxml2:libxml2", "openssl:libcrypto_shared", "os_account:os_account_innerkits", "relational_store:native_rdb", diff --git a/tools/test/unittest/dump/BUILD.gn b/tools/test/unittest/dump/BUILD.gn index b91dca8f1..144fd6fe6 100644 --- a/tools/test/unittest/dump/BUILD.gn +++ b/tools/test/unittest/dump/BUILD.gn @@ -72,15 +72,12 @@ ohos_unittest("notification_shell_command_dump_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "relational_store:native_rdb", ] - - public_external_deps = [ - "googletest:gmock_main", - "googletest:gtest_main", - ] } group("unittest") { -- Gitee