From 0783ef75790fc2030ad90a699199bd5c477bbd9e Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Mon, 14 Aug 2017 10:28:00 +0900 Subject: [PATCH] vndk: Add vndk_pacakge to PRODUCT_PACKAGES vndk_pacakge includes vndk, vndk-sp and ll-ndk. By adding vndk_pacakge to PRODUCT_PACKAGES, vndk libraries will be built regardless of their dependency with other libs. The vndk library packages are defined only if they are built with BOARD_VNDK_VERSION=current. Bug: 63866913 Test: build with and without BOARD_VNDK_VERSION=current Change-Id: I2c5f11de30c87be16cbc661a8567e258ff511906 --- device.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device.mk b/device.mk index 0d174258..da93e3ef 100755 --- a/device.mk +++ b/device.mk @@ -532,6 +532,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.vndk.version=26.1.0 \ +# Once BOARD_VNDK_VERSION is defined, below packages will not be used PRODUCT_PACKAGES += \ android.hardware.renderscript@1.0.vndk-sp\ android.hardware.graphics.allocator@2.0.vndk-sp\ @@ -558,6 +559,9 @@ PRODUCT_PACKAGES += \ liblzma.vndk-sp\ libz.vndk-sp\ +# Include vndk/vndk-sp/ll-ndk modules +PRODUCT_PACKAGES += vndk_package + PRODUCT_ENFORCE_RRO_TARGETS := framework-res # Override heap growth limit due to high display density on device