diff --git a/adapter/uhdf2/manager/BUILD.gn b/adapter/uhdf2/manager/BUILD.gn index 658b36fa9bfe27b4e66c3418c7d85beecb32e00d..ad65b7d2d22fe43dab28a73a8a8770ec97b8fe22 100644 --- a/adapter/uhdf2/manager/BUILD.gn +++ b/adapter/uhdf2/manager/BUILD.gn @@ -19,6 +19,12 @@ hdf_interfaces_path = "./../../../interfaces" hdf_uhdf_path = "./.." ohos_executable("hdf_devmgr") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } defines = [ "__USER__" ] include_dirs = [ "$hdf_framework_path/core/manager/include", diff --git a/interfaces/inner_api/utils/hdf_base.h b/interfaces/inner_api/utils/hdf_base.h index 2e8405334e32e984eb31417525d24fcf133c3693..74e38178bcb7ff761e55c4c15610a85456d3af16 100644 --- a/interfaces/inner_api/utils/hdf_base.h +++ b/interfaces/inner_api/utils/hdf_base.h @@ -127,6 +127,8 @@ typedef enum { */ #ifdef __aarch64__ #define HDF_LIBRARY_FULL_PATH(x) "/vendor/lib64/" x ".z.so" +#elif defined(__x86_64__) +#define HDF_LIBRARY_FULL_PATH(x) "/vendor/lib64/" x ".z.so" #else #define HDF_LIBRARY_FULL_PATH(x) "/vendor/lib/" x ".z.so" #endif