commit 0598b68e819ce71d934c893d893f87422b265418
author Hayden Gomes <haydengomes@google.com> Tue Apr 28 14:02:40 2020 -0700
committer Hayden Gomes <haydengomes@google.com> Wed Apr 29 10:54:56 2020 -0700
tree e9345546583fa6c7aab0affa74c9fc276828ed7f
parent a33a7a957442dd6cfbaef0a762f28797b79fdb2d

Including default implementation of audiocontrol@1.0

- Add audiocontrol@1.0 to PRODUCT_PACKAGES
- Removing from manifest as the default HAL uses vintf manifest fragment

Bug: 155199117
Test: make and adjust fade/volume
Change-Id: Ib9b464a6b444fb6d1713558f46e2eba7f87061bb
Merged-In: Ib9b464a6b444fb6d1713558f46e2eba7f87061bb

shared/auto/device.mk

diff --git a/shared/auto/device.mk b/shared/auto/device.mk
index 9b7c05a..10d8453 100644
--- a/shared/auto/device.mk
+++ b/shared/auto/device.mk
@@ -65,6 +65,12 @@
 # Broadcast Radio
 PRODUCT_PACKAGES += android.hardware.broadcastradio@2.0-service
 
+# AudioControl HAL
+ifeq ($(LOCAL_AUDIOCONTROL_HAL_PRODUCT_PACKAGE),)
+    LOCAL_AUDIOCONTROL_HAL_PRODUCT_PACKAGE := android.hardware.automotive.audiocontrol@1.0-service
+endif
+PRODUCT_PACKAGES += $(LOCAL_AUDIOCONTROL_HAL_PRODUCT_PACKAGE)
+
 # DRM HAL
 PRODUCT_PACKAGES += android.hardware.drm@1.3-service.clearkey
 

shared/auto/manifest.xml

diff --git a/shared/auto/manifest.xml b/shared/auto/manifest.xml
index 2c1361e..d115dbd 100644
--- a/shared/auto/manifest.xml
+++ b/shared/auto/manifest.xml
@@ -10,15 +10,6 @@
 -->
 <!-- Android Auto Embedded specific HALs-->
 <manifest version="1.0" type="device" target-level="5">
-    <hal format="hidl">
-        <name>android.hardware.automotive.audiocontrol</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IAudioControl</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <!-- FIXME: Implement automotive.evs HAL
     <hal format="hidl">
         <name>android.hardware.automotive.evs</name>