Fix goldfish manifest handling.
Copying in the manifest file breaks vintf_fragment based manifest
generation. This patch specifies the manifest.xml file using
the build system variable rather then copying it over the generated
file.
Shout out to mmaurer@google.com for finding this.
Test: Builds without conflict and produces the correct manifest.xml
Bug: 135280519
Change-Id: Icb9bae2336e11fe5b1fda532adbee500b2d8dbaf
Merged-In: Icb9bae2336e11fe5b1fda532adbee500b2d8dbaf
diff --git a/arm32-vendor.mk b/arm32-vendor.mk
index 953ff2a..a1bb772 100644
--- a/arm32-vendor.mk
+++ b/arm32-vendor.mk
@@ -2,12 +2,13 @@
PRODUCT_PROPERTY_OVERRIDES += \
vendor.rild.libpath=/vendor/lib/libgoldfish-ril.so
+DEVICE_MANIFEST_FILE := device/generic/goldfish/manifest-arm.xml
+
# Note: the following lines need to stay at the beginning so that it can
# take priority and override the rules it inherit from other mk files
# see copy file rules in core/Makefile
PRODUCT_COPY_FILES += \
device/generic/goldfish/fstab.ranchu.initrd.arm:$(TARGET_COPY_OUT_RAMDISK)/fstab.ranchu \
- device/generic/goldfish/manifest-arm.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \
prebuilts/qemu-kernel/arm64/4.4/kernel-qemu2:kernel-ranchu-64 \
device/generic/goldfish/data/etc/advancedFeatures.ini.arm:advancedFeatures.ini \
device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu
diff --git a/arm64-vendor.mk b/arm64-vendor.mk
index 647aea3..12100c8 100644
--- a/arm64-vendor.mk
+++ b/arm64-vendor.mk
@@ -2,12 +2,13 @@
PRODUCT_PROPERTY_OVERRIDES += \
vendor.rild.libpath=/vendor/lib64/libgoldfish-ril.so
+DEVICE_MANIFEST_FILE := device/generic/goldfish/manifest-arm.xml
+
# Note: the following lines need to stay at the beginning so that it can
# take priority and override the rules it inherit from other mk files
# see copy file rules in core/Makefile
PRODUCT_COPY_FILES += \
device/generic/goldfish/fstab.ranchu.initrd.arm:$(TARGET_COPY_OUT_RAMDISK)/fstab.ranchu \
- device/generic/goldfish/manifest-arm.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \
prebuilts/qemu-kernel/arm64/4.4/kernel-qemu2:kernel-ranchu \
device/generic/goldfish/data/etc/advancedFeatures.ini.arm:advancedFeatures.ini \
device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu
diff --git a/manifest-arm.xml b/manifest-arm.xml
index 26d4b3d..825df43 100644
--- a/manifest-arm.xml
+++ b/manifest-arm.xml
@@ -125,15 +125,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>
diff --git a/vendor.mk b/vendor.mk
index 57129ea..15608c3 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -139,6 +139,7 @@
PRODUCT_COPY_FILES += \
device/generic/goldfish/data/etc/permissions/privapp-permissions-goldfish.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-goldfish.xml
+DEVICE_MANIFEST_FILE := device/generic/goldfish/manifest.xml
PRODUCT_COPY_FILES += \
device/generic/goldfish/fstab.ranchu.initrd:$(TARGET_COPY_OUT_RAMDISK)/fstab.ranchu \
@@ -150,7 +151,6 @@
device/generic/goldfish/fstab.ranchu:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \
device/generic/goldfish/ueventd.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
device/generic/goldfish/input/goldfish_rotary.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/goldfish_rotary.idc \
- device/generic/goldfish/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \
device/generic/goldfish/data/etc/config.ini:config.ini \
device/generic/goldfish/wifi/simulated_hostapd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/simulated_hostapd.conf \
device/generic/goldfish/wifi/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \
