commit 5d07df98bb072a357d69080755a4c054fbeddd4e
author Yifan Hong <elsk@google.com> Tue Jan 14 13:08:15 2020 -0800
committer Yifan Hong <elsk@google.com> Tue Jan 14 14:26:37 2020 -0800
tree cf3926d8881ad766321391b8fd89344e0c41dbe4
parent 21d269e7686b0b907ab4eb3e261555aed96593f1

qemu_trusty: Fix VINTF file inclusion.

Include (system|vendor)_(compatibility_matrix|manifest).xml in
PRODUCT_PACKAGES. It does not have product / odm / system_ext, so
(device|framework)_(compatibility_matrix|manifest).xml is not used.

Test: m check-vintf-all
Change-Id: Iaf6f7929b1a1e135a53165f5cb2ce2cf48edc05f

qemu_trusty_base.mk

diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk
index 38e4c4d..7fa7448 100644
--- a/qemu_trusty_base.mk
+++ b/qemu_trusty_base.mk
@@ -21,8 +21,6 @@
 PRODUCT_PACKAGES += \
     com.android.adbd \
     android.hidl.allocator@1.0-service \
-    system_manifest.xml \
-    framework_manifest.xml \
     apexd \
     com.android.art \
     com.android.i18n \
@@ -52,6 +50,13 @@
     vndservicemanager \
     vold \
 
+# 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 \
+
 # Ensure boringssl NIAP check won't reboot us
 PRODUCT_PACKAGES += \
     com.android.conscrypt \