From 959d8d46ad86c9e1712998741dada325e1d92ff5 Mon Sep 17 00:00:00 2001 From: wangyikai Date: Tue, 10 Sep 2024 15:54:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90HDF=5FCORE=E3=80=91HDF=E9=A9=B1?= =?UTF-8?q?=E5=8A=A8=E6=A1=86=E6=9E=B6=E9=A2=86=E5=9F=9F=20=E4=BD=BF?= =?UTF-8?q?=E8=83=BDPAC=E5=90=8E=E5=90=91CFI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyikai --- adapter/uhdf2/hdi/BUILD.gn | 1 + adapter/uhdf2/ipc/BUILD.gn | 1 + adapter/uhdf2/pub_utils/BUILD.gn | 1 + adapter/uhdf2/utils/BUILD.gn | 1 + 4 files changed, 4 insertions(+) diff --git a/adapter/uhdf2/hdi/BUILD.gn b/adapter/uhdf2/hdi/BUILD.gn index 87ccdd454..43bf6e0f4 100644 --- a/adapter/uhdf2/hdi/BUILD.gn +++ b/adapter/uhdf2/hdi/BUILD.gn @@ -60,6 +60,7 @@ if (defined(ohos_lite)) { } } else { ohos_shared_library("libhdi") { + branch_protector_ret = "pac_ret" if (target_cpu == "arm64" || target_cpu == "x86_64") { defines = [ "__ARCH64__" ] } diff --git a/adapter/uhdf2/ipc/BUILD.gn b/adapter/uhdf2/ipc/BUILD.gn index fdb4e4c76..1bef89f42 100644 --- a/adapter/uhdf2/ipc/BUILD.gn +++ b/adapter/uhdf2/ipc/BUILD.gn @@ -32,6 +32,7 @@ if (defined(ohos_lite)) { } } else { ohos_shared_library("libhdf_ipc_adapter") { + branch_protector_ret = "pac_ret" include_dirs = [ "include", "$hdf_framework_path/utils/include", diff --git a/adapter/uhdf2/pub_utils/BUILD.gn b/adapter/uhdf2/pub_utils/BUILD.gn index 22dae89f3..173d86786 100644 --- a/adapter/uhdf2/pub_utils/BUILD.gn +++ b/adapter/uhdf2/pub_utils/BUILD.gn @@ -33,6 +33,7 @@ if (defined(ohos_lite)) { } } else { ohos_shared_library("libpub_utils") { + branch_protector_ret = "pac_ret" include_dirs = [ "$hdf_framework_path/utils/include", "$hdf_uhdf_path/utils/include", diff --git a/adapter/uhdf2/utils/BUILD.gn b/adapter/uhdf2/utils/BUILD.gn index a2f95faa4..773dc3772 100644 --- a/adapter/uhdf2/utils/BUILD.gn +++ b/adapter/uhdf2/utils/BUILD.gn @@ -108,6 +108,7 @@ if (defined(ohos_lite)) { } ohos_shared_library("libhdf_utils") { + branch_protector_ret = "pac_ret" include_dirs = [ "$hdf_framework_path/include", "$hdf_framework_path/include/core", -- Gitee From 178281a35ce22b3e11b50d4525a0778f1fa608a0 Mon Sep 17 00:00:00 2001 From: openharmony_ci <120357966@qq.com> Date: Mon, 9 Sep 2024 14:02:34 +0000 Subject: [PATCH 2/2] =?UTF-8?q?!2268=20=E3=80=90HDF=5FCORE=E3=80=91hdi?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=BA=E7=94=9F=E6=88=90proxy=E5=92=8Cstub?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20PAC=20=E5=BC=80=E5=85=B3=20Merge=20pull=20?= =?UTF-8?q?request=20!2268=20from=20wangyk/master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adapter/uhdf2/hdi.gni | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/adapter/uhdf2/hdi.gni b/adapter/uhdf2/hdi.gni index ab1906ce3..9991950bf 100644 --- a/adapter/uhdf2/hdi.gni +++ b/adapter/uhdf2/hdi.gni @@ -210,6 +210,10 @@ template("hdi") { if (defined(invoker.cflags_cc)) { cflags_cc = invoker.cflags_cc } + + if (defined(invoker.branch_protector_ret)) { + branch_protector_ret = invoker.branch_protector_ret + } } } @@ -275,6 +279,10 @@ template("hdi") { if (defined(invoker.cflags_cc)) { cflags_cc = invoker.cflags_cc } + + if (defined(invoker.branch_protector_ret)) { + branch_protector_ret = invoker.branch_protector_ret + } } } } -- Gitee