diff --git a/services/bluetooth/external/BUILD.gn b/services/bluetooth/external/BUILD.gn index 7b78d8dc46a4d2f21d15befc47d4d2e81dfc8bfe..08b7b1ccf6c75f9e150c48e0ead402f36349b5df 100644 --- a/services/bluetooth/external/BUILD.gn +++ b/services/bluetooth/external/BUILD.gn @@ -28,9 +28,11 @@ config("btdummy_public_config") { } ohos_shared_library("btdummy") { - # sanitize = { - # cfi = true - # } + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } stack_protector_ret = true configs = [ ":btdummy_config" ] public_configs = [ ":btdummy_public_config" ] diff --git a/services/bluetooth/hardware/BUILD.gn b/services/bluetooth/hardware/BUILD.gn index e9e62b3cf8d72504e6f8b7705a1b179a5bdbb4a8..ca8495bb397451da824db4ca7f591cae6e61deed 100644 --- a/services/bluetooth/hardware/BUILD.gn +++ b/services/bluetooth/hardware/BUILD.gn @@ -15,9 +15,11 @@ import("//build/ohos.gni") import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") ohos_shared_library("bluetooth_hdi_adapter") { - # sanitize = { - # cfi = true - # } + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } stack_protector_ret = true include_dirs = [ "include", diff --git a/services/bluetooth/ipc/BUILD.gn b/services/bluetooth/ipc/BUILD.gn index 2758c0a0ee1e111c93fd57b7aff584e16423a66c..bc3ab0124c11c612c4046cb5f0d7e56a8252e420 100644 --- a/services/bluetooth/ipc/BUILD.gn +++ b/services/bluetooth/ipc/BUILD.gn @@ -22,10 +22,12 @@ config("btipc_public_config") { } ohos_static_library("btipc_service") { - # sanitize = { - # cfi = true - # blocklist = "./ipc_blocklist.txt" - # } + sanitize = { + cfi = true + blocklist = "./ipc_blocklist.txt" + cfi_cross_dso = true + debug = false + } stack_protector_ret = true public_configs = [ ":btipc_public_config" ] include_dirs = [ diff --git a/services/bluetooth/server/BUILD.gn b/services/bluetooth/server/BUILD.gn index 95ca2e0bfec9387413d1b5446f16239fbf03d0ab..6c579ea48f2446a2b7880a1d89565adc50750101 100644 --- a/services/bluetooth/server/BUILD.gn +++ b/services/bluetooth/server/BUILD.gn @@ -19,10 +19,12 @@ SUBSYSTEM_DIR = "//foundation/communication" BT_ROOT = "//foundation/communication/bluetooth_service/services/bluetooth" ohos_shared_library("bluetooth_server") { - # sanitize = { - # cfi = true - # blocklist = "./bluetooth_server_blocklist.txt" - # } + sanitize = { + cfi = true + blocklist = "./bluetooth_server_blocklist.txt" + cfi_cross_dso = true + debug = false + } stack_protector_ret = true include_dirs = [ "include", diff --git a/services/bluetooth/service/BUILD.gn b/services/bluetooth/service/BUILD.gn index b0d86e59b7dff46d01723fe29fe8f16d5c18b2f1..b07698ce14ef466e1666247dbe82e5bce951485c 100644 --- a/services/bluetooth/service/BUILD.gn +++ b/services/bluetooth/service/BUILD.gn @@ -449,9 +449,11 @@ ohos_shared_library("btservice") { SBC_CODEC_DIR = "$BT_SERVICE_DIR/src/gavdp/a2dp_codec/sbclib" ohos_shared_library("btsbc") { - # sanitize = { - # cfi = true - # } + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } stack_protector_ret = true sources = [ "$SBC_CODEC_DIR/src/sbc_decoder.cpp", diff --git a/services/bluetooth/stack/BUILD.gn b/services/bluetooth/stack/BUILD.gn index b58d57293acb2bfb3d9c5ffba4a283284939e194..b057605ccfcd3381f06dacd42144967934d50cd0 100644 --- a/services/bluetooth/stack/BUILD.gn +++ b/services/bluetooth/stack/BUILD.gn @@ -212,10 +212,12 @@ config("btstack_config") { } ohos_shared_library("btstack") { - # sanitize = { - # cfi = true - # blocklist = "./btstack_blocklist.txt" - # } + sanitize = { + cfi = true + blocklist = "./btstack_blocklist.txt" + cfi_cross_dso = true + debug = false + } stack_protector_ret = true configs = [ ":btstack_config" ] public_configs = [ ":btstack_public_config" ]