diff options
| author | Tri Vo <trong@google.com> | 2020-07-16 21:20:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-16 21:20:26 +0000 |
| commit | 4b2e1a8df47100934d14d9c5749ac2c8804c4f36 (patch) | |
| tree | c53f2baf45d96d4275fbffe409b705b14b1535ed | |
| parent | 05f592ee24ec36d2a1d840e9ebfa564561c8599e (diff) | |
| parent | 54190ed162827a85765a30f53725470d08eade70 (diff) | |
| download | device_generic_trusty-4b2e1a8df47100934d14d9c5749ac2c8804c4f36.tar.gz device_generic_trusty-4b2e1a8df47100934d14d9c5749ac2c8804c4f36.tar.bz2 device_generic_trusty-4b2e1a8df47100934d14d9c5749ac2c8804c4f36.zip | |
Enable BOARD_VNDK_VERSION := current am: 54190ed162
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1361113
Change-Id: I842e755d2f56b17f39931165d761a9fd9cc58d87
| -rw-r--r-- | BoardConfig.mk | 3 | ||||
| -rw-r--r-- | qemu_trusty_base.mk | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index d39346e..5d2a8ed 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -59,3 +59,6 @@ BOARD_BUILD_SYSTEM_ROOT_IMAGE := true # Specify HALs DEVICE_MANIFEST_FILE := device/generic/trusty/manifest.xml + +# Enable full VNDK support +BOARD_VNDK_VERSION := current diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk index ba0152e..24de79d 100644 --- a/qemu_trusty_base.mk +++ b/qemu_trusty_base.mk @@ -62,6 +62,16 @@ PRODUCT_PACKAGES += \ vendor_compatibility_matrix.xml \ vendor_manifest.xml \ +# Devices that inherit from build/make/target/product/base.mk always have +# /system/system_ext/etc/vintf/manifest.xml generated. And build-time VINTF +# checks assume that. Since we don't inherit from base.mk, add the dependency +# here manually. +PRODUCT_PACKAGES += \ + system_ext_manifest.xml \ + +# Skip VINTF checks for kernel configs +PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false + # Ensure boringssl NIAP check won't reboot us PRODUCT_PACKAGES += \ com.android.conscrypt \ |