commit 95c7f58bb74a15f08a342db6ee84cb3a44e7e554
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 13 07:30:58 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 13 07:30:58 2019 +0000
tree 771ba50e3875f2c8865c18a6aed2fff69f601d82
parent 9f814c284f33b7e47851d0af64551e0798578c88
parent 89443aed80e794e7553b92743b8e7f110f75f9fb

Merge "Add an option not to install all VNDK libs"

target/product/gsi/Android.mk

diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
index 7953db0..eaaa051 100644
--- a/target/product/gsi/Android.mk
+++ b/target/product/gsi/Android.mk
@@ -100,11 +100,14 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := vndk_package
 LOCAL_REQUIRED_MODULES := \
-    $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \
-    $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \
     $(LLNDK_LIBRARIES) \
     llndk.libraries.txt \
     vndksp.libraries.txt
+ifneq ($(TARGET_SKIP_CURRENT_VNDK),true)
+LOCAL_REQUIRED_MODULES += \
+    $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \
+    $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES))
+endif
 include $(BUILD_PHONY_PACKAGE)
 
 include $(CLEAR_VARS)