From ddf9a00823451dede08e2f39b53463347b5b0d43 Mon Sep 17 00:00:00 2001
From: Myles Watson <mylesgw@google.com>
Date: Tue, 5 Mar 2024 22:06:38 +0000
Subject: [PATCH] Revert^4 "Install bluetooth audio VINTF fragment in apex"

886bfbed7ade60948d7d401b1a81152a9f8b3a49

Change-Id: I963bf18d58152fef685fefb2413d2eb7116a3cdb
---
 .../default/apex/com.android.hardware.audio/Android.bp     | 1 +
 bluetooth/audio/aidl/default/Android.bp                    | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/audio/aidl/default/apex/com.android.hardware.audio/Android.bp b/audio/aidl/default/apex/com.android.hardware.audio/Android.bp
index ee7e46edce..ee92512671 100644
--- a/audio/aidl/default/apex/com.android.hardware.audio/Android.bp
+++ b/audio/aidl/default/apex/com.android.hardware.audio/Android.bp
@@ -46,5 +46,6 @@ apex {
     prebuilts: [
         "android.hardware.audio.service-aidl.example.rc",
         "android.hardware.audio.service-aidl.xml",
+        "android.hardware.bluetooth.audio.xml",
     ],
 }
diff --git a/bluetooth/audio/aidl/default/Android.bp b/bluetooth/audio/aidl/default/Android.bp
index 69db1b3e38..af6bf86ddf 100644
--- a/bluetooth/audio/aidl/default/Android.bp
+++ b/bluetooth/audio/aidl/default/Android.bp
@@ -40,3 +40,10 @@ cc_library_shared {
         "libbluetooth_audio_session_aidl",
     ],
 }
+
+prebuilt_etc {
+    name: "android.hardware.bluetooth.audio.xml",
+    src: "bluetooth_audio.xml",
+    sub_dir: "vintf",
+    installable: false,
+}