commit 5ec356acff6b57adf0980e8a32acf6cffb6e213c
author Roland Levillain <rpl@google.com> Mon Oct 28 17:48:23 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 28 17:48:23 2019 +0000
tree 4dc39f40470cbd3dacc21e2161623b2a434bbc23
parent 35815917ba3720c63fae30822d3da021751aa3ed
parent 7c39368927ca6226e6071a9f0613945ee0755268

Merge "Revert "Remove Core Library JARs from `/system/framework`.""

target/product/gsi/Android.mk

diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
index f9402cb..6c7c570 100644
--- a/target/product/gsi/Android.mk
+++ b/target/product/gsi/Android.mk
@@ -145,8 +145,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)
 
@@ -158,11 +157,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)