From 25aa506fc4a208cf42412c6d5af8fafe27d21977 Mon Sep 17 00:00:00 2001 From: Luobniz21 Date: Fri, 7 Aug 2026 15:47:38 +0800 Subject: [PATCH] bti MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Luobniz21 🤖 AI[100%] 🔧 Human Fixed[0%] 🧑 Human[0%] 👌 AI Adopted[100%] Co-authored-by: opencode (glm-5.2) --- .../interfaces/inner_api/BUILD.gn | 2 +- .../services/agentmgr/BUILD.gn | 2 +- frameworks/js/napi/ability_constant/BUILD.gn | 2 +- frameworks/js/napi/featureAbility/BUILD.gn | 2 +- .../js/napi/inner/napi_ability_common/BUILD.gn | 2 +- frameworks/native/ability/BUILD.gn | 2 +- frameworks/native/ability/native/BUILD.gn | 18 +++++++++--------- .../native/ability_runtime/madvise/BUILD.gn | 2 +- interfaces/inner_api/ability_manager/BUILD.gn | 10 +++++----- .../inner_api/auto_fill_manager/BUILD.gn | 2 +- .../inner_api/connectionobs_manager/BUILD.gn | 2 +- .../foreground_app_obs_manager/BUILD.gn | 2 +- interfaces/inner_api/session_handler/BUILD.gn | 2 +- services/abilitymgr/BUILD.gn | 2 +- services/common/BUILD.gn | 4 ++-- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/agent_runtime_framework/interfaces/inner_api/BUILD.gn b/agent_runtime_framework/interfaces/inner_api/BUILD.gn index 6eb436eb6c..0a0499e82b 100644 --- a/agent_runtime_framework/interfaces/inner_api/BUILD.gn +++ b/agent_runtime_framework/interfaces/inner_api/BUILD.gn @@ -17,7 +17,7 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni") ohos_shared_library("agent_fwk") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" sanitize = { cfi = true diff --git a/agent_runtime_framework/services/agentmgr/BUILD.gn b/agent_runtime_framework/services/agentmgr/BUILD.gn index 98b2b88881..a585ac7bea 100644 --- a/agent_runtime_framework/services/agentmgr/BUILD.gn +++ b/agent_runtime_framework/services/agentmgr/BUILD.gn @@ -21,7 +21,7 @@ ohos_shared_library("agentmgr") { debug = false } branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" configs = [ "${ability_runtime_services_path}/common:optimize_config" ] include_dirs = [ diff --git a/frameworks/js/napi/ability_constant/BUILD.gn b/frameworks/js/napi/ability_constant/BUILD.gn index b1d4440971..5b49a93f79 100644 --- a/frameworks/js/napi/ability_constant/BUILD.gn +++ b/frameworks/js/napi/ability_constant/BUILD.gn @@ -16,7 +16,7 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni") ohos_shared_library("abilityconstant_napi") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", diff --git a/frameworks/js/napi/featureAbility/BUILD.gn b/frameworks/js/napi/featureAbility/BUILD.gn index c4e82e7f32..f2c1f6af13 100644 --- a/frameworks/js/napi/featureAbility/BUILD.gn +++ b/frameworks/js/napi/featureAbility/BUILD.gn @@ -16,7 +16,7 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni") ohos_shared_library("featureability") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" configs = [ "${ability_runtime_services_path}/common:optimize_config" ] diff --git a/frameworks/js/napi/inner/napi_ability_common/BUILD.gn b/frameworks/js/napi/inner/napi_ability_common/BUILD.gn index 6cfebd5992..d5d5b51627 100644 --- a/frameworks/js/napi/inner/napi_ability_common/BUILD.gn +++ b/frameworks/js/napi/inner/napi_ability_common/BUILD.gn @@ -20,7 +20,7 @@ config("napi_ability_common_public_config") { ohos_shared_library("napi_ability_common") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" public_configs = [ ":napi_ability_common_public_config", diff --git a/frameworks/native/ability/BUILD.gn b/frameworks/native/ability/BUILD.gn index 5245bcb3da..6d76fa7c90 100644 --- a/frameworks/native/ability/BUILD.gn +++ b/frameworks/native/ability/BUILD.gn @@ -45,7 +45,7 @@ config("ability_context_public_config") { ohos_shared_library("ability_context_native") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" configs = [ "${ability_runtime_services_path}/common:optimize_config" ] diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index 08c0e75152..25fcc69177 100644 --- a/frameworks/native/ability/native/BUILD.gn +++ b/frameworks/native/ability/native/BUILD.gn @@ -294,7 +294,7 @@ ohos_shared_library("configuration_helper") { ohos_shared_library("abilitykit_native") { use_exceptions = true branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" include_dirs = [ "${ability_runtime_path}/utils/global/time/include", @@ -1011,7 +1011,7 @@ config("uiability_config") { ohos_shared_library("ui_ability_ani") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" sanitize = { cfi = true @@ -1282,7 +1282,7 @@ ohos_shared_library("uiabilitykit_native") { ohos_shared_library("ability_thread") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" configs = [ "${ability_runtime_services_path}/common:optimize_config" ] @@ -2282,7 +2282,7 @@ ohos_shared_library("ui_service_extension_module") { ohos_shared_library("continuation_ipc") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" include_dirs = [] @@ -2469,7 +2469,7 @@ config("ability_business_error_public_config") { ohos_shared_library("ability_business_error") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" sanitize = { cfi = true @@ -3278,7 +3278,7 @@ ohos_shared_library("share_extension_module") { ohos_shared_library("auto_startup_callback") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" sanitize = { cfi = true @@ -3608,7 +3608,7 @@ config("auto_fill_extension_config") { ohos_shared_library("auto_fill_extension") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" public_configs = [ ":auto_fill_extension_config" ] @@ -3780,7 +3780,7 @@ ohos_shared_library("auto_fill_extension_util") { ohos_shared_library("auto_fill_extension_module") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" sources = [ "${ability_runtime_native_path}/ability/native/auto_fill_extension_ability/auto_fill_extension_module_loader.cpp" ] @@ -4109,7 +4109,7 @@ ohos_shared_library("app_service_extension_module") { debug = false } branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" include_dirs = [ "${ability_runtime_path}/interfaces/inner_api/ability_manager/include", diff --git a/frameworks/native/ability/native/ability_runtime/madvise/BUILD.gn b/frameworks/native/ability/native/ability_runtime/madvise/BUILD.gn index dc8acfdec0..3654de13d7 100644 --- a/frameworks/native/ability/native/ability_runtime/madvise/BUILD.gn +++ b/frameworks/native/ability/native/ability_runtime/madvise/BUILD.gn @@ -26,7 +26,7 @@ config("madvise_public_config") { ohos_shared_library("ability_madvise") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" sanitize = { cfi = true diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn index c309da1a3f..9e026da7a3 100644 --- a/interfaces/inner_api/ability_manager/BUILD.gn +++ b/interfaces/inner_api/ability_manager/BUILD.gn @@ -65,7 +65,7 @@ config("ability_manager_public_config") { ohos_shared_library("ability_manager") { use_exceptions = true branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" sanitize = { integer_overflow = true ubsan = true @@ -246,7 +246,7 @@ ohos_shared_library("ability_start_options") { debug = false } branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" include_dirs = [ "include/", @@ -281,7 +281,7 @@ ohos_shared_library("ability_start_options") { ohos_shared_library("mission_info") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" sanitize = { cfi = true @@ -340,7 +340,7 @@ ohos_shared_library("ability_manager_c") { ohos_shared_library("ability_start_setting") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" sanitize = { cfi = true @@ -413,7 +413,7 @@ ohos_shared_library("start_window_option") { debug = false } branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" include_dirs = [ "include/", diff --git a/interfaces/inner_api/auto_fill_manager/BUILD.gn b/interfaces/inner_api/auto_fill_manager/BUILD.gn index bce810f224..af5d2895c1 100644 --- a/interfaces/inner_api/auto_fill_manager/BUILD.gn +++ b/interfaces/inner_api/auto_fill_manager/BUILD.gn @@ -29,7 +29,7 @@ config("auto_fill_manager_public_config") { ohos_shared_library("auto_fill_manager") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" public_configs = [ ":auto_fill_manager_public_config" ] configs = [ "${ability_runtime_services_path}/common:optimize_config" ] diff --git a/interfaces/inner_api/connectionobs_manager/BUILD.gn b/interfaces/inner_api/connectionobs_manager/BUILD.gn index 22042701c9..d9978ff0a7 100644 --- a/interfaces/inner_api/connectionobs_manager/BUILD.gn +++ b/interfaces/inner_api/connectionobs_manager/BUILD.gn @@ -32,7 +32,7 @@ config("connection_obs_manager_public_config") { ohos_shared_library("connection_obs_manager") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" sanitize = { integer_overflow = true ubsan = true diff --git a/interfaces/inner_api/foreground_app_obs_manager/BUILD.gn b/interfaces/inner_api/foreground_app_obs_manager/BUILD.gn index 91ad03e89b..ae9648f4b5 100644 --- a/interfaces/inner_api/foreground_app_obs_manager/BUILD.gn +++ b/interfaces/inner_api/foreground_app_obs_manager/BUILD.gn @@ -34,7 +34,7 @@ config("foreground_app_obs_manager_public_config") { ohos_shared_library("foreground_app_obs_manager") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" sanitize = { cfi = true cfi_cross_dso = true diff --git a/interfaces/inner_api/session_handler/BUILD.gn b/interfaces/inner_api/session_handler/BUILD.gn index 3844c12740..caa0f894e9 100644 --- a/interfaces/inner_api/session_handler/BUILD.gn +++ b/interfaces/inner_api/session_handler/BUILD.gn @@ -33,7 +33,7 @@ config("session_handler_config") { ohos_shared_library("session_handler") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" sanitize = { cfi = true diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index c526222675..994ff7d267 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -137,7 +137,7 @@ ohos_shared_library("abilityms") { debug = false } branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" shlib_type = "sa" sources = abilityms_files cflags_cc = [] diff --git a/services/common/BUILD.gn b/services/common/BUILD.gn index f8ce9f79c7..0917d6d4d2 100644 --- a/services/common/BUILD.gn +++ b/services/common/BUILD.gn @@ -107,7 +107,7 @@ config("tdd_config") { #build so ohos_shared_library("perm_verification") { branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" sanitize = { cfi = true cfi_cross_dso = true @@ -447,7 +447,7 @@ ohos_shared_library("user_controller") { debug = false } branch_protector_ret = "pac_ret" - branch_protector_ret = "bti" + branch_protector_frt = "bti" include_dirs = [ "include/user_controller",