From 1c3247262b75860b4816561a6c55e7fa89fdf165 Mon Sep 17 00:00:00 2001 From: gaojiaqi Date: Mon, 14 Apr 2025 20:36:23 +0800 Subject: [PATCH] update gn Signed-off-by: gaojiaqi --- services/reminder/BUILD.gn | 103 ++++++++++++++++++ services/reminder/libreminder.map | 20 ---- services/reminder/test/unittest/BUILD.gn | 22 +--- .../reminderdatamanager_fuzzer/BUILD.gn | 2 +- .../reminderdatasharehelper_fuzzer/BUILD.gn | 5 +- test/fuzztest/reminderservice_fuzzer/BUILD.gn | 2 +- test/fuzztest/reminderstore_fuzzer/BUILD.gn | 2 +- .../reminderstoreannex_fuzzer/BUILD.gn | 2 +- 8 files changed, 116 insertions(+), 42 deletions(-) diff --git a/services/reminder/BUILD.gn b/services/reminder/BUILD.gn index 7e7ca5142..9ff30890d 100644 --- a/services/reminder/BUILD.gn +++ b/services/reminder/BUILD.gn @@ -276,3 +276,106 @@ ohos_shared_library("libreminder") { subsystem_name = "${subsystem_name}" part_name = "${component_name}" } + +# for unittest +ohos_static_library("libreminder_static") { + sanitize = { + integer_overflow = true + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + debug = false + } + branch_protector_ret = "pac_ret" + + cflags = [ + "-fno-math-errno", + "-fno-unroll-loops", + "-fmerge-all-constants", + "-fno-ident", + "-Oz", + "-flto", + "-ffunction-sections", + "-fdata-sections", + ] + sources = [] + + configs = [ ":public_reminder_config" ] + + defines = [] + + if (is_double_framework) { + cflags += [ "-DCONFIG_DUAL_FRAMEWORK" ] + } + + deps = [ "${services_path}/reminder:reminder_service_sources" ] + + if (distributed_notification_supported) { + deps += [ "${services_path}/distributed:libans_distributed" ] + } + + external_deps = [ + "ability_base:configuration", + "ability_runtime:ability_manager", + "ability_runtime:app_manager", + "ability_runtime:appkit_native", + "ability_runtime:dataobs_manager", + "ability_runtime:extension_manager", + "ability_runtime:wantagent_innerkits", + "access_token:libaccesstoken_sdk", + "access_token:libtokenid_sdk", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", + "c_utils:utils", + "common_event_service:cesfwk_innerkits", + "config_policy:configpolicy_util", + "data_share:datashare_common", + "data_share:datashare_consumer", + "data_share:datashare_permission", + "device_manager:devicemanagersdk", + "ffrt:libffrt", + "i18n:intl_util", + "image_framework:image_native", + "init:libbegetutil", + "kv_store:distributeddata_inner", + "openssl:libcrypto_shared", + "os_account:os_account_innerkits", + "relational_store:native_rdb", + "resource_management:global_resmgr", + "time_service:time_client", + ] + external_deps += component_external_deps + + if (device_usage) { + external_deps += [ "device_usage_statistics:usagestatsinner" ] + } + + if (hisysevent_usage) { + cflags += [ "-DHAS_HISYSEVENT_PART" ] + external_deps += [ "hisysevent:libhisysevent" ] + } + + if (standby_enable) { + external_deps += [ "device_standby:standby_innerkits" ] + } + + if (player_framework) { + external_deps += [ "player_framework:media_client" ] + } + + if (ans_hitrace_usage) { + external_deps += [ "hitrace:hitrace_meter" ] + } + + if (ans_config_policy_enable) { + external_deps += [ "config_policy:configpolicy_util" ] + } + + if (screenlock_mgr_enable) { + external_deps += [ "screenlock_mgr:screenlock_client" ] + } + + subsystem_name = "${subsystem_name}" + part_name = "${component_name}" +} diff --git a/services/reminder/libreminder.map b/services/reminder/libreminder.map index d9c548487..5e7f34b03 100644 --- a/services/reminder/libreminder.map +++ b/services/reminder/libreminder.map @@ -13,26 +13,6 @@ 1.0 { global: - *BundleInfo*; - *BundleManagerHelper*; - *Connect*; - *Delete*; - *Disconnect*; - *GetBundle*; - *GetDefaultUidByBundleName*; - *GetDoNotDisturb*; - *GetInstance*; - *Init*; - *IsAllowedNotify*; - *IsSystemApp*; - *Notification*; - *Notify*; - *OnRemoteDied*; - *Publish*; - *Put*; - *Query*; - *Remove*; - *Subscribe*; local: *; }; diff --git a/services/reminder/test/unittest/BUILD.gn b/services/reminder/test/unittest/BUILD.gn index 9f1f4990a..c176a1d4e 100644 --- a/services/reminder/test/unittest/BUILD.gn +++ b/services/reminder/test/unittest/BUILD.gn @@ -31,8 +31,6 @@ ohos_unittest("reminder_unit_test") { defines = [] sources = [ - "mock/mock_access_token_helper.cpp", - "mock/mock_bundle_manager_helper.cpp", "mock/mock_ipc.cpp", "reminder_data_manager_test.cpp", ] @@ -40,7 +38,7 @@ ohos_unittest("reminder_unit_test") { deps = [ "${frameworks_module_ans_path}:ans_innerkits", "${frameworks_module_reminder_path}:reminder_innerkits", - "${services_path}/reminder:libreminder", + "${services_path}/reminder:libreminder_static", ] if (distributed_notification_supported) { @@ -242,7 +240,7 @@ ohos_unittest("reminder_bundle_manager_helper_branch_test") { deps = [ "${frameworks_module_reminder_path}:reminder_innerkits", - "${services_path}/reminder:libreminder", + "${services_path}/reminder:libreminder_static", ] external_deps = [ @@ -295,7 +293,7 @@ ohos_unittest("reminder_os_account_manager_helper_test") { deps = [ "${frameworks_module_reminder_path}:reminder_innerkits", - "${services_path}/reminder:libreminder", + "${services_path}/reminder:libreminder_static", ] external_deps = [ @@ -354,19 +352,11 @@ ohos_unittest("reminder_service_test") { defines = [] - sources = [ - "mock/mock_access_token_helper.cpp", - "mock/mock_accesstoken_kit.cpp", - "mock/mock_bundle_manager_helper.cpp", - "mock/mock_bundle_mgr.cpp", - "mock/mock_ipc.cpp", - "mock/mock_os_account_manager.cpp", - "reminder_store_test.cpp", - ] + sources = [ "reminder_store_test.cpp" ] deps = [ "${frameworks_module_reminder_path}:reminder_innerkits", - "${services_path}/reminder:libreminder", + "${services_path}/reminder:libreminder_static", ] if (distributed_notification_supported) { @@ -449,7 +439,7 @@ ohos_unittest("reminder_agent_service_ability_test") { deps = [ "${frameworks_module_reminder_path}:reminder_innerkits", - "${services_path}/reminder:libreminder", + "${services_path}/reminder:libreminder_static", ] if (distributed_notification_supported) { diff --git a/test/fuzztest/reminderdatamanager_fuzzer/BUILD.gn b/test/fuzztest/reminderdatamanager_fuzzer/BUILD.gn index 44df209c6..fe869bec1 100644 --- a/test/fuzztest/reminderdatamanager_fuzzer/BUILD.gn +++ b/test/fuzztest/reminderdatamanager_fuzzer/BUILD.gn @@ -39,7 +39,7 @@ ohos_fuzztest("ReminderDataManagerFuzzTest") { deps = [ "${component_path}/test/fuzztest/fuzz_common_base:fuzz_common_base", "${frameworks_module_reminder_path}:reminder_innerkits", - "${services_path}/reminder:libreminder", + "${services_path}/reminder:libreminder_static", ] external_deps = [ diff --git a/test/fuzztest/reminderdatasharehelper_fuzzer/BUILD.gn b/test/fuzztest/reminderdatasharehelper_fuzzer/BUILD.gn index ec0558b59..33790f577 100644 --- a/test/fuzztest/reminderdatasharehelper_fuzzer/BUILD.gn +++ b/test/fuzztest/reminderdatasharehelper_fuzzer/BUILD.gn @@ -19,7 +19,8 @@ import("//build/test.gni") ##############################fuzztest########################################## ohos_fuzztest("ReminderDataShareHelperFuzzTest") { module_out_path = service_fuzz_test_path - fuzz_config_file = "${component_path}/test/fuzztest/reminderstore_fuzzer" + fuzz_config_file = + "${component_path}/test/fuzztest/reminderdatasharehelper_fuzzer" include_dirs = [ "${component_path}/test/fuzztest/fuzz_common_base", @@ -38,7 +39,7 @@ ohos_fuzztest("ReminderDataShareHelperFuzzTest") { deps = [ "${component_path}/test/fuzztest/fuzz_common_base:fuzz_common_base", "${frameworks_module_reminder_path}:reminder_innerkits", - "${services_path}/reminder:libreminder", + "${services_path}/reminder:libreminder_static", ] external_deps = [ diff --git a/test/fuzztest/reminderservice_fuzzer/BUILD.gn b/test/fuzztest/reminderservice_fuzzer/BUILD.gn index dbf9b6260..cfc257392 100644 --- a/test/fuzztest/reminderservice_fuzzer/BUILD.gn +++ b/test/fuzztest/reminderservice_fuzzer/BUILD.gn @@ -38,7 +38,7 @@ ohos_fuzztest("ReminderServiceFuzzTest") { deps = [ "${component_path}/test/fuzztest/fuzz_common_base:fuzz_common_base", "${frameworks_module_reminder_path}:reminder_innerkits", - "${services_path}/reminder:reminder_service_sources", + "${services_path}/reminder:libreminder_static", ] if (is_double_framework) { diff --git a/test/fuzztest/reminderstore_fuzzer/BUILD.gn b/test/fuzztest/reminderstore_fuzzer/BUILD.gn index dff05f6da..8d7e7ff34 100644 --- a/test/fuzztest/reminderstore_fuzzer/BUILD.gn +++ b/test/fuzztest/reminderstore_fuzzer/BUILD.gn @@ -38,7 +38,7 @@ ohos_fuzztest("ReminderStoreFuzzTest") { deps = [ "${component_path}/test/fuzztest/fuzz_common_base:fuzz_common_base", "${frameworks_module_reminder_path}:reminder_innerkits", - "${services_path}/reminder:libreminder", + "${services_path}/reminder:libreminder_static", ] external_deps = [ diff --git a/test/fuzztest/reminderstoreannex_fuzzer/BUILD.gn b/test/fuzztest/reminderstoreannex_fuzzer/BUILD.gn index 64f84c160..3dce4b164 100644 --- a/test/fuzztest/reminderstoreannex_fuzzer/BUILD.gn +++ b/test/fuzztest/reminderstoreannex_fuzzer/BUILD.gn @@ -38,7 +38,7 @@ ohos_fuzztest("ReminderStoreAnnexFuzzTest") { deps = [ "${component_path}/test/fuzztest/fuzz_common_base:fuzz_common_base", "${frameworks_module_reminder_path}:reminder_innerkits", - "${services_path}/reminder:libreminder", + "${services_path}/reminder:libreminder_static", ] external_deps = [ -- Gitee