Added AAE specific device manifest to Cuttlefish
Bug: 111763661
Test: lunch cf_x86_auto-userdebug; make dist; launch cuttlefish and all
AAE specific HALs should be registered
Change-Id: I82beccb330cd2993f1e23a60e64ef11bf7c50ea4
Merged-In: I82beccb330cd2993f1e23a60e64ef11bf7c50ea4
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 536d32d..461d769 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -112,6 +112,9 @@
INIT_BOOTCHART := true
DEVICE_MANIFEST_FILE := device/google/cuttlefish/shared/config/manifest.xml
+ifneq (,$(filter cf_x86_auto cf_x86_64_auto aosp_x86_auto aosp_x86_64_auto, $(TARGET_PRODUCT)))
+DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/auto/manifest-extra.xml
+endif
# Need this so that the application's loop on reading input can be synchronized
# with HW VSYNC
diff --git a/shared/auto/device.mk b/shared/auto/device.mk
index 7d00f8d..da937be 100644
--- a/shared/auto/device.mk
+++ b/shared/auto/device.mk
@@ -44,6 +44,10 @@
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml
+# Broadcast Radio permissions
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.broadcastradio.xml:system/etc/permissions/android.hardware.broadcastradio.xml
+
PRODUCT_PROPERTY_OVERRIDES += \
android.car.hvac.demo=true
diff --git a/shared/auto/manifest-extra.xml b/shared/auto/manifest-extra.xml
new file mode 100644
index 0000000..fa5b698
--- /dev/null
+++ b/shared/auto/manifest-extra.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2018, The Android Open Source Project.
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** limitations under the License.
+*/
+-->
+<!-- Android Auto Embedded specific HALs-->
+<manifest version="1.0" type="device" target-level="1">
+ <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>
+ <hal format="hidl">
+ <name>android.hardware.automotive.vehicle</name>
+ <transport>hwbinder</transport>
+ <version>2.0</version>
+ <interface>
+ <name>IVehicle</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.broadcastradio</name>
+ <transport>hwbinder</transport>
+ <version>2.0</version>
+ <interface>
+ <name>IBroadcastRadio</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+</manifest>
