From 92ca5545caa2577f85ad01d4ed10dc1c39e4ed74 Mon Sep 17 00:00:00 2001
From: Jooyung Han <jooyung@google.com>
Date: Mon, 5 Feb 2024 11:04:02 +0900
Subject: [PATCH] Install bluetooth audio VINTF fragment in apex

Previously, android.hardware.bluetooth.audio-impl was installed with no
use and the attached vintf was fulfilled by the
com.android.hardware.audio apex.

For cleanup, we no longer install android.hardware.bluetooth.audio-impl
separately (for cuttlefish) and install the VINTF inside the apex.

Bug: 312265159
Test: atest VtsHalBluetoothAudioTargetTest
Change-Id: I31e0ccd6a8c3c00565159f2be7fe3bf4d70e9ddf
---
 .../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 9c91e27220..a2feef3aae 100644
--- a/audio/aidl/default/apex/com.android.hardware.audio/Android.bp
+++ b/audio/aidl/default/apex/com.android.hardware.audio/Android.bp
@@ -45,6 +45,7 @@ apex {
     prebuilts: [
         "android.hardware.audio.service-aidl.example.rc",
         "android.hardware.audio.service-aidl.xml",
+        "android.hardware.bluetooth.audio.xml",
         "audio_effects_config.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,
+}