commit 0dd11dc0b5e1252cd30d8d018b91198bace7bf27
author Andrew Hsieh <andrewhsieh@google.com> Mon Apr 16 23:12:19 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 16 23:12:19 2018 +0000
tree 85e5009ced4c17502e92a7fd644616ccc0994e67
parent 30791d858fee690d9a37068229357b1fdb1ae0b8
parent 5364f5a298379e149f1db5035db759a62bcc0d5d

Merge "Enable vndk_package if BOARD_VNDK_VERSION is set" into pi-dev

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 5675f90..86b8a8f 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -891,6 +891,9 @@
   # by the appropriate product definition file, which was included
   # by product_config.mk.
   product_MODULES := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES)
+ifdef BOARD_VNDK_VERSION
+  product_MODULES += vndk_package
+endif
   # Filter out the overridden packages before doing expansion
   product_MODULES := $(filter-out $(foreach p, $(product_MODULES), \
       $(PACKAGES.$(p).OVERRIDES)), $(product_MODULES))