commit 881724824dc2a9acbc7e09293a5fc71716b567f4
author Jooyung Han <jooyung@google.com> Wed Oct 16 22:37:30 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Oct 17 13:03:17 2019 +0000
tree a128eacdcbaccf4cbe10900238ce661ddb7d2e96
parent 77861b3dd055b4631f71a9f9fbf998d9ddc2e028

Revert "install VNDK APEX instead of VNDK libs"

This reverts commit 172c8e6de0b02135bf7755c73b41c096c1a1cbc0.

Reason for revert: some targets are broken

Bug: 142773030
Change-Id: Ic35b19c7973946658365ecd7de4846f3175054b5
(cherry picked from commit 376c6130856b8a009fb8bce7917a463ca0f7cdfc)

target/product/gsi/Android.mk

diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
index 93b0b15..2b288e6 100644
--- a/target/product/gsi/Android.mk
+++ b/target/product/gsi/Android.mk
@@ -154,8 +154,7 @@
     vndkprivate.libraries.txt \
     vndkcorevariant.libraries.txt \
     $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \
-    $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \
-    com.android.vndk.current
+    $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES))
 endif
 include $(BUILD_PHONY_PACKAGE)
 
@@ -167,11 +166,8 @@
 _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)