From 8672bd02c512c119cf25c82aa661f386a2b2360e Mon Sep 17 00:00:00 2001 From: m30043719 Date: Thu, 26 Oct 2023 10:07:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=90=91CFI=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit issue:https://gitee.com/openharmony/distributedhardware_distributed_camera/issues/I8AZGX Signed-off-by: m30043719 --- common/BUILD.gn | 1 + interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn | 1 + interfaces/inner_kits/native_cpp/camera_source/BUILD.gn | 1 + services/cameraservice/cameraoperator/client/BUILD.gn | 1 + .../cameraservice/cameraoperator/client/test/sample/BUILD.gn | 1 + services/cameraservice/cameraoperator/handler/BUILD.gn | 1 + services/cameraservice/sinkservice/BUILD.gn | 1 + services/channel/BUILD.gn | 1 + 8 files changed, 8 insertions(+) diff --git a/common/BUILD.gn b/common/BUILD.gn index 121c84c7..b29befe9 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -16,6 +16,7 @@ import( "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_utils") { + branch_protector_ret = "pac_ret" sanitize = { cfi = true cfi_cross_dso = true diff --git a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn index e39dec9c..e3b04ab8 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn @@ -16,6 +16,7 @@ import( "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_sink_sdk") { + branch_protector_ret = "pac_ret" sanitize = { cfi = true cfi_cross_dso = true diff --git a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn index 8bb26ab3..deb5eb9e 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn @@ -16,6 +16,7 @@ import( "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_source_sdk") { + branch_protector_ret = "pac_ret" sanitize = { cfi = true cfi_cross_dso = true diff --git a/services/cameraservice/cameraoperator/client/BUILD.gn b/services/cameraservice/cameraoperator/client/BUILD.gn index 33e7207e..0a19ff0d 100644 --- a/services/cameraservice/cameraoperator/client/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/BUILD.gn @@ -17,6 +17,7 @@ import( "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_client") { + branch_protector_ret = "pac_ret" sanitize = { cfi = true cfi_cross_dso = true diff --git a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn index 5c3f28a5..7ddfacb7 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn @@ -46,6 +46,7 @@ config("module_private_config") { } ohos_executable("dcamera_client_demo") { + branch_protector_ret = "pac_ret" sanitize = { cfi = true cfi_cross_dso = true diff --git a/services/cameraservice/cameraoperator/handler/BUILD.gn b/services/cameraservice/cameraoperator/handler/BUILD.gn index 1235e8fa..4fe78ca9 100644 --- a/services/cameraservice/cameraoperator/handler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/BUILD.gn @@ -17,6 +17,7 @@ import( "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_handler") { + branch_protector_ret = "pac_ret" sanitize = { cfi = true cfi_cross_dso = true diff --git a/services/cameraservice/sinkservice/BUILD.gn b/services/cameraservice/sinkservice/BUILD.gn index 38ec8431..70885687 100644 --- a/services/cameraservice/sinkservice/BUILD.gn +++ b/services/cameraservice/sinkservice/BUILD.gn @@ -17,6 +17,7 @@ import( "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_sink") { + branch_protector_ret = "pac_ret" sanitize = { cfi = true cfi_cross_dso = true diff --git a/services/channel/BUILD.gn b/services/channel/BUILD.gn index 8b49162b..1efafb7a 100644 --- a/services/channel/BUILD.gn +++ b/services/channel/BUILD.gn @@ -17,6 +17,7 @@ import( "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_channel") { + branch_protector_ret = "pac_ret" sanitize = { cfi = true cfi_cross_dso = true -- Gitee