From 8b2c49fa125575da2f59c56f8d818a92ad90258a Mon Sep 17 00:00:00 2001 From: zhusiyuan Date: Wed, 6 Sep 2023 17:18:12 +0800 Subject: [PATCH] Fix: Remove deps of btframework on mini system Signed-off-by: zhusiyuan --- .../net/bluetooth/ble/softbus_adapter_ble_gatt.c | 4 ++-- adapter/common/net/bluetooth/net_bluetooth.gni | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/adapter/common/net/bluetooth/ble/softbus_adapter_ble_gatt.c b/adapter/common/net/bluetooth/ble/softbus_adapter_ble_gatt.c index 98dc66166..61518e9b4 100644 --- a/adapter/common/net/bluetooth/ble/softbus_adapter_ble_gatt.c +++ b/adapter/common/net/bluetooth/ble/softbus_adapter_ble_gatt.c @@ -1122,7 +1122,7 @@ NO_SANITIZE("cfi") int32_t SoftBusDeregisterScanCallbacks(int32_t scannerId) return BleDeregisterScanCallbacks(scannerId); } -NO_SANITIZE("cfi") int32_t SoftBusSetScanReportChannelToLpDevice(int scannerId, bool enable) +NO_SANITIZE("cfi") int32_t SoftBusSetScanReportChannelToLpDevice(int32_t scannerId, bool enable) { return SetScanReportChannelToLpDevice(scannerId, enable); } @@ -1131,4 +1131,4 @@ NO_SANITIZE("cfi") int32_t SoftBusSetLpDeviceParam(int duration, int maxExtAdvEv int interval, int advHandle) { return SetLpDeviceAdvParam(duration, maxExtAdvEvents, window, interval, advHandle); -} \ No newline at end of file +} diff --git a/adapter/common/net/bluetooth/net_bluetooth.gni b/adapter/common/net/bluetooth/net_bluetooth.gni index be54bac9a..8eeba1260 100644 --- a/adapter/common/net/bluetooth/net_bluetooth.gni +++ b/adapter/common/net/bluetooth/net_bluetooth.gni @@ -29,6 +29,12 @@ adapter_ble_src = [ "$dsoftbus_root_path/adapter/common/net/bluetooth/common/softbus_adapter_bt_common.c", ] adapter_net_br_src = [ "$dsoftbus_root_path/adapter/common/net/bluetooth/common/softbus_adapter_bt_common.c" ] -adapter_ble_external_deps = [ "bluetooth:btframework" ] -compatible_ble_deps = - [ "//foundation/communication/bluetooth/frameworks/inner:btframework" ] + +if (ohos_kernel_type == "liteos_m") { + adapter_ble_external_deps = [] + compatible_ble_deps = [] +} else { + adapter_ble_external_deps = [ "bluetooth:btframework" ] + compatible_ble_deps = + [ "//foundation/communication/bluetooth/frameworks/inner:btframework" ] +} -- Gitee