commit 9b8d57f1b88bf4dba8d348b16475cdd3531fc3a2
author Roopa Sattiraju <sattiraju@google.com> Fri Feb 04 02:57:20 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 04 02:57:20 2022 +0000
tree cefd2a4d63b4504a818975c92fee14c2242c9445
parent 39a91ddc70862ee4b2af3e3702822372c412e10d
parent 08e6905ff53ef6f281d1d2ff1c00b514d07719ff

Merge "Adding bluetooth apex and min_sdk_version" am: 85d3fae9c5 am: 9793b79ce7 am: 08e6905ff5

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1971382

Change-Id: I185aa635544c1c90584e9279923a6541a56f2f5c

audio/aidl/Android.bp

diff --git a/audio/aidl/Android.bp b/audio/aidl/Android.bp
index c172674..6a0cfa5 100644
--- a/audio/aidl/Android.bp
+++ b/audio/aidl/Android.bp
@@ -47,6 +47,11 @@
             vndk: {
                 enabled: true,
             },
+            apex_available: [
+                "//apex_available:platform",
+                "com.android.bluetooth",
+            ],
+            min_sdk_version: "31",
         },
     },
     versions: [

bluetooth/audio/aidl/Android.bp

diff --git a/bluetooth/audio/aidl/Android.bp b/bluetooth/audio/aidl/Android.bp
index 5107240..52671b8 100644
--- a/bluetooth/audio/aidl/Android.bp
+++ b/bluetooth/audio/aidl/Android.bp
@@ -47,6 +47,7 @@
                 "//apex_available:platform",
                 "com.android.bluetooth",
             ],
+            min_sdk_version: "31",
         },
     },
 }

common/aidl/Android.bp

diff --git a/common/aidl/Android.bp b/common/aidl/Android.bp
index 028c923..549d970 100644
--- a/common/aidl/Android.bp
+++ b/common/aidl/Android.bp
@@ -30,6 +30,7 @@
         ndk: {
             apex_available: [
                 "//apex_available:platform",
+                "com.android.bluetooth",
                 "com.android.media.swcodec",
                 "com.android.neuralnetworks",
             ],

common/fmq/aidl/Android.bp

diff --git a/common/fmq/aidl/Android.bp b/common/fmq/aidl/Android.bp
index 842a75f..6fd4200 100644
--- a/common/fmq/aidl/Android.bp
+++ b/common/fmq/aidl/Android.bp
@@ -29,6 +29,13 @@
         cpp: {
             enabled: false,
         },
+        ndk: {
+            apex_available: [
+                "//apex_available:platform",
+                "com.android.bluetooth",
+            ],
+            min_sdk_version: "29",
+        },
     },
     versions: ["1"],
 }