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

am: 0dd11dc0b5 Change-Id: I192316dd07972167e2d5e4a687e15f7f1611f0f8
2018-04-16 16:41:23 -07:00 · 2018-04-16 16:41:23 -07:00 · f88438aa37
parent f11f86f08d 0dd11dc0b5
commit f88438aa37
1 changed files with 3 additions and 0 deletions
--- a/core/main.mk
+++ b/core/main.mk
@ -900,6 +900,9 @@ ifdef FULL_BUILD
  # 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))