From edff29d4e292fd007c4b35a9d7a5edde17860f30 Mon Sep 17 00:00:00 2001 From: songjindian Date: Thu, 5 Sep 2024 20:25:42 +0800 Subject: [PATCH] =?UTF-8?q?cfi=E5=90=8E=E5=90=91=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: songjindian --- cj_environment/frameworks/cj_environment/BUILD.gn | 2 ++ frameworks/js/napi/dialog_request_info/BUILD.gn | 2 ++ frameworks/js/napi/inner/napi_common/BUILD.gn | 2 ++ frameworks/native/ability/BUILD.gn | 2 ++ frameworks/native/ability/native/BUILD.gn | 12 ++++++++++++ frameworks/native/appkit/BUILD.gn | 10 ++++++++++ interfaces/inner_api/ability_manager/BUILD.gn | 8 ++++++++ interfaces/inner_api/app_manager/BUILD.gn | 2 ++ interfaces/inner_api/connectionobs_manager/BUILD.gn | 2 ++ interfaces/inner_api/deps_wrapper/BUILD.gn | 2 ++ interfaces/inner_api/error_utils/BUILD.gn | 2 ++ interfaces/inner_api/extension_manager/BUILD.gn | 2 ++ interfaces/inner_api/runtime/BUILD.gn | 2 ++ interfaces/inner_api/session_handler/BUILD.gn | 2 ++ interfaces/inner_api/uri_permission/BUILD.gn | 2 ++ interfaces/inner_api/wantagent/BUILD.gn | 2 ++ js_environment/frameworks/js_environment/BUILD.gn | 2 ++ services/common/BUILD.gn | 8 ++++++++ utils/global/freeze/BUILD.gn | 2 ++ 19 files changed, 68 insertions(+) diff --git a/cj_environment/frameworks/cj_environment/BUILD.gn b/cj_environment/frameworks/cj_environment/BUILD.gn index c15c50888a..568cd041b6 100644 --- a/cj_environment/frameworks/cj_environment/BUILD.gn +++ b/cj_environment/frameworks/cj_environment/BUILD.gn @@ -24,6 +24,8 @@ config("cj_rt_public_config") { } ohos_shared_library("cj_environment") { + branch_protector_ret = "pac_ret" + cflags_cc = [ "-std=c++17", "-fvisibility=hidden", diff --git a/frameworks/js/napi/dialog_request_info/BUILD.gn b/frameworks/js/napi/dialog_request_info/BUILD.gn index 40087c37ae..faad70ebf1 100755 --- a/frameworks/js/napi/dialog_request_info/BUILD.gn +++ b/frameworks/js/napi/dialog_request_info/BUILD.gn @@ -19,6 +19,8 @@ config("dialog_request_info_external_config") { } ohos_shared_library("dialog_request_info") { + branch_protector_ret = "pac_ret" + sources = [ "request_info.cpp" ] public_configs = [ ":dialog_request_info_external_config" ] diff --git a/frameworks/js/napi/inner/napi_common/BUILD.gn b/frameworks/js/napi/inner/napi_common/BUILD.gn index 98c0e60231..44b74ede2b 100644 --- a/frameworks/js/napi/inner/napi_common/BUILD.gn +++ b/frameworks/js/napi/inner/napi_common/BUILD.gn @@ -19,6 +19,8 @@ config("napi_common_public_config") { } ohos_shared_library("napi_common") { + branch_protector_ret = "pac_ret" + include_dirs = [ "${ability_runtime_napi_path}/featureAbility" ] public_configs = [ diff --git a/frameworks/native/ability/BUILD.gn b/frameworks/native/ability/BUILD.gn index b36077bc02..a4f823b94d 100644 --- a/frameworks/native/ability/BUILD.gn +++ b/frameworks/native/ability/BUILD.gn @@ -47,6 +47,8 @@ config("ability_context_public_config") { } ohos_shared_library("ability_context_native") { + branch_protector_ret = "pac_ret" + public_configs = [ ":ability_context_public_config" ] include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/ability/native/ui_service_extension_ability/connection" ] diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index 25827bd6f0..dc4b4b7d67 100644 --- a/frameworks/native/ability/native/BUILD.gn +++ b/frameworks/native/ability/native/BUILD.gn @@ -123,6 +123,8 @@ config("abilitykit_utils_public_config") { } ohos_shared_library("abilitykit_utils") { + branch_protector_ret = "pac_ret" + include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/ability/native", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app", @@ -189,6 +191,8 @@ ohos_shared_library("abilitykit_utils") { } ohos_shared_library("abilitykit_native") { + branch_protector_ret = "pac_ret" + include_dirs = [ "${ability_runtime_path}/utils/global/time/include", "${ability_runtime_path}/interfaces/kits/native/ability/native/ui_service_extension_ability/connection", @@ -1045,6 +1049,8 @@ ohos_shared_library("ui_service_extension_module") { } ohos_shared_library("continuation_ipc") { + branch_protector_ret = "pac_ret" + include_dirs = [] sources = [ @@ -1210,6 +1216,8 @@ config("ability_business_error_public_config") { } ohos_shared_library("ability_business_error") { + branch_protector_ret = "pac_ret" + sources = [ "${ability_runtime_native_path}/ability/native/ability_business_error/ability_business_error.cpp" ] configs = [ ":ability_business_error_config" ] @@ -1234,6 +1242,8 @@ config("dialog_request_callback_public_config") { } ohos_shared_library("dialog_request_callback") { + branch_protector_ret = "pac_ret" + sources = [ "${ability_runtime_native_path}/ability/native/dialog_request_callback/dialog_request_callback_proxy.cpp", "${ability_runtime_native_path}/ability/native/dialog_request_callback/dialog_request_callback_stub.cpp", @@ -1532,6 +1542,8 @@ ohos_shared_library("share_extension_module") { } ohos_shared_library("auto_startup_callback") { + branch_protector_ret = "pac_ret" + include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/ability/native/ability_business_error" ] sources = [ diff --git a/frameworks/native/appkit/BUILD.gn b/frameworks/native/appkit/BUILD.gn index 56f3b4f872..fe9d6575e7 100644 --- a/frameworks/native/appkit/BUILD.gn +++ b/frameworks/native/appkit/BUILD.gn @@ -267,6 +267,8 @@ ohos_shared_library("appkit_native") { # build so ohos_shared_library("app_context") { + branch_protector_ret = "pac_ret" + include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", "${ability_runtime_path}/interfaces/kits/native/appkit/app", @@ -335,6 +337,8 @@ ohos_shared_library("app_context") { # build so ohos_shared_library("app_context_utils") { + branch_protector_ret = "pac_ret" + include_dirs = [ "${ability_runtime_napi_path}/ability_auto_startup_callback", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", @@ -397,6 +401,8 @@ ohos_shared_library("app_context_utils") { # build so ohos_shared_library("appkit_delegator") { + branch_protector_ret = "pac_ret" + include_dirs = [ "native", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app", @@ -480,6 +486,8 @@ config("application_context_manager_config") { } ohos_shared_library("appkit_manager_helper") { + branch_protector_ret = "pac_ret" + include_dirs = [ "native", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app", @@ -524,6 +532,8 @@ ohos_shared_library("appkit_manager_helper") { } ohos_shared_library("application_context_manager") { + branch_protector_ret = "pac_ret" + sources = [ "${ability_runtime_native_path}/appkit/ability_runtime/context/application_context_manager.cpp" ] cflags = [] diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn index 1610b5d5fa..07e519bdc5 100644 --- a/interfaces/inner_api/ability_manager/BUILD.gn +++ b/interfaces/inner_api/ability_manager/BUILD.gn @@ -61,6 +61,8 @@ config("ability_manager_public_config") { } ohos_shared_library("ability_manager") { + branch_protector_ret = "pac_ret" + sources = [ "${ability_runtime_native_path}/ability/native/data_ability_operation.cpp", "${ability_runtime_native_path}/ability/native/data_ability_operation_builder.cpp", @@ -224,6 +226,8 @@ ohos_shared_library("ability_start_options") { } ohos_shared_library("mission_info") { + branch_protector_ret = "pac_ret" + sources = [ "${ability_runtime_services_path}/abilitymgr/src/mission_info.cpp", "${ability_runtime_services_path}/abilitymgr/src/mission_snapshot.cpp", @@ -270,6 +274,8 @@ ohos_shared_library("ability_manager_c") { } ohos_shared_library("ability_start_setting") { + branch_protector_ret = "pac_ret" + sources = [ "${ability_runtime_services_path}/abilitymgr/src/ability_start_setting.cpp", ] @@ -327,6 +333,8 @@ ohos_shared_library("process_options") { } ohos_shared_library("ability_connect_callback_stub") { + branch_protector_ret = "pac_ret" + defines = [ "AMS_LOG_TAG = \"Ability\"" ] defines += [ "AMS_LOG_DOMAIN = 0xD001300" ] include_dirs = [ diff --git a/interfaces/inner_api/app_manager/BUILD.gn b/interfaces/inner_api/app_manager/BUILD.gn index 5062a77989..3d8d10569d 100644 --- a/interfaces/inner_api/app_manager/BUILD.gn +++ b/interfaces/inner_api/app_manager/BUILD.gn @@ -35,6 +35,8 @@ config("appmgr_core_config") { } ohos_shared_library("app_manager") { + branch_protector_ret = "pac_ret" + include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/appkit/dfr", "${ability_runtime_path}/utils/global/time/include", diff --git a/interfaces/inner_api/connectionobs_manager/BUILD.gn b/interfaces/inner_api/connectionobs_manager/BUILD.gn index 8feabc9b70..90455e91df 100644 --- a/interfaces/inner_api/connectionobs_manager/BUILD.gn +++ b/interfaces/inner_api/connectionobs_manager/BUILD.gn @@ -31,6 +31,8 @@ config("connection_obs_manager_public_config") { } ohos_shared_library("connection_obs_manager") { + branch_protector_ret = "pac_ret" + sources = [ "src/connection_data.cpp", "src/connection_observer_client.cpp", diff --git a/interfaces/inner_api/deps_wrapper/BUILD.gn b/interfaces/inner_api/deps_wrapper/BUILD.gn index 24c830bfff..b2acd41cf7 100644 --- a/interfaces/inner_api/deps_wrapper/BUILD.gn +++ b/interfaces/inner_api/deps_wrapper/BUILD.gn @@ -31,6 +31,8 @@ config("ability_deps_wrapper_config") { } ohos_shared_library("ability_deps_wrapper") { + branch_protector_ret = "pac_ret" + sources = [ "src/os_account_manager_wrapper.cpp", "src/sa_mgr_client.cpp", diff --git a/interfaces/inner_api/error_utils/BUILD.gn b/interfaces/inner_api/error_utils/BUILD.gn index f54a518f1d..b4db235008 100644 --- a/interfaces/inner_api/error_utils/BUILD.gn +++ b/interfaces/inner_api/error_utils/BUILD.gn @@ -26,6 +26,8 @@ config("error_utils_config") { } ohos_shared_library("ability_runtime_error_util") { + branch_protector_ret = "pac_ret" + sources = [ "src/ability_runtime_error_util.cpp" ] public_configs = [ ":error_utils_config" ] diff --git a/interfaces/inner_api/extension_manager/BUILD.gn b/interfaces/inner_api/extension_manager/BUILD.gn index 5e80e8c57a..fed2a7131e 100755 --- a/interfaces/inner_api/extension_manager/BUILD.gn +++ b/interfaces/inner_api/extension_manager/BUILD.gn @@ -35,6 +35,8 @@ config("extension_manager_config") { } ohos_shared_library("extension_manager") { + branch_protector_ret = "pac_ret" + sources = [ "src/extension_manager_client.cpp", "src/extension_manager_proxy.cpp", diff --git a/interfaces/inner_api/runtime/BUILD.gn b/interfaces/inner_api/runtime/BUILD.gn index 2b330c10ad..689a57c91b 100644 --- a/interfaces/inner_api/runtime/BUILD.gn +++ b/interfaces/inner_api/runtime/BUILD.gn @@ -48,6 +48,8 @@ config("runtime_all_deps_config") { } ohos_shared_library("runtime") { + branch_protector_ret = "pac_ret" + include_dirs = [ "${ability_runtime_path}/services/abilitymgr/include", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper", diff --git a/interfaces/inner_api/session_handler/BUILD.gn b/interfaces/inner_api/session_handler/BUILD.gn index c40fe59d36..1805c2883a 100644 --- a/interfaces/inner_api/session_handler/BUILD.gn +++ b/interfaces/inner_api/session_handler/BUILD.gn @@ -32,6 +32,8 @@ config("session_handler_config") { } ohos_shared_library("session_handler") { + branch_protector_ret = "pac_ret" + sanitize = { integer_overflow = true ubsan = true diff --git a/interfaces/inner_api/uri_permission/BUILD.gn b/interfaces/inner_api/uri_permission/BUILD.gn index d262798e91..d9a650aaf6 100644 --- a/interfaces/inner_api/uri_permission/BUILD.gn +++ b/interfaces/inner_api/uri_permission/BUILD.gn @@ -26,6 +26,8 @@ config("uripermkit_public_config") { #build so ohos_shared_library("uri_permission_mgr") { + branch_protector_ret = "pac_ret" + configs = [ "${ability_runtime_services_path}/common:common_config" ] public_configs = [ ":uripermkit_public_config" ] diff --git a/interfaces/inner_api/wantagent/BUILD.gn b/interfaces/inner_api/wantagent/BUILD.gn index 3035c65d29..2f48232987 100644 --- a/interfaces/inner_api/wantagent/BUILD.gn +++ b/interfaces/inner_api/wantagent/BUILD.gn @@ -43,6 +43,8 @@ config("wantagent_innerkits_public_config") { } ohos_shared_library("wantagent_innerkits") { + branch_protector_ret = "pac_ret" + include_dirs = [ "${ability_runtime_services_path}/common/include", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper", diff --git a/js_environment/frameworks/js_environment/BUILD.gn b/js_environment/frameworks/js_environment/BUILD.gn index 177d74f080..febdf45d77 100644 --- a/js_environment/frameworks/js_environment/BUILD.gn +++ b/js_environment/frameworks/js_environment/BUILD.gn @@ -28,6 +28,8 @@ config("public_js_environment_config") { } ohos_shared_library("js_environment") { + branch_protector_ret = "pac_ret" + sources = [ "${utils_path}/src/js_env_logger.cpp", "src/js_environment.cpp", diff --git a/services/common/BUILD.gn b/services/common/BUILD.gn index 1df53bf654..d8b0baed8b 100644 --- a/services/common/BUILD.gn +++ b/services/common/BUILD.gn @@ -54,6 +54,8 @@ config("common_config") { #build so ohos_shared_library("perm_verification") { + branch_protector_ret = "pac_ret" + include_dirs = [ "${ability_runtime_utils_path}/server/constant" ] public_configs = [ ":common_config" ] @@ -82,6 +84,8 @@ ohos_shared_library("perm_verification") { } ohos_shared_library("event_report") { + branch_protector_ret = "pac_ret" + public_configs = [ ":common_config" ] sources = [ "src/event_report.cpp" ] @@ -98,6 +102,8 @@ ohos_shared_library("event_report") { } ohos_shared_library("task_handler_wrap") { + branch_protector_ret = "pac_ret" + public_configs = [ ":common_config" ] include_dirs = [ "include" ] @@ -118,6 +124,8 @@ ohos_shared_library("task_handler_wrap") { } ohos_shared_library("app_util") { + branch_protector_ret = "pac_ret" + public_configs = [ ":common_config" ] include_dirs = [ "include" ] diff --git a/utils/global/freeze/BUILD.gn b/utils/global/freeze/BUILD.gn index dde205e4f6..28a0ef2fe7 100644 --- a/utils/global/freeze/BUILD.gn +++ b/utils/global/freeze/BUILD.gn @@ -19,6 +19,8 @@ config("freeze_util_config") { } ohos_shared_library("freeze_util") { + branch_protector_ret = "pac_ret" + include_dirs = [ "${ability_runtime_services_path}/common/include" ] sources = [ "src/freeze_util.cpp" ]