summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoopa Sattiraju <sattiraju@google.com>2022-02-04 02:57:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-02-04 02:57:20 +0000
commit9b8d57f1b88bf4dba8d348b16475cdd3531fc3a2 (patch)
treecefd2a4d63b4504a818975c92fee14c2242c9445
parent39a91ddc70862ee4b2af3e3702822372c412e10d (diff)
parent08e6905ff53ef6f281d1d2ff1c00b514d07719ff (diff)
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
-rw-r--r--audio/aidl/Android.bp5
-rw-r--r--bluetooth/audio/aidl/Android.bp1
-rw-r--r--common/aidl/Android.bp1
-rw-r--r--common/fmq/aidl/Android.bp7
4 files changed, 14 insertions, 0 deletions
diff --git a/audio/aidl/Android.bp b/audio/aidl/Android.bp
index c1726745cd..6a0cfa55cd 100644
--- a/audio/aidl/Android.bp
+++ b/audio/aidl/Android.bp
@@ -47,6 +47,11 @@ aidl_interface {
vndk: {
enabled: true,
},
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.bluetooth",
+ ],
+ min_sdk_version: "31",
},
},
versions: [
diff --git a/bluetooth/audio/aidl/Android.bp b/bluetooth/audio/aidl/Android.bp
index 5107240957..52671b867e 100644
--- a/bluetooth/audio/aidl/Android.bp
+++ b/bluetooth/audio/aidl/Android.bp
@@ -47,6 +47,7 @@ aidl_interface {
"//apex_available:platform",
"com.android.bluetooth",
],
+ min_sdk_version: "31",
},
},
}
diff --git a/common/aidl/Android.bp b/common/aidl/Android.bp
index 028c923de6..549d970d93 100644
--- a/common/aidl/Android.bp
+++ b/common/aidl/Android.bp
@@ -30,6 +30,7 @@ aidl_interface {
ndk: {
apex_available: [
"//apex_available:platform",
+ "com.android.bluetooth",
"com.android.media.swcodec",
"com.android.neuralnetworks",
],
diff --git a/common/fmq/aidl/Android.bp b/common/fmq/aidl/Android.bp
index 842a75ffe1..6fd420018f 100644
--- a/common/fmq/aidl/Android.bp
+++ b/common/fmq/aidl/Android.bp
@@ -29,6 +29,13 @@ aidl_interface {
cpp: {
enabled: false,
},
+ ndk: {
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.bluetooth",
+ ],
+ min_sdk_version: "29",
+ },
},
versions: ["1"],
}