From d5b14edec49e96669171c83783059f183a43bb4a Mon Sep 17 00:00:00 2001 From: linruihao Date: Wed, 28 May 2025 20:19:04 +0800 Subject: [PATCH] fix(bt/bluedroid): Fix build issue when using external sbc codec --- components/bt/CMakeLists.txt | 58 ++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt index 806c0dbdf2..5d48e6f0fc 100644 --- a/components/bt/CMakeLists.txt +++ b/components/bt/CMakeLists.txt @@ -158,9 +158,6 @@ if(CONFIG_BT_ENABLED) host/bluedroid/bta/sys/include host/bluedroid/device/include host/bluedroid/hci/include - host/bluedroid/external/sbc/decoder/include - host/bluedroid/external/sbc/encoder/include - host/bluedroid/external/sbc/plc/include host/bluedroid/btc/profile/esp/include host/bluedroid/btc/profile/std/a2dp/include host/bluedroid/btc/profile/std/include @@ -318,29 +315,6 @@ if(CONFIG_BT_ENABLED) "host/bluedroid/device/bdaddr.c" "host/bluedroid/device/controller.c" "host/bluedroid/device/interop.c" - "host/bluedroid/external/sbc/decoder/srce/alloc.c" - "host/bluedroid/external/sbc/decoder/srce/bitalloc-sbc.c" - "host/bluedroid/external/sbc/decoder/srce/bitalloc.c" - "host/bluedroid/external/sbc/decoder/srce/bitstream-decode.c" - "host/bluedroid/external/sbc/decoder/srce/decoder-oina.c" - "host/bluedroid/external/sbc/decoder/srce/decoder-private.c" - "host/bluedroid/external/sbc/decoder/srce/decoder-sbc.c" - "host/bluedroid/external/sbc/decoder/srce/dequant.c" - "host/bluedroid/external/sbc/decoder/srce/framing-sbc.c" - "host/bluedroid/external/sbc/decoder/srce/framing.c" - "host/bluedroid/external/sbc/decoder/srce/oi_codec_version.c" - "host/bluedroid/external/sbc/decoder/srce/synthesis-8-generated.c" - "host/bluedroid/external/sbc/decoder/srce/synthesis-dct8.c" - "host/bluedroid/external/sbc/decoder/srce/synthesis-sbc.c" - "host/bluedroid/external/sbc/encoder/srce/sbc_analysis.c" - "host/bluedroid/external/sbc/encoder/srce/sbc_dct.c" - "host/bluedroid/external/sbc/encoder/srce/sbc_dct_coeffs.c" - "host/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c" - "host/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c" - "host/bluedroid/external/sbc/encoder/srce/sbc_enc_coeffs.c" - "host/bluedroid/external/sbc/encoder/srce/sbc_encoder.c" - "host/bluedroid/external/sbc/encoder/srce/sbc_packing.c" - "host/bluedroid/external/sbc/plc/sbc_plc.c" "host/bluedroid/hci/hci_audio.c" "host/bluedroid/hci/hci_hal_h4.c" "host/bluedroid/hci/hci_layer.c" @@ -477,6 +451,38 @@ if(CONFIG_BT_ENABLED) "host/bluedroid/api/esp_ble_cte_api.c") endif() + if((CONFIG_BT_A2DP_ENABLE AND NOT CONFIG_BT_A2DP_USE_EXTERNAL_CODEC) OR + (CONFIG_BT_HFP_ENABLE AND CONFIG_BT_HFP_AUDIO_DATA_PATH_HCI AND NOT CONFIG_BT_HFP_USE_EXTERNAL_CODEC)) + list(APPEND priv_include_dirs + host/bluedroid/external/sbc/decoder/include + host/bluedroid/external/sbc/encoder/include + host/bluedroid/external/sbc/plc/include) + + list(APPEND srcs "host/bluedroid/external/sbc/decoder/srce/alloc.c" + "host/bluedroid/external/sbc/decoder/srce/bitalloc-sbc.c" + "host/bluedroid/external/sbc/decoder/srce/bitalloc.c" + "host/bluedroid/external/sbc/decoder/srce/bitstream-decode.c" + "host/bluedroid/external/sbc/decoder/srce/decoder-oina.c" + "host/bluedroid/external/sbc/decoder/srce/decoder-private.c" + "host/bluedroid/external/sbc/decoder/srce/decoder-sbc.c" + "host/bluedroid/external/sbc/decoder/srce/dequant.c" + "host/bluedroid/external/sbc/decoder/srce/framing-sbc.c" + "host/bluedroid/external/sbc/decoder/srce/framing.c" + "host/bluedroid/external/sbc/decoder/srce/oi_codec_version.c" + "host/bluedroid/external/sbc/decoder/srce/synthesis-8-generated.c" + "host/bluedroid/external/sbc/decoder/srce/synthesis-dct8.c" + "host/bluedroid/external/sbc/decoder/srce/synthesis-sbc.c" + "host/bluedroid/external/sbc/encoder/srce/sbc_analysis.c" + "host/bluedroid/external/sbc/encoder/srce/sbc_dct.c" + "host/bluedroid/external/sbc/encoder/srce/sbc_dct_coeffs.c" + "host/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c" + "host/bluedroid/external/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c" + "host/bluedroid/external/sbc/encoder/srce/sbc_enc_coeffs.c" + "host/bluedroid/external/sbc/encoder/srce/sbc_encoder.c" + "host/bluedroid/external/sbc/encoder/srce/sbc_packing.c" + "host/bluedroid/external/sbc/plc/sbc_plc.c") + endif() + endif() if(CONFIG_BLE_MESH)