diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-16 05:28:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-16 05:28:06 +0000 |
| commit | 1a77656657502877f6fa982f02d948d9b21e36c2 (patch) | |
| tree | 8190d4505683ccb2a45f8dada2a0aebd11b1bf01 | |
| parent | 849993d8a4decc232dfaa003f75a9a91a7b519e0 (diff) | |
| parent | 62a3a5ca41820537f06b67fd9827832205381a60 (diff) | |
| download | device_generic_trusty-1a77656657502877f6fa982f02d948d9b21e36c2.tar.gz device_generic_trusty-1a77656657502877f6fa982f02d948d9b21e36c2.tar.bz2 device_generic_trusty-1a77656657502877f6fa982f02d948d9b21e36c2.zip | |
Merge "qemu_trusty: Fix VINTF file inclusion." am: 3800dbdda7 am: a5317f9ce3 am: 62a3a5ca41
Change-Id: I67b66175185b3f6b49d10d375d1b5fcb9d4d5eb4
| -rw-r--r-- | qemu_trusty_base.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk index de5d125..5c6e63e 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 @@ PRODUCT_PACKAGES += \ 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 \ |