diff options
| author | Yifan Hong <elsk@google.com> | 2020-01-15 21:04:17 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2020-01-15 21:04:17 -0800 |
| commit | a5317f9ce324790110abf76ac27d45c4ba3948d3 (patch) | |
| tree | a19ddd2d9fdd99dcf4a055c25b65a349bfa4b809 | |
| parent | d6c7868eae9a5e477332d649c08f7ff3c5efb8ef (diff) | |
| parent | 3800dbdda7f4bdee7a2b955a6718a8c815ed4910 (diff) | |
| download | device_generic_trusty-a5317f9ce324790110abf76ac27d45c4ba3948d3.tar.gz device_generic_trusty-a5317f9ce324790110abf76ac27d45c4ba3948d3.tar.bz2 device_generic_trusty-a5317f9ce324790110abf76ac27d45c4ba3948d3.zip | |
Merge "qemu_trusty: Fix VINTF file inclusion."
am: 3800dbdda7
Change-Id: I7c720600183a601a0801fbcb2d63a14fbb096433
| -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 \ |