From f75c0dd43d58ae756f3dc4342e735b0c3ea820aa Mon Sep 17 00:00:00 2001
From: Sandeep Vijayasekar <sandv@google.com>
Date: Thu, 20 Oct 2022 13:39:48 -0700
Subject: [PATCH] [AudioProxy] Enable AudioProxy

CP of go/ag/16674532

1. Enable AudioProxy service and client library.
2. AudioProxy service will implement the audio HAL, so add the audio
policy config file.
3. AudioProxy also has its own AIDL interface. Add the compatibility
matrix file for the new AIDL interface, and the audio HAL.

Bug: 197547824
Test: Build and local run
Change-Id: I9aa3dbced63f071bebade5de7d996655fe502295
---
 device-tangorpro.mk                           |  9 ++++++
 device_framework_matrix_product_tangorpro.xml | 29 +++++++++++++++++++
 public.libraries-google-tangorpro.txt         |  1 +
 3 files changed, 39 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 68398cc..a2478e2 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -220,3 +220,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..3974e7e
--- /dev/null
+++ b/device_framework_matrix_product_tangorpro.xml
@@ -0,0 +1,29 @@
+<compatibility-matrix version="1.0" type="framework" level="7">
+    <hal format="hidl">
+        <name>hardware.google.bluetooth.ccc</name>
+        <version>1.1</version>
+        <interface>
+            <name>IBluetoothCcc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <!-- AudioProxy -->
+    <hal format="aidl" optional="true">
+        <name>device.google.atv.audio_proxy</name>
+        <version>1</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