commit 6851a27604ca94bb909e635949b5b49b718ce90a
author Jooyung Han <jooyung@google.com> Fri Oct 18 16:16:38 2019 +0900
committer Jooyung Han <jooyung@google.com> Sat Oct 19 02:24:09 2019 +0900
tree 0f7d0c8b96598696e4875ef911e6217268334818
parent 8de0013551bc596d898d3d14bd6773e458e677ba

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

diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
index 2b288e6..93b0b15 100644
--- a/target/product/gsi/Android.mk
+++ b/target/product/gsi/Android.mk
@@ -154,7 +154,8 @@
     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 @@
 _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)