diff options
| -rw-r--r-- | android/app/Android.bp | 1 | ||||
| -rw-r--r-- | system/audio_hal_interface/Android.bp | 1 | ||||
| -rw-r--r-- | system/audio_hal_interface/fuzzer/Android.bp | 1 | ||||
| -rw-r--r-- | system/btif/Android.bp | 2 | ||||
| -rw-r--r-- | system/stack/Android.bp | 208 | ||||
| -rw-r--r-- | system/stack/test/fuzzers/Android.bp | 1 | ||||
| -rw-r--r-- | system/test/headless/Android.bp | 1 | ||||
| -rw-r--r-- | system/test/suite/Android.bp | 1 |
8 files changed, 77 insertions, 139 deletions
diff --git a/android/app/Android.bp b/android/app/Android.bp index b12d3d6b54..5299b63d2f 100644 --- a/android/app/Android.bp +++ b/android/app/Android.bp @@ -121,7 +121,6 @@ cc_library_shared { "libbt-sbc-decoder", "libbt-sbc-encoder", "libbt-stack", - "libbt-stack-core", "libbtcore", "libbtdevice", "libbte", diff --git a/system/audio_hal_interface/Android.bp b/system/audio_hal_interface/Android.bp index 27866af025..a171e79fa5 100644 --- a/system/audio_hal_interface/Android.bp +++ b/system/audio_hal_interface/Android.bp @@ -235,7 +235,6 @@ cc_defaults { "libbt-sbc-decoder", "libbt-sbc-encoder", "libbt-stack", - "libbt-stack-core", "libbtcore", "libbtdevice", "libbte", diff --git a/system/audio_hal_interface/fuzzer/Android.bp b/system/audio_hal_interface/fuzzer/Android.bp index 3bd58eacca..7ace709b26 100644 --- a/system/audio_hal_interface/fuzzer/Android.bp +++ b/system/audio_hal_interface/fuzzer/Android.bp @@ -75,7 +75,6 @@ cc_defaults { "libbt-sbc-decoder", "libbt-sbc-encoder", "libbt-stack", - "libbt-stack-core", "libbtcore", "libbtdevice", "libbte", diff --git a/system/btif/Android.bp b/system/btif/Android.bp index 5f5880a536..e9b0743307 100644 --- a/system/btif/Android.bp +++ b/system/btif/Android.bp @@ -178,7 +178,6 @@ cc_library_static { "libbt-jni-thread", "libbt-platform-protos-lite", "libbt-stack", - "libbt-stack-core", "libcom.android.sysprop.bluetooth.wrapped", "libflatbuffers-cpp", "libstatslog_bt", @@ -255,7 +254,6 @@ cc_test { "libbt-sbc-decoder", "libbt-sbc-encoder", "libbt-stack", - "libbt-stack-core", "libbtcore", "libbtdevice", "libbtif", diff --git a/system/stack/Android.bp b/system/stack/Android.bp index 46f1c6a8b5..ab32c48c4b 100644 --- a/system/stack/Android.bp +++ b/system/stack/Android.bp @@ -29,10 +29,12 @@ cc_library_static { min_sdk_version: "Tiramisu", } -// Bluetooth stack static library for target cc_library_static { name: "libbt-stack", - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "hfp_hal_defaults", + ], local_include_dirs: [ "ais", "avct", @@ -63,6 +65,7 @@ cc_library_static { "external/libldac/inc", "external/libopus/include", "packages/modules/Bluetooth/system", + "packages/modules/Bluetooth/system/bta/ag", "packages/modules/Bluetooth/system/bta/include", "packages/modules/Bluetooth/system/bta/sys", "packages/modules/Bluetooth/system/btif/include", @@ -71,6 +74,7 @@ cc_library_static { "packages/modules/Bluetooth/system/udrv/include", ], srcs: [ + ":LegacyStackSdp", "a2dp/a2dp_aac.cc", "a2dp/a2dp_aac_decoder.cc", "a2dp/a2dp_aac_encoder.cc", @@ -91,6 +95,12 @@ cc_library_static { "a2dp/a2dp_vendor_opus.cc", "a2dp/a2dp_vendor_opus_decoder.cc", "a2dp/a2dp_vendor_opus_encoder.cc", + "acl/acl.cc", + "acl/ble_acl.cc", + "acl/btm_acl.cc", + "acl/btm_pm.cc", + "ais/ais_ble.cc", + "arbiter/acl_arbiter.cc", "avct/avct_api.cc", "avct/avct_bcb_act.cc", "avct/avct_ccb.cc", @@ -117,130 +127,6 @@ cc_library_static { "bnep/bnep_api.cc", "bnep/bnep_main.cc", "bnep/bnep_utils.cc", - "btm/hfp_lc3_decoder.cc", - "btm/hfp_lc3_encoder.cc", - "btm/hfp_msbc_decoder.cc", - "btm/hfp_msbc_encoder.cc", - "hid/hidd_api.cc", - "hid/hidd_conn.cc", - "hid/hidh_api.cc", - "hid/hidh_conn.cc", - "pan/pan_api.cc", - "pan/pan_main.cc", - "pan/pan_utils.cc", - ], - static_libs: [ - "bluetooth_flags_c_lib", - "libbluetooth_crypto_toolbox", - "libbluetooth_hci_pdl", - "libbluetooth_log", - "libbt-btu-main-thread", - "libbt-hci", - "libbt-platform-protos-lite", - "libbt-stack-core", - "liblc3", - ], - whole_static_libs: [ - "libaptx_enc", - "libaptxhd_enc", - "libcom.android.sysprop.bluetooth.wrapped", - "libldacBT_abr", - "libldacBT_enc", - ], - apex_available: ["com.android.bt"], - host_supported: true, - min_sdk_version: "Tiramisu", -} - -filegroup { - name: "LegacyStackSdp", - srcs: [ - "sdp/sdp_api.cc", - "sdp/sdp_db.cc", - "sdp/sdp_discovery.cc", - "sdp/sdp_main.cc", - "sdp/sdp_server.cc", - "sdp/sdp_utils.cc", - ], -} - -soong_config_module_type { - name: "hfp_hal_cc_defaults", - module_type: "cc_defaults", - config_namespace: "hfp_hal", - variables: ["vertical"], - properties: ["srcs"], -} - -soong_config_string_variable { - name: "vertical", - values: [ - "android_default", - "android_desktop", - ], -} - -hfp_hal_cc_defaults { - name: "hfp_hal_defaults", - soong_config_variables: { - vertical: { - android_desktop: { - srcs: ["btm/btm_sco_hfp_hal_linux.cc"], - }, - android_default: { - srcs: ["btm/btm_sco_hfp_hal.cc"], - }, - conditions_default: { - srcs: ["btm/btm_sco_hfp_hal.cc"], - }, - }, - }, -} - -cc_library_static { - name: "libbt-stack-core", - defaults: [ - "fluoride_defaults", - "hfp_hal_defaults", - ], - local_include_dirs: [ - "ais", - "avct", - "avdt", - "avrc", - "bnep", - "btm", - "eatt", - "gap", - "gatt", - "hid", - "include", - "l2cap", - "metrics", - "pan", - "sdp", - "smp", - "srvc", - ], - header_libs: [ - "libbluetooth_headers", - ], - include_dirs: [ - "packages/modules/Bluetooth/system", - "packages/modules/Bluetooth/system/bta/ag", - "packages/modules/Bluetooth/system/bta/include", - "packages/modules/Bluetooth/system/bta/sys", - "packages/modules/Bluetooth/system/gd", - "packages/modules/Bluetooth/system/udrv/include", - ], - srcs: [ - ":LegacyStackSdp", - "acl/acl.cc", - "acl/ble_acl.cc", - "acl/btm_acl.cc", - "acl/btm_pm.cc", - "ais/ais_ble.cc", - "arbiter/acl_arbiter.cc", "btm/ble_scanner_hci_interface.cc", "btm/btm_ble.cc", "btm/btm_ble_addr.cc", @@ -262,6 +148,10 @@ cc_library_static { "btm/btm_sec.cc", "btm/btm_sec_cb.cc", "btm/btm_security_client_interface.cc", + "btm/hfp_lc3_decoder.cc", + "btm/hfp_lc3_encoder.cc", + "btm/hfp_msbc_decoder.cc", + "btm/hfp_msbc_encoder.cc", "btm/security_event_parser.cc", "btu/btu_hcif.cc", "connection_manager/connection_manager.cc", @@ -280,6 +170,10 @@ cc_library_static { "gatt/gatt_utils.cc", "hcic/hciblecmds.cc", "hcic/hcicmds.cc", + "hid/hidd_api.cc", + "hid/hidd_conn.cc", + "hid/hidh_api.cc", + "hid/hidh_conn.cc", "l2cap/l2c_api.cc", "l2cap/l2c_ble.cc", "l2cap/l2c_ble_conn_params.cc", @@ -290,6 +184,9 @@ cc_library_static { "l2cap/l2c_utils.cc", "l2cap/l2cap_api.cc", "metrics/stack_metrics_logging.cc", + "pan/pan_api.cc", + "pan/pan_main.cc", + "pan/pan_utils.cc", "rfcomm/port_api.cc", "rfcomm/port_rfc.cc", "rfcomm/port_utils.cc", @@ -317,10 +214,6 @@ cc_library_static { generated_headers: [ "cxx-bridge-header", ], - cflags: [ - /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/ - "-fvisibility=default", - ], static_libs: [ "bluetooth_flags_c_lib", "libaconfig_storage_read_api_cc", @@ -329,11 +222,20 @@ cc_library_static { "libbluetooth_gd", "libbluetooth_hci_pdl", "libbluetooth_log", + "libbt-btu-main-thread", "libbt-hci", "libbt-platform-protos-lite", "libcom.android.sysprop.bluetooth.wrapped", + "liblc3", "server_configurable_flags", ], + whole_static_libs: [ + "libaptx_enc", + "libaptxhd_enc", + "libcom.android.sysprop.bluetooth.wrapped", + "libldacBT_abr", + "libldacBT_enc", + ], shared_libs: [ "libPlatformProperties", "libcrypto", @@ -343,6 +245,51 @@ cc_library_static { min_sdk_version: "Tiramisu", } +filegroup { + name: "LegacyStackSdp", + srcs: [ + "sdp/sdp_api.cc", + "sdp/sdp_db.cc", + "sdp/sdp_discovery.cc", + "sdp/sdp_main.cc", + "sdp/sdp_server.cc", + "sdp/sdp_utils.cc", + ], +} + +soong_config_module_type { + name: "hfp_hal_cc_defaults", + module_type: "cc_defaults", + config_namespace: "hfp_hal", + variables: ["vertical"], + properties: ["srcs"], +} + +soong_config_string_variable { + name: "vertical", + values: [ + "android_default", + "android_desktop", + ], +} + +hfp_hal_cc_defaults { + name: "hfp_hal_defaults", + soong_config_variables: { + vertical: { + android_desktop: { + srcs: ["btm/btm_sco_hfp_hal_linux.cc"], + }, + android_default: { + srcs: ["btm/btm_sco_hfp_hal.cc"], + }, + conditions_default: { + srcs: ["btm/btm_sco_hfp_hal.cc"], + }, + }, + }, +} + cc_defaults { name: "btstack_fuzzer_default", host_supported: true, @@ -799,7 +746,6 @@ cc_test { "libbt-sbc-decoder", "libbt-sbc-encoder", "libbt-stack", - "libbt-stack-core", "libbtcore", "libbtdevice", "libbtif", diff --git a/system/stack/test/fuzzers/Android.bp b/system/stack/test/fuzzers/Android.bp index b62929edd3..ba50b90e2b 100644 --- a/system/stack/test/fuzzers/Android.bp +++ b/system/stack/test/fuzzers/Android.bp @@ -55,7 +55,6 @@ cc_defaults { "libbt-sbc-decoder", "libbt-sbc-encoder", "libbt-stack", - "libbt-stack-core", "libbtcore", "libbtdevice", "libbte", diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp index 709b0074eb..40b862e55e 100644 --- a/system/test/headless/Android.bp +++ b/system/test/headless/Android.bp @@ -98,7 +98,6 @@ cc_binary { "libbt-sbc-decoder", "libbt-sbc-encoder", "libbt-stack", - "libbt-stack-core", "libbtcore", "libbtdevice", "libbte", diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp index 62870eed9b..198d48e8e7 100644 --- a/system/test/suite/Android.bp +++ b/system/test/suite/Android.bp @@ -78,7 +78,6 @@ cc_defaults { "libbt-sbc-decoder", "libbt-sbc-encoder", "libbt-stack", - "libbt-stack-core", "libbtcore", "libbtdevice", "libbte", |