commit a13b3153c151d03f58ab1a6d0914eea2883b118f
author Isaac Chen <ycchen@google.com> Thu Apr 12 17:56:59 2018 +0800
committer Isaac Chen <ycchen@google.com> Tue Apr 24 10:07:10 2018 +0800
tree 5bb4c692116a8958f8844eb509f2392245d09f36
parent f4b893165d72e62353b1328c82b9b77fa0076e87

Enable vndk_package if BOARD_VNDK_VERSION is set

This is a first attempt to enable build system support to include
vndk_package automatically (if BOARD_VNDK_VERSION is set), so devices
don't need to add it via PRODUCT_PACKAGE manually.

Bug: b/67002788
Test: Booted on the x86 emulator and a physical device and checked
      their /system/lib*/vndk-* directories for vndk_package libraries.
    # The commands below are for the x86 emulator:
    $ lunch aosp_x86_64-userdebug; m -j
Change-Id: Iea927b9535c7ee1b64ca130a4ac54f0fd8b3f758
Merged-In: Iea927b9535c7ee1b64ca130a4ac54f0fd8b3f758
(cherry picked from commit 5364f5a298379e149f1db5035db759a62bcc0d5d)

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 16e70eb..2ef17a2 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -898,6 +898,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))