Merge changes from topic "Fixing CF Auto audiocontrol" into rvc-dev
* changes:
Updating to audiocontrol@2.0
Including default implementation of audiocontrol@1.0
diff --git a/shared/auto/device.mk b/shared/auto/device.mk
index 9b7c05a..0e6912c 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@2.0-service
+endif
+PRODUCT_PACKAGES += $(LOCAL_AUDIOCONTROL_HAL_PRODUCT_PACKAGE)
+
# DRM HAL
PRODUCT_PACKAGES += android.hardware.drm@1.3-service.clearkey
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>