From 2591c3d0cf4c5621745dd9e06957f67256201fab Mon Sep 17 00:00:00 2001 From: William Escande Date: Mon, 22 Aug 2022 11:27:58 -0700 Subject: [PATCH] [Bluetooth apex] Use new apex name The Bluetooth apex name is now called com.android.btservices Bug: 243054261 Test: Build Change-Id: Ib63646722cbef948b5198fc5f2a9b5ac2ca52ae3 --- audio/aidl/Android.bp | 2 +- audio/common/5.0/Android.bp | 2 +- bluetooth/1.0/Android.bp | 2 +- bluetooth/1.1/Android.bp | 2 +- bluetooth/a2dp/1.0/Android.bp | 2 +- bluetooth/audio/2.0/Android.bp | 2 +- bluetooth/audio/2.1/Android.bp | 2 +- bluetooth/audio/aidl/Android.bp | 2 +- common/aidl/Android.bp | 2 +- common/fmq/aidl/Android.bp | 2 +- graphics/bufferqueue/1.0/Android.bp | 2 +- graphics/bufferqueue/2.0/Android.bp | 2 +- graphics/common/1.0/Android.bp | 2 +- graphics/common/1.1/Android.bp | 2 +- graphics/common/1.2/Android.bp | 2 +- radio/1.0/Android.bp | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/audio/aidl/Android.bp b/audio/aidl/Android.bp index fd893ec1ed..9f3f26af12 100644 --- a/audio/aidl/Android.bp +++ b/audio/aidl/Android.bp @@ -51,7 +51,7 @@ aidl_interface { ndk: { apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", ], min_sdk_version: "31", }, diff --git a/audio/common/5.0/Android.bp b/audio/common/5.0/Android.bp index fd8e85ff45..a6bb331cb0 100644 --- a/audio/common/5.0/Android.bp +++ b/audio/common/5.0/Android.bp @@ -22,6 +22,6 @@ hidl_interface { gen_java_constants: true, apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", ], } diff --git a/bluetooth/1.0/Android.bp b/bluetooth/1.0/Android.bp index 20775dd282..bd1ca69054 100644 --- a/bluetooth/1.0/Android.bp +++ b/bluetooth/1.0/Android.bp @@ -23,6 +23,6 @@ hidl_interface { gen_java: true, apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", ], } diff --git a/bluetooth/1.1/Android.bp b/bluetooth/1.1/Android.bp index 4ac20094bd..f8a05f160c 100644 --- a/bluetooth/1.1/Android.bp +++ b/bluetooth/1.1/Android.bp @@ -23,6 +23,6 @@ hidl_interface { gen_java: true, apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", ], } diff --git a/bluetooth/a2dp/1.0/Android.bp b/bluetooth/a2dp/1.0/Android.bp index 20776dccb8..6ffbefa50e 100644 --- a/bluetooth/a2dp/1.0/Android.bp +++ b/bluetooth/a2dp/1.0/Android.bp @@ -23,6 +23,6 @@ hidl_interface { gen_java: false, apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", ], } diff --git a/bluetooth/audio/2.0/Android.bp b/bluetooth/audio/2.0/Android.bp index e4d48c1b3f..725ec11a37 100644 --- a/bluetooth/audio/2.0/Android.bp +++ b/bluetooth/audio/2.0/Android.bp @@ -26,6 +26,6 @@ hidl_interface { gen_java: false, apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", ], } diff --git a/bluetooth/audio/2.1/Android.bp b/bluetooth/audio/2.1/Android.bp index 1175fb3010..4ca0bef6de 100644 --- a/bluetooth/audio/2.1/Android.bp +++ b/bluetooth/audio/2.1/Android.bp @@ -25,7 +25,7 @@ hidl_interface { ], apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", ], gen_java: false, } diff --git a/bluetooth/audio/aidl/Android.bp b/bluetooth/audio/aidl/Android.bp index a6871624d5..4aea83f199 100644 --- a/bluetooth/audio/aidl/Android.bp +++ b/bluetooth/audio/aidl/Android.bp @@ -42,7 +42,7 @@ aidl_interface { ndk: { apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", ], min_sdk_version: "31", }, diff --git a/common/aidl/Android.bp b/common/aidl/Android.bp index 549d970d93..43f8c4d052 100644 --- a/common/aidl/Android.bp +++ b/common/aidl/Android.bp @@ -30,7 +30,7 @@ aidl_interface { ndk: { apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", "com.android.media.swcodec", "com.android.neuralnetworks", ], diff --git a/common/fmq/aidl/Android.bp b/common/fmq/aidl/Android.bp index 6fd420018f..a85597cffb 100644 --- a/common/fmq/aidl/Android.bp +++ b/common/fmq/aidl/Android.bp @@ -32,7 +32,7 @@ aidl_interface { ndk: { apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", ], min_sdk_version: "29", }, diff --git a/graphics/bufferqueue/1.0/Android.bp b/graphics/bufferqueue/1.0/Android.bp index 11559b2637..82c71f1d5f 100644 --- a/graphics/bufferqueue/1.0/Android.bp +++ b/graphics/bufferqueue/1.0/Android.bp @@ -27,7 +27,7 @@ hidl_interface { gen_java: true, apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", "com.android.media", "com.android.media.swcodec", ], diff --git a/graphics/bufferqueue/2.0/Android.bp b/graphics/bufferqueue/2.0/Android.bp index 552dafff8b..3067e2483c 100644 --- a/graphics/bufferqueue/2.0/Android.bp +++ b/graphics/bufferqueue/2.0/Android.bp @@ -29,7 +29,7 @@ hidl_interface { gen_java: true, apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", "com.android.media", "com.android.media.swcodec", ], diff --git a/graphics/common/1.0/Android.bp b/graphics/common/1.0/Android.bp index 19c51cd8e9..3288583bea 100644 --- a/graphics/common/1.0/Android.bp +++ b/graphics/common/1.0/Android.bp @@ -23,7 +23,7 @@ hidl_interface { gen_java_constants: true, apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", "com.android.media.swcodec", "test_com.android.media.swcodec", ], diff --git a/graphics/common/1.1/Android.bp b/graphics/common/1.1/Android.bp index 0f1b5bf17a..5d07eae432 100644 --- a/graphics/common/1.1/Android.bp +++ b/graphics/common/1.1/Android.bp @@ -26,7 +26,7 @@ hidl_interface { gen_java_constants: true, apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", "com.android.media.swcodec", "test_com.android.media.swcodec", ], diff --git a/graphics/common/1.2/Android.bp b/graphics/common/1.2/Android.bp index ce3350d648..4aa4af56cb 100644 --- a/graphics/common/1.2/Android.bp +++ b/graphics/common/1.2/Android.bp @@ -27,7 +27,7 @@ hidl_interface { gen_java_constants: true, apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", "com.android.media.swcodec", "test_com.android.media.swcodec", ], diff --git a/radio/1.0/Android.bp b/radio/1.0/Android.bp index 8d0d78212d..e49a50dd8d 100644 --- a/radio/1.0/Android.bp +++ b/radio/1.0/Android.bp @@ -25,7 +25,7 @@ hidl_interface { ], apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", ], gen_java: true, }