From bdf28f7a1de744bae6cbedabff24bb18d4722f04 Mon Sep 17 00:00:00 2001
From: Sandeep Vijayasekar <sandv@google.com>
Date: Thu, 8 Dec 2022 21:18:24 +0000
Subject: [PATCH] Revert "Revert "[AudioProxy] Enable AudioProxy""

This reverts commit 40e6ca666b02c6ea37ad648f599bbf33108409ed.

Reason for revert:
fix breakage with the following changes:
1. Bump AudioProxy version to 3
2. Remove IBluetoothCcc as it's already covered by another file.

Bug: 197547824
Test: CQ

Change-Id: Ia62aaa17e94a426390e120cc0d811b67cf5739ae
(cherry picked from commit 67442466d3f63815d65391dc75a0db98ff81f4f2)
---
 device-tangorpro.mk                           |  9 ++++++++
 device_framework_matrix_product_tangorpro.xml | 21 +++++++++++++++++++
 public.libraries-google-tangorpro.txt         |  1 +
 3 files changed, 31 insertions(+)
 create mode 100644 device_framework_matrix_product_tangorpro.xml
 create mode 100644 public.libraries-google-tangorpro.txt

diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 06f15cb..b60c704 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -227,3 +227,12 @@ PRODUCT_SYSTEM_PROPERTIES += ro.odm.cast.ssid_suffix=ynn
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.camera.extended_launch_boost=1 \
     persist.vendor.camera.raise_buf_allocation_priority=1
+# AudioProxy
+PRODUCT_PACKAGES += \
+    libaudio_proxy.google \
+    device.google.atv.audio_proxy@7.1-service
+
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := device/google/tangorpro/device_framework_matrix_product_tangorpro.xml
+
+PRODUCT_COPY_FILES += \
+    device/google/tangorpro/public.libraries-google-tangorpro.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/public.libraries-google.txt
diff --git a/device_framework_matrix_product_tangorpro.xml b/device_framework_matrix_product_tangorpro.xml
new file mode 100644
index 0000000..86fe457
--- /dev/null
+++ b/device_framework_matrix_product_tangorpro.xml
@@ -0,0 +1,21 @@
+<compatibility-matrix version="1.0" type="framework" level="7">
+    <!-- AudioProxy -->
+    <hal format="aidl" optional="true">
+        <name>device.google.atv.audio_proxy</name>
+        <version>3</version>
+        <interface>
+            <name>IAudioProxy</name>
+            <instance>mediashell</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.audio</name>
+        <transport>hwbinder</transport>
+        <version>7.1</version>
+        <interface>
+            <name>IDevicesFactory</name>
+            <instance>mediashell</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>
+
diff --git a/public.libraries-google-tangorpro.txt b/public.libraries-google-tangorpro.txt
new file mode 100644
index 0000000..2a2d2fe
--- /dev/null
+++ b/public.libraries-google-tangorpro.txt
@@ -0,0 +1 @@
+libaudio_proxy.google.so