From 6851a27604ca94bb909e635949b5b49b718ce90a Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Fri, 18 Oct 2019 16:16:38 +0900 Subject: [PATCH] Revert "Revert "install VNDK APEX instead of VNDK libs"" This reverts commit 376c6130856b8a009fb8bce7917a463ca0f7cdfc. Bug: 141451661 Test: m && boot (tested with cuttlefish) --- target/product/gsi/Android.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk index 2b288e6b24..93b0b150a6 100644 --- a/target/product/gsi/Android.mk +++ b/target/product/gsi/Android.mk @@ -154,7 +154,8 @@ LOCAL_REQUIRED_MODULES += \ vndkprivate.libraries.txt \ vndkcorevariant.libraries.txt \ $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \ - $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) + $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \ + com.android.vndk.current endif include $(BUILD_PHONY_PACKAGE) @@ -166,8 +167,11 @@ ifneq ($(TARGET_IS_64_BIT),true) _binder32 := _binder32 endif endif +# Phony targets are installed for **.libraries.txt files. +# TODO(b/141450808): remove following VNDK phony targets when **.libraries.txt files are provided by apexes. LOCAL_REQUIRED_MODULES := \ $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),vndk_v$(vndk_ver)_$(TARGET_ARCH)$(_binder32)) +LOCAL_REQUIRED_MODULES += $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),com.android.vndk.v$(vndk_ver)) _binder32 := include $(BUILD_PHONY_PACKAGE)