Add all VINTF metadata for kernel-tests
It is not VINTF compatible, so also define
PRODUCT_ENFORCE_VINTF_MANIFEST:=false.
Add (system|vendor)_(compatibility_matrix|manifest).xml to PRODUCT_PACKAGES
so that check-vintf-all passes. All these files are required for devices on ToT.
Only VINTF metadata for system and vendor partitions are added because
it doesn't have other partitions.
Test: m check-vintf-all
Change-Id: I6edf525f26159d5855044d434f7ee0e56d04caac
diff --git a/kernel-tests/goldfish_kernel_tests_x86_64.mk b/kernel-tests/goldfish_kernel_tests_x86_64.mk
index 4071b5a..84bc73c 100644
--- a/kernel-tests/goldfish_kernel_tests_x86_64.mk
+++ b/kernel-tests/goldfish_kernel_tests_x86_64.mk
@@ -135,7 +135,6 @@
$(GOLDFISH_DIR)/ueventd.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
PRODUCT_COPY_FILES += \
- $(THIS_DIR)/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \
$(THIS_DIR)/init.ranchu-core.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-core.sh \
$(THIS_DIR)/init.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.ranchu.rc \
$(THIS_DIR)/fstab.ranchu:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \
@@ -150,3 +149,14 @@
PRODUCT_PROPERTY_OVERRIDES += \
ro.carrier=unknown
+
+DEVICE_MANIFEST_FILE += $(THIS_DIR)/manifest.xml
+# VINTF stuff for system and vendor (no product / odm / system_ext / etc.)
+PRODUCT_PACKAGES += \
+ system_compatibility_matrix.xml \
+ system_manifest.xml \
+ vendor_compatibility_matrix.xml \
+ vendor_manifest.xml \
+
+# Disable VINTF checks.
+PRODUCT_ENFORCE_VINTF_MANIFEST_OVERRIDE := false
diff --git a/kernel-tests/manifest.xml b/kernel-tests/manifest.xml
index 82ba6d1..1612508 100644
--- a/kernel-tests/manifest.xml
+++ b/kernel-tests/manifest.xml
@@ -25,7 +25,4 @@
<fqname>@1.1::ICryptoFactory/widevine</fqname>
<fqname>@1.1::IDrmFactory/widevine</fqname>
</hal>
- <sepolicy>
- <version>27.0</version>
- </sepolicy>
</manifest>
