From dc7871004966ffb4aa8b23b6f5ff7bb3fc36a22f Mon Sep 17 00:00:00 2001 From: zhenghui Date: Fri, 6 Sep 2024 17:32:31 +0800 Subject: [PATCH] cherry pick 0ab0222 from https://gitee.com/zhenghui25/security_security_component_manager/pulls/185 support pac Signed-off-by: zhenghui --- frameworks/BUILD.gn | 2 ++ interfaces/inner_api/enhance_kits/BUILD.gn | 1 + interfaces/inner_api/security_component/BUILD.gn | 1 + 3 files changed, 4 insertions(+) diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn index 07ba260..a287271 100644 --- a/frameworks/BUILD.gn +++ b/frameworks/BUILD.gn @@ -106,6 +106,7 @@ ohos_source_set("security_component_enhance_adapter_src_set") { } ohos_source_set("security_component_no_cfi_framework_src_set") { + branch_protector_ret = "pac_ret" subsystem_name = "security" part_name = "security_component_manager" include_dirs = [ @@ -141,6 +142,7 @@ ohos_source_set("security_component_no_cfi_framework_src_set") { } ohos_source_set("security_component_no_cfi_enhance_adapter_src_set") { + branch_protector_ret = "pac_ret" subsystem_name = "security" part_name = "security_component_manager" include_dirs = [ diff --git a/interfaces/inner_api/enhance_kits/BUILD.gn b/interfaces/inner_api/enhance_kits/BUILD.gn index d7d812a..49f1699 100644 --- a/interfaces/inner_api/enhance_kits/BUILD.gn +++ b/interfaces/inner_api/enhance_kits/BUILD.gn @@ -60,6 +60,7 @@ ohos_source_set("security_component_enhance_sdk_src_set") { } ohos_source_set("security_component_no_cfi_enhance_sdk_src_set") { + branch_protector_ret = "pac_ret" subsystem_name = "security" part_name = "security_component_manager" public_configs = [ ":sec_comp_enhance_config" ] diff --git a/interfaces/inner_api/security_component/BUILD.gn b/interfaces/inner_api/security_component/BUILD.gn index 902358e..891157d 100644 --- a/interfaces/inner_api/security_component/BUILD.gn +++ b/interfaces/inner_api/security_component/BUILD.gn @@ -26,6 +26,7 @@ config("sec_comp_config") { } ohos_shared_library("libsecurity_component_sdk") { + branch_protector_ret = "pac_ret" subsystem_name = "security" part_name = "security_component_manager" output_name = "libsecurity_component_sdk"