diff options
| author | Tri Vo <trong@google.com> | 2020-07-14 17:41:30 -0700 |
|---|---|---|
| committer | Tri Vo <trong@google.com> | 2020-07-16 12:17:43 -0700 |
| commit | 54190ed162827a85765a30f53725470d08eade70 (patch) | |
| tree | c53f2baf45d96d4275fbffe409b705b14b1535ed | |
| parent | 739031d0546da17b860b816a3acbcc560780b59c (diff) | |
| download | device_generic_trusty-54190ed162827a85765a30f53725470d08eade70.tar.gz device_generic_trusty-54190ed162827a85765a30f53725470d08eade70.tar.bz2 device_generic_trusty-54190ed162827a85765a30f53725470d08eade70.zip | |
Enable BOARD_VNDK_VERSION := current
If BOARD_VNDK_VERSION is unset, ro.vndk.lite property is set.
linkerconfig refuses to work with ro.vndk.lite set b/153944540.
Without generated /linkerconfig/* files, APEX modules will fail to
start, specifically com.android.adbd, without which Trusty emulator
fails boot tests.
Bug: 160016500
Bug: 161405162
Test: build & boot
Change-Id: Ie3f72b7f35c62dc305b3547830ad8faccdef3991
| -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 \ |