From 93cb9b5b3150f2d92719241f0fa7d3a94b5ccc8c Mon Sep 17 00:00:00 2001
From: Jooyung Han <jooyung@google.com>
Date: Sat, 7 Mar 2020 02:32:48 +0900
Subject: [PATCH] Remove vnd*.libraries.txt from /system/etc

These files are moved to VNDK APEX.

Bug: 145184886
Test: bulid && boot
Change-Id: I85ab025e1ad490ee7704e4219c5ee611c83ca429
---
 target/product/gsi/Android.mk  | 19 -------------------
 target/product/media_system.mk |  1 -
 2 files changed, 20 deletions(-)

diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
index cf0d5c73c4..c491d4a593 100644
--- a/target/product/gsi/Android.mk
+++ b/target/product/gsi/Android.mk
@@ -156,10 +156,6 @@ LOCAL_REQUIRED_MODULES := \
 
 ifneq ($(TARGET_SKIP_CURRENT_VNDK),true)
 LOCAL_REQUIRED_MODULES += \
-    llndk.libraries.txt \
-    vndksp.libraries.txt \
-    vndkcore.libraries.txt \
-    vndkprivate.libraries.txt \
     vndkcorevariant.libraries.txt \
     $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \
     $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \
@@ -169,25 +165,10 @@ endif
 include $(BUILD_PHONY_PACKAGE)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := vndk_snapshot_package
-_binder32 :=
-ifneq ($(TARGET_USES_64_BIT_BINDER),true)
-ifneq ($(TARGET_IS_64_BIT),true)
-_binder32 := _binder32
-endif
-endif
 _vndk_versions := $(PRODUCT_EXTRA_VNDK_VERSIONS)
 ifneq ($(BOARD_VNDK_VERSION),current)
 	_vndk_versions += $(BOARD_VNDK_VERSION)
 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,$(_vndk_versions),vndk_v$(vndk_ver)_$(TARGET_ARCH)$(_binder32))
-_binder32 :=
-include $(BUILD_PHONY_PACKAGE)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := vndk_apex_snapshot_package
 LOCAL_REQUIRED_MODULES := $(foreach vndk_ver,$(_vndk_versions),com.android.vndk.v$(vndk_ver))
 include $(BUILD_PHONY_PACKAGE)
diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 5174ec3453..5749ed5db9 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -36,7 +36,6 @@ PRODUCT_PACKAGES += \
     make_f2fs \
     requestsync \
     StatementService \
-    vndk_snapshot_package \
 
 PRODUCT_HOST_PACKAGES += \
     fsck.f2fs \