diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/btif/Android.bp | 3 | ||||
| -rw-r--r-- | system/main/Android.bp | 91 | ||||
| -rw-r--r-- | system/stack/Android.bp | 3 |
3 files changed, 4 insertions, 93 deletions
diff --git a/system/btif/Android.bp b/system/btif/Android.bp index d6aee63815..0eb097dca7 100644 --- a/system/btif/Android.bp +++ b/system/btif/Android.bp @@ -238,10 +238,10 @@ cc_test { "bluetooth_flags_c_lib_for_test", "libFraunhoferAAC", "libbase", - "libbluetooth-for-tests", "libbluetooth-types", "libbluetooth_core_rs", "libbluetooth_crypto_toolbox", + "libbluetooth_gd", "libbluetooth_log", "libbt-audio-asrc", "libbt-audio-hal-interface", @@ -255,6 +255,7 @@ cc_test { "libbt-stack", "libbtcore", "libbtdevice", + "libbte", "libbtif", "libchrome", "libcom.android.sysprop.bluetooth.wrapped", diff --git a/system/main/Android.bp b/system/main/Android.bp index 4bddd6a5ab..e36f7ff3bc 100644 --- a/system/main/Android.bp +++ b/system/main/Android.bp @@ -24,22 +24,10 @@ cc_library_static { ":LibBluetoothSources", ], include_dirs: [ - "hardware/interfaces/keymaster/4.0/support/include", "packages/modules/Bluetooth/system", - "packages/modules/Bluetooth/system/bta/dm", "packages/modules/Bluetooth/system/bta/include", - "packages/modules/Bluetooth/system/bta/sys", - "packages/modules/Bluetooth/system/btif/co", - "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include", - "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include", "packages/modules/Bluetooth/system/gd", - "packages/modules/Bluetooth/system/stack/a2dp", - "packages/modules/Bluetooth/system/stack/avdt", - "packages/modules/Bluetooth/system/stack/btm", "packages/modules/Bluetooth/system/stack/include", - "packages/modules/Bluetooth/system/stack/l2cap", - "packages/modules/Bluetooth/system/udrv/include", - "system/security/keystore/include", ], apex_available: ["com.android.bt"], host_supported: true, @@ -54,85 +42,6 @@ cc_library_static { header_libs: ["libbluetooth_headers"], } -cc_library { - name: "libbluetooth", - visibility: [ - "//cts/hostsidetests:__subpackages__", - "//packages/modules/Bluetooth:__subpackages__", - ], - defaults: ["fluoride_defaults"], - header_libs: ["libbluetooth_headers"], - export_header_lib_headers: ["libbluetooth_headers"], - include_dirs: [ - "hardware/interfaces/keymaster/4.0/support/include", - "packages/modules/Bluetooth/system", - "packages/modules/Bluetooth/system/bta/dm", - "packages/modules/Bluetooth/system/bta/include", - "packages/modules/Bluetooth/system/bta/sys", - "packages/modules/Bluetooth/system/btif/co", - "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include", - "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include", - "packages/modules/Bluetooth/system/stack/a2dp", - "packages/modules/Bluetooth/system/stack/avdt", - "packages/modules/Bluetooth/system/stack/btm", - "packages/modules/Bluetooth/system/stack/include", - "packages/modules/Bluetooth/system/stack/l2cap", - "packages/modules/Bluetooth/system/udrv/include", - "system/security/keystore/include", - ], - shared_libs: [ - "android.hardware.bluetooth@1.0", - "android.hardware.bluetooth@1.1", - ], - target: { - android: { - shared_libs: [ - "libstatssocket", - ], - }, - }, - // Shared library link options. - // References to global symbols and functions should bind to the library - // itself. This is to avoid issues with some of the unit/system tests - // that might link statically with some of the code in the library, and - // also dlopen(3) the shared library. - ldflags: ["-Wl,-Bsymbolic,-Bsymbolic-functions"], - sanitize: { - scs: true, - }, - apex_available: ["com.android.bt"], - host_supported: true, - min_sdk_version: "30", -} - -cc_library_static { - name: "libbluetooth-for-tests", - defaults: ["fluoride_defaults"], - - srcs: [ - ":BluetoothStackManagerSources", - ":LibBluetoothShimSources", - ":LibBluetoothSources", - ], - host_supported: true, - include_dirs: [ - "packages/modules/Bluetooth/system", - "packages/modules/Bluetooth/system/bta/include", - "packages/modules/Bluetooth/system/gd", - "packages/modules/Bluetooth/system/stack/include", - ], - whole_static_libs: [ - "libbluetooth_gd", // Gabeldorsche - ], - header_libs: ["libbluetooth_headers"], - static_libs: [ - "bluetooth_flags_c_lib", - "libbluetooth_log", - "libbt-platform-protos-lite", - "libcom.android.sysprop.bluetooth.wrapped", - ], -} - cc_test { name: "net_test_main_shim", test_suites: ["general-tests"], diff --git a/system/stack/Android.bp b/system/stack/Android.bp index 9015c4daa8..ebab1ff5f4 100644 --- a/system/stack/Android.bp +++ b/system/stack/Android.bp @@ -731,10 +731,10 @@ cc_test { "bluetooth_flags_c_lib_for_test", "libFraunhoferAAC", "libbase", - "libbluetooth-for-tests", "libbluetooth-types", "libbluetooth_core_rs", "libbluetooth_crypto_toolbox", + "libbluetooth_gd", "libbluetooth_log", "libbt-audio-hal-interface", "libbt-bta", @@ -747,6 +747,7 @@ cc_test { "libbt-stack", "libbtcore", "libbtdevice", + "libbte", "libbtif", "libchrome", "libcom.android.sysprop.bluetooth.wrapped", |