From 172c8e6de0b02135bf7755c73b41c096c1a1cbc0 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Wed, 25 Sep 2019 18:24:53 +0900 Subject: [PATCH] install VNDK APEX instead of VNDK libs VNDK APEX replaces VNDK libs under /system/libs/vndk[-sp]. For current VNDK (vndk_package), com.android.vndk.current APEX is installed instead of VNDK libraries. For older versions of VNDK (vndk_snapshot_package), com.android.vndk.v## APEXes are installed along with prebuilt VNDK libs. The reason why phony targets of VNDK prebuilts are still installed is that phony targets install the required *.libraries.##.txt files to /system/etc. After those .txt files are moved to APEXes, then we can remove those phony targets.(b/141450808) Bug: 141451661 Test: m && boot (tested with cuttlefish) Change-Id: Ibfa06d42ec0081fa7010091ef097bb940bacf8d6 --- 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 2b288e6b2..93b0b150a 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)