diff options
46 files changed, 79 insertions, 181 deletions
diff --git a/android/apishim/Android.bp b/android/apishim/Android.bp index 9d980b2498..7780c014f3 100644 --- a/android/apishim/Android.bp +++ b/android/apishim/Android.bp @@ -23,9 +23,7 @@ java_defaults { "androidx.annotation_annotation", "modules-utils-build", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", } diff --git a/android/app/Android.bp b/android/app/Android.bp index db85914522..9d5a9f58ee 100644 --- a/android/app/Android.bp +++ b/android/app/Android.bp @@ -32,9 +32,7 @@ java_library { name: "bluetooth.mapsapi", srcs: ["lib/mapapi/**/*.java"], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", sdk_version: "module_current", lint: { @@ -47,9 +45,7 @@ java_library { srcs: [":framework-mms-shared-srcs"], libs: ["unsupportedappusage"], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", sdk_version: "module_current", lint: { @@ -80,7 +76,7 @@ cc_library_shared { "packages/modules/Bluetooth/system", "packages/modules/Bluetooth/system/gd", ], - // libbluetooth_jni is the jni lib included in the btservices apex. + // libbluetooth_jni is the jni lib included in the com.android.bt apex. // As this library is inside an APEX the shared_libs that does not // expose stubs are copied inside it. As a result using those as // shared libraries is less interesting as they are not shared, so we link @@ -164,9 +160,7 @@ cc_library_shared { sanitize: { scs: true, }, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", } @@ -200,9 +194,7 @@ cc_library { sanitize: { scs: true, }, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], host_supported: true, min_sdk_version: "Tiramisu", } @@ -342,9 +334,7 @@ android_app { proguard_compatibility: true, proguard_flags_files: ["proguard.flags"], }, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", sdk_version: "module_current", updatable: true, @@ -358,9 +348,7 @@ java_library { libs: [ "app-compat-annotations", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", sdk_version: "module_current", } @@ -379,9 +367,7 @@ java_library { srcs: [ ":srcs_bluetooth_protos", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", sdk_version: "module_current", } diff --git a/common/Android.bp b/common/Android.bp index 900cc365d7..f472c9e3d0 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -22,7 +22,7 @@ java_library { "bluetooth/constants/aics/GainMode.aidl", "bluetooth/constants/aics/Mute.aidl", ], - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", sdk_version: "module_current", visibility: ["//packages/modules/Bluetooth:__subpackages__"], diff --git a/flags/Android.bp b/flags/Android.bp index 3695db34ad..694fd7aaad 100644 --- a/flags/Android.bp +++ b/flags/Android.bp @@ -59,7 +59,7 @@ java_aconfig_library { name: "bluetooth_flags_java_lib", aconfig_declarations: "bluetooth_aconfig_flags", visibility: ["//packages/modules/Bluetooth:__subpackages__"], - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], libs: ["framework-configinfrastructure.stubs.module_lib"], sdk_version: "module_current", min_sdk_version: "Tiramisu", @@ -83,7 +83,7 @@ cc_aconfig_library { aconfig_declarations: "bluetooth_aconfig_flags", host_supported: true, visibility: ["//packages/modules/Bluetooth:__subpackages__"], - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", } @@ -101,7 +101,7 @@ rust_aconfig_library { host_supported: true, crate_name: "bluetooth_aconfig_flags_rust", aconfig_declarations: "bluetooth_aconfig_flags", - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", visibility: ["//packages/modules/Bluetooth/system:__subpackages__"], } diff --git a/framework/Android.bp b/framework/Android.bp index 6e5dafc3e1..cd09db00e6 100644 --- a/framework/Android.bp +++ b/framework/Android.bp @@ -82,9 +82,7 @@ java_sdk_library { ":__subpackages__", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], permitted_packages: [ "android.bluetooth", diff --git a/service/Android.bp b/service/Android.bp index 57968f07b7..63fd7b8faa 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -88,7 +88,7 @@ java_library { sdk_version: "system_server_current", min_sdk_version: "Tiramisu", - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], visibility: [":__subpackages__"], } @@ -128,7 +128,7 @@ java_library { sdk_version: "system_server_current", min_sdk_version: "Tiramisu", - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], } java_library { @@ -147,7 +147,7 @@ java_library { sdk_version: "system_current", min_sdk_version: "Tiramisu", - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], } android_robolectric_test { diff --git a/service/aidl/Android.bp b/service/aidl/Android.bp index d7adba534e..14980c7520 100644 --- a/service/aidl/Android.bp +++ b/service/aidl/Android.bp @@ -17,6 +17,6 @@ java_library { libs: ["framework-annotations-lib"], sdk_version: "module_current", min_sdk_version: "Tiramisu", - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], visibility: ["//packages/modules/Bluetooth:__subpackages__"], } diff --git a/service/change-ids/Android.bp b/service/change-ids/Android.bp index 3544d6b1e2..b717d09e36 100644 --- a/service/change-ids/Android.bp +++ b/service/change-ids/Android.bp @@ -22,7 +22,7 @@ java_library { libs: ["app-compat-annotations"], sdk_version: "system_server_current", min_sdk_version: "Tiramisu", - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], visibility: ["//packages/modules/Bluetooth/service:__subpackages__"], } diff --git a/sysprop/Android.bp b/sysprop/Android.bp index e9d820b2f1..241e8711f7 100644 --- a/sysprop/Android.bp +++ b/sysprop/Android.bp @@ -20,7 +20,7 @@ sysprop_library { cpp: { min_sdk_version: "Tiramisu", }, - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], } cc_library_static { @@ -30,6 +30,6 @@ cc_library_static { export_include_dirs: ["exported_include"], export_static_lib_headers: ["libcom.android.sysprop.bluetooth"], visibility: ["//packages/modules/Bluetooth/system:__subpackages__"], - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", } diff --git a/system/Android.bp b/system/Android.bp index 1ecb8b81d7..9d47e06596 100644 --- a/system/Android.bp +++ b/system/Android.bp @@ -28,7 +28,7 @@ cc_library_headers { host_supported: true, apex_available: [ "//apex_available:platform", - "com.android.btservices", + "com.android.bt", ], min_sdk_version: "30", } diff --git a/system/audio/Android.bp b/system/audio/Android.bp index 481182dc5f..98677c206a 100644 --- a/system/audio/Android.bp +++ b/system/audio/Android.bp @@ -41,9 +41,7 @@ cc_library_static { ], host_supported: true, min_sdk_version: "33", - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], } cc_library_host_shared { diff --git a/system/audio_hal_interface/Android.bp b/system/audio_hal_interface/Android.bp index 363627401f..cc33db9a51 100644 --- a/system/audio_hal_interface/Android.bp +++ b/system/audio_hal_interface/Android.bp @@ -79,9 +79,7 @@ cc_library_static { cflags: [ "-Wthread-safety", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", header_libs: ["libbluetooth_headers"], } diff --git a/system/audio_hearing_aid_hw/Android.bp b/system/audio_hearing_aid_hw/Android.bp index e8e83e86c8..afc160d599 100644 --- a/system/audio_hearing_aid_hw/Android.bp +++ b/system/audio_hearing_aid_hw/Android.bp @@ -27,9 +27,7 @@ cc_library { "src/audio_hearing_aid_hw.cc", "src/audio_hearing_aid_hw_utils.cc", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], shared_libs: [ "libbase", "liblog", diff --git a/system/bta/Android.bp b/system/bta/Android.bp index efa1d25fd1..f91004851f 100644 --- a/system/bta/Android.bp +++ b/system/bta/Android.bp @@ -168,9 +168,7 @@ cc_library_static { ], }, }, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], host_supported: true, min_sdk_version: "Tiramisu", } @@ -225,9 +223,7 @@ cc_library_static { shared_libs: [ "libcrypto", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], host_supported: true, min_sdk_version: "Tiramisu", } diff --git a/system/bta/aics/Android.bp b/system/bta/aics/Android.bp index 33bd649d13..acb6b4945b 100644 --- a/system/bta/aics/Android.bp +++ b/system/bta/aics/Android.bp @@ -4,7 +4,7 @@ cc_library_headers { host_supported: true, vendor_available: true, // remove when https://r.android.com/3302734 is merged visibility: ["//packages/modules/Bluetooth:__subpackages__"], - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], min_sdk_version: "33", } @@ -27,6 +27,6 @@ cc_library { export_header_lib_headers: ["aics_headers"], host_supported: true, visibility: ["//packages/modules/Bluetooth:__subpackages__"], - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], min_sdk_version: "33", } diff --git a/system/btcore/Android.bp b/system/btcore/Android.bp index dc6df095ad..17d5c01905 100644 --- a/system/btcore/Android.bp +++ b/system/btcore/Android.bp @@ -24,9 +24,7 @@ cc_defaults { ], header_libs: ["libbluetooth_headers"], host_supported: true, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], target: { host_linux: { cflags: ["-D_GNU_SOURCE"], @@ -47,9 +45,7 @@ cc_library_static { ], header_libs: ["libbluetooth_headers"], host_supported: true, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], target: { host_linux: { cflags: ["-D_GNU_SOURCE"], @@ -80,7 +76,7 @@ cc_library_headers { host_supported: true, apex_available: [ "//apex_available:platform", - "com.android.btservices", + "com.android.bt", ], min_sdk_version: "30", } diff --git a/system/btif/Android.bp b/system/btif/Android.bp index 75494590fd..498d0c1048 100644 --- a/system/btif/Android.bp +++ b/system/btif/Android.bp @@ -24,9 +24,7 @@ cc_library { generated_sources: ["statslog_bt.cpp"], generated_headers: ["statslog_bt.h"], export_generated_headers: ["statslog_bt.h"], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "30", shared_libs: [ "libstatssocket", @@ -64,9 +62,7 @@ cc_library_static { shared_libs: [ "libchrome", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", } @@ -164,9 +160,7 @@ cc_library_static { shared_libs: [ "libbinder", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], host_supported: true, min_sdk_version: "Tiramisu", } @@ -253,9 +247,7 @@ cc_library_static { /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/ "-fvisibility=default", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], host_supported: true, min_sdk_version: "Tiramisu", header_libs: ["libbluetooth_headers"], diff --git a/system/common/Android.bp b/system/common/Android.bp index f3f2a619ca..6fe25539d9 100644 --- a/system/common/Android.bp +++ b/system/common/Android.bp @@ -49,9 +49,7 @@ cc_library_static { "libcrypto", "libcutils", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", header_libs: ["libbluetooth_headers"], static_libs: [ diff --git a/system/device/Android.bp b/system/device/Android.bp index eb71e3f414..d96d3f935a 100644 --- a/system/device/Android.bp +++ b/system/device/Android.bp @@ -26,9 +26,7 @@ cc_library_static { "src/esco_parameters.cc", "src/interop.cc", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", header_libs: ["libbluetooth_headers"], static_libs: [ diff --git a/system/embdrv/encoder_for_aptx/Android.bp b/system/embdrv/encoder_for_aptx/Android.bp index 406f8e302f..1b421089d7 100644 --- a/system/embdrv/encoder_for_aptx/Android.bp +++ b/system/embdrv/encoder_for_aptx/Android.bp @@ -42,9 +42,7 @@ cc_library_static { tidy_checks: tidy_errors, tidy_checks_as_errors: tidy_errors, min_sdk_version: "Tiramisu", - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], visibility: [ "//packages/modules/Bluetooth:__subpackages__", ], diff --git a/system/embdrv/encoder_for_aptxhd/Android.bp b/system/embdrv/encoder_for_aptxhd/Android.bp index 553d87547c..04dd120c40 100644 --- a/system/embdrv/encoder_for_aptxhd/Android.bp +++ b/system/embdrv/encoder_for_aptxhd/Android.bp @@ -42,9 +42,7 @@ cc_library_static { tidy_checks: tidy_errors, tidy_checks_as_errors: tidy_errors, min_sdk_version: "Tiramisu", - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], visibility: [ "//packages/modules/Bluetooth:__subpackages__", ], diff --git a/system/embdrv/g722/Android.bp b/system/embdrv/g722/Android.bp index 63af8f58ea..1eb2c59a1b 100644 --- a/system/embdrv/g722/Android.bp +++ b/system/embdrv/g722/Android.bp @@ -21,8 +21,6 @@ cc_library_static { "g722_encode.cc", ], host_supported: true, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", } diff --git a/system/embdrv/sbc/decoder/Android.bp b/system/embdrv/sbc/decoder/Android.bp index 84184fece7..2bce45cf98 100644 --- a/system/embdrv/sbc/decoder/Android.bp +++ b/system/embdrv/sbc/decoder/Android.bp @@ -35,9 +35,7 @@ cc_library_static { "srce", ], host_supported: true, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", } diff --git a/system/embdrv/sbc/encoder/Android.bp b/system/embdrv/sbc/encoder/Android.bp index 74fe1ec965..c583277f41 100644 --- a/system/embdrv/sbc/encoder/Android.bp +++ b/system/embdrv/sbc/encoder/Android.bp @@ -32,8 +32,6 @@ cc_library_static { "packages/modules/Bluetooth/system/stack/include", ], host_supported: true, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", } diff --git a/system/gd/Android.bp b/system/gd/Android.bp index aae5f1deb2..fd01e82eb2 100644 --- a/system/gd/Android.bp +++ b/system/gd/Android.bp @@ -177,9 +177,7 @@ cc_library_static { include_dirs: [ "packages/modules/Bluetooth/system", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "31", static_libs: [ "bluetooth_flags_c_lib", @@ -263,11 +261,11 @@ cc_test { ], static_libs: [ "bluetooth_flags_c_lib_for_test", + "libaconfig_storage_read_api_cc", "libbluetooth_log", "libchrome", "libgmock", "server_configurable_flags", - "libaconfig_storage_read_api_cc", ], shared_libs: [ "libbase", diff --git a/system/gd/crypto_toolbox/Android.bp b/system/gd/crypto_toolbox/Android.bp index 05e44b7bc2..2bac8bc985 100644 --- a/system/gd/crypto_toolbox/Android.bp +++ b/system/gd/crypto_toolbox/Android.bp @@ -19,7 +19,7 @@ cc_library { name: "libbluetooth_crypto_toolbox", defaults: ["fluoride_defaults"], host_supported: true, - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], min_sdk_version: "29", include_dirs: [ "packages/modules/Bluetooth/system/gd", diff --git a/system/gd/proto/Android.bp b/system/gd/proto/Android.bp index 6136cf84f6..1f7e72687f 100644 --- a/system/gd/proto/Android.bp +++ b/system/gd/proto/Android.bp @@ -16,9 +16,7 @@ java_library_static { srcs: [ "bluetooth/metrics/bluetooth.proto", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "30", sdk_version: "current", } @@ -41,8 +39,6 @@ cc_library_static { srcs: [ "bluetooth/metrics/bluetooth.proto", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "30", } diff --git a/system/gd/rust/common/Android.bp b/system/gd/rust/common/Android.bp index a1e8c4a977..26b724c900 100644 --- a/system/gd/rust/common/Android.bp +++ b/system/gd/rust/common/Android.bp @@ -35,9 +35,7 @@ rust_library { ], }, }, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", } diff --git a/system/hci/Android.bp b/system/hci/Android.bp index e4e0106606..1f0a51435a 100644 --- a/system/hci/Android.bp +++ b/system/hci/Android.bp @@ -26,9 +26,7 @@ cc_library_static { "packages/modules/Bluetooth/system/stack/include", "system/libhwbinder/include", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], host_supported: true, min_sdk_version: "Tiramisu", header_libs: ["libbluetooth_headers"], diff --git a/system/include/Android.bp b/system/include/Android.bp index 2482effbf3..c7cec2e726 100644 --- a/system/include/Android.bp +++ b/system/include/Android.bp @@ -22,7 +22,7 @@ cc_library_headers { host_supported: true, apex_available: [ "//apex_available:platform", - "com.android.btservices", + "com.android.bt", ], min_sdk_version: "30", } @@ -49,7 +49,7 @@ cc_library_headers { host_supported: true, apex_available: [ "//apex_available:platform", - "com.android.btservices", + "com.android.bt", ], min_sdk_version: "30", } diff --git a/system/internal_include/Android.bp b/system/internal_include/Android.bp index 7d66847ebf..06a56b06fa 100644 --- a/system/internal_include/Android.bp +++ b/system/internal_include/Android.bp @@ -14,7 +14,7 @@ cc_library_headers { host_supported: true, apex_available: [ "//apex_available:platform", - "com.android.btservices", + "com.android.bt", ], min_sdk_version: "30", } diff --git a/system/log/Android.bp b/system/log/Android.bp index ebfd81d1fb..649a039aff 100644 --- a/system/log/Android.bp +++ b/system/log/Android.bp @@ -2,9 +2,7 @@ cc_library { name: "libbluetooth_log", host_supported: true, min_sdk_version: "33", - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], export_include_dirs: [ "include", ], diff --git a/system/main/Android.bp b/system/main/Android.bp index 5272905831..15b1351bc3 100644 --- a/system/main/Android.bp +++ b/system/main/Android.bp @@ -41,9 +41,7 @@ cc_library_static { "packages/modules/Bluetooth/system/udrv/include", "system/security/keystore/include", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], host_supported: true, min_sdk_version: "Tiramisu", static_libs: [ @@ -102,9 +100,7 @@ cc_library { sanitize: { scs: true, }, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], host_supported: true, min_sdk_version: "30", } diff --git a/system/osi/Android.bp b/system/osi/Android.bp index 4806d61985..23055416f2 100644 --- a/system/osi/Android.bp +++ b/system/osi/Android.bp @@ -83,9 +83,7 @@ cc_library_static { "-DLIB_OSI_INTERNAL", ], min_sdk_version: "Tiramisu", - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], header_libs: ["libbluetooth_headers"], static_libs: [ "bluetooth_flags_c_lib", diff --git a/system/packet/Android.bp b/system/packet/Android.bp index d3ba6dfd71..05c2c8cc5b 100644 --- a/system/packet/Android.bp +++ b/system/packet/Android.bp @@ -20,9 +20,7 @@ cc_library_static { "lib-bt-packets-base", "libbluetooth_log", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "30", } diff --git a/system/packet/avrcp/Android.bp b/system/packet/avrcp/Android.bp index 1808112072..ee51ed340a 100644 --- a/system/packet/avrcp/Android.bp +++ b/system/packet/avrcp/Android.bp @@ -48,8 +48,6 @@ cc_library_static { "libbluetooth_log", "libchrome", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "30", } diff --git a/system/packet/base/Android.bp b/system/packet/base/Android.bp index 732d597c34..f81a511374 100644 --- a/system/packet/base/Android.bp +++ b/system/packet/base/Android.bp @@ -18,9 +18,7 @@ cc_library_static { "packet.cc", "packet_builder.cc", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "30", shared_libs: [ "libbase", diff --git a/system/pdl/hci/Android.bp b/system/pdl/hci/Android.bp index 354d500300..832598aaff 100644 --- a/system/pdl/hci/Android.bp +++ b/system/pdl/hci/Android.bp @@ -19,9 +19,7 @@ cc_library_headers { "BluetoothGeneratedPacketsHci_h", ], host_supported: true, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "33", } @@ -48,9 +46,7 @@ cc_library_static { "//hardware/interfaces/bluetooth/aidl/vts", "//packages/modules/Bluetooth/system:__subpackages__", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "33", } diff --git a/system/pdl/l2cap/Android.bp b/system/pdl/l2cap/Android.bp index d55935995c..bbd499612e 100644 --- a/system/pdl/l2cap/Android.bp +++ b/system/pdl/l2cap/Android.bp @@ -15,9 +15,7 @@ cc_library_headers { "BluetoothGeneratedPacketsL2cap_h", ], host_supported: true, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "33", } @@ -30,8 +28,6 @@ cc_library_static { "libbluetooth_l2cap_pdl_header", ], host_supported: true, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "33", } diff --git a/system/pdl/ras/Android.bp b/system/pdl/ras/Android.bp index d54d753b77..84e516c64f 100644 --- a/system/pdl/ras/Android.bp +++ b/system/pdl/ras/Android.bp @@ -15,9 +15,7 @@ cc_library_headers { "BluetoothGeneratedPacketsRas_h", ], host_supported: true, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "33", } @@ -30,8 +28,6 @@ cc_library_static { "libbluetooth_ras_pdl_header", ], host_supported: true, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "33", } diff --git a/system/pdl/security/Android.bp b/system/pdl/security/Android.bp index ebd5a3d8db..fbbc2b7339 100644 --- a/system/pdl/security/Android.bp +++ b/system/pdl/security/Android.bp @@ -15,9 +15,7 @@ cc_library_headers { "BluetoothGeneratedPacketsSmp_h", ], host_supported: true, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "33", } @@ -30,9 +28,7 @@ cc_library_static { "libbluetooth_smp_pdl_header", ], host_supported: true, - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "33", } diff --git a/system/profile/avrcp/Android.bp b/system/profile/avrcp/Android.bp index 8db8f11b2a..6ea0ea1abb 100644 --- a/system/profile/avrcp/Android.bp +++ b/system/profile/avrcp/Android.bp @@ -38,9 +38,7 @@ cc_library_static { shared_libs: [ "liblog", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", header_libs: ["libbluetooth_headers"], } diff --git a/system/rust/Android.bp b/system/rust/Android.bp index 592a686216..59ef358330 100644 --- a/system/rust/Android.bp +++ b/system/rust/Android.bp @@ -58,7 +58,7 @@ rust_defaults { ], }, }, - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], } rust_ffi_static { @@ -123,7 +123,7 @@ cc_library_static { ], host_supported: true, generated_sources: ["libbluetooth_core_rs_bridge_codegen"], - apex_available: ["com.android.btservices"], + apex_available: ["com.android.bt"], min_sdk_version: "Tiramisu", // Bug: 286537287 this library gets linked with Rust objects but cross-language LTO // isn't supported yet. diff --git a/system/stack/Android.bp b/system/stack/Android.bp index dd004567a3..e3c8fb95a9 100644 --- a/system/stack/Android.bp +++ b/system/stack/Android.bp @@ -24,9 +24,7 @@ cc_library_static { shared_libs: [ "libchrome", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], host_supported: true, min_sdk_version: "Tiramisu", } @@ -150,9 +148,7 @@ cc_library_static { "libldacBT_abr", "libldacBT_enc", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], host_supported: true, min_sdk_version: "Tiramisu", } @@ -342,9 +338,7 @@ cc_library_static { "libPlatformProperties", "libcrypto", ], - apex_available: [ - "com.android.btservices", - ], + apex_available: ["com.android.bt"], host_supported: true, min_sdk_version: "Tiramisu", } @@ -1639,6 +1633,7 @@ cc_test { ], static_libs: [ "bluetooth_flags_c_lib_for_test", + "libaconfig_storage_read_api_cc", "libbase", "libbluetooth-types", "libbluetooth_gd", @@ -1655,7 +1650,6 @@ cc_test { "libprotobuf-cpp-lite", "libstatslog_bt", "server_configurable_flags", - "libaconfig_storage_read_api_cc", ], target: { android: { @@ -1964,6 +1958,7 @@ cc_test { ], static_libs: [ "bluetooth_flags_c_lib_for_test", + "libaconfig_storage_read_api_cc", "libbase", "libbluetooth-types", "libbluetooth_gd", @@ -1979,7 +1974,6 @@ cc_test { "liblog", "libosi", "server_configurable_flags", - "libaconfig_storage_read_api_cc", ], aidl: { libs: ["bluetooth_constants"], diff --git a/system/types/Android.bp b/system/types/Android.bp index 00a0de546d..e00941d8ec 100644 --- a/system/types/Android.bp +++ b/system/types/Android.bp @@ -15,7 +15,7 @@ cc_library_headers { host_supported: true, apex_available: [ "//apex_available:platform", - "com.android.btservices", + "com.android.bt", "com.android.media", "com.android.media.swcodec", ], @@ -45,7 +45,7 @@ cc_library_static { export_header_lib_headers: ["libbluetooth-types-header"], apex_available: [ "//apex_available:platform", - "com.android.btservices", + "com.android.bt", ], min_sdk_version: "29", } diff --git a/system/udrv/Android.bp b/system/udrv/Android.bp index 5a69d8e886..fb77f0f0f1 100644 --- a/system/udrv/Android.bp +++ b/system/udrv/Android.bp @@ -24,7 +24,7 @@ cc_library_static { host_supported: true, apex_available: [ "//apex_available:platform", - "com.android.btservices", + "com.android.bt", ], min_sdk_version: "Tiramisu", header_libs: ["libbluetooth_headers"], |