summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2020-02-05 16:18:09 +0900
committer Jooyung Han <jooyung@google.com> 2020-02-05 16:18:09 +0900
commitce01a3b0146f6e8010cd89bb50f2f88fcf86a48e (patch)
tree5a6bd590d2086e64b74e88df6f2e1596f982f903
parent65e9798709c645078b61da9ab527c1b0c7d2d1e1 (diff)
Install VNDK_USING_CORE_VARIANT_LIBRARIES
With TARGET_VNDK_USE_CORE_VARIANT := true, some VNDK libraries are not installed and instead system variants are used at runtime. When building system only, VNDK_USING_CORE_VARIANT_LIBRARIES are not installed under /system because there is no dependency to trigger installing. (By definition, /vendor modules depends on vndk libs) Bug: 148803529 Test: lunch aosp_cf_x86_go_phone-userdebug m systemimage # should install vndk libraries of core variant Change-Id: Ied4347969955491b13dc674f2e8453d76592d1d7
-rw-r--r--target/product/gsi/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
index 4f2027f5d6..bd8450bd7e 100644
--- a/target/product/gsi/Android.mk
+++ b/target/product/gsi/Android.mk
@@ -163,6 +163,7 @@ LOCAL_REQUIRED_MODULES += \
vndkcorevariant.libraries.txt \
$(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \
$(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \
+ $(VNDK_USING_CORE_VARIANT_LIBRARIES) \
com.android.vndk.current
endif
include $(BUILD_PHONY_PACKAGE)