Fix the car emulator.
-Sync with the goldfish manifest.
-Use DEVICE_MANIFEST_FILE to specify manifest.
bug: 135458450
Test: lunch gcar_hl_emu_x86-userdebug && m && emulator
Change-Id: I18ac986ebc4b799c4a5fdc8541f4af471606d684
(cherry picked from commit 809f8b88914b9e907b019bd16b04215f2ee370cf)
Merged-In: I18ac986ebc4b799c4a5fdc8541f4af471606d684
diff --git a/common/car.mk b/common/car.mk
index de0250a..509694f 100644
--- a/common/car.mk
+++ b/common/car.mk
@@ -60,9 +60,7 @@
device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
device/sample/etc/old-apns-conf.xml:system/etc/old-apns-conf.xml
-# Vendor Interface Manifest
-PRODUCT_COPY_FILES += \
- device/generic/car/common/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml
+DEVICE_MANIFEST_FILE := device/generic/car/common/manifest.xml
# Car emulator specific sepolicy
BOARD_SEPOLICY_DIRS += \
diff --git a/common/manifest.xml b/common/manifest.xml
index 1f31cac..403812b 100644
--- a/common/manifest.xml
+++ b/common/manifest.xml
@@ -146,15 +146,6 @@
</interface>
</hal>
<hal format="hidl">
- <name>android.hardware.gatekeeper</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IGatekeeper</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.gnss</name>
<transport>hwbinder</transport>
<version>1.0</version>
@@ -230,15 +221,6 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>android.hardware.thermal</name>
- <transport>hwbinder</transport>
- <version>2.0</version>
- <interface>
- <name>IThermal</name>
- <instance>default</instance>
- </interface>
- </hal>
<!-- Added for automotive -->
<hal format="hidl">
<name>android.hardware.automotive.audiocontrol</name>
