aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2019-10-21 18:29:04 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-10-21 18:29:04 +0000
commit371e3c3b6cb9ed18aae3fcfd6c4d67494f404c51 (patch)
tree4a4d92bf7db61712abf21d03ad5149daac40c944
parentaa1c6bb4b33b3d62345dd1d24e65e336cde50b9b (diff)
parent289b002427f2145ca9d4aec9dc6e9dd3a951218b (diff)
downloadbuild-371e3c3b6cb9ed18aae3fcfd6c4d67494f404c51.tar.gz
Merge "Delete VINTF files from target files package."
-rw-r--r--core/Makefile14
1 files changed, 0 insertions, 14 deletions
diff --git a/core/Makefile b/core/Makefile
index 47d163ec9e..1b4a0dadf6 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4241,10 +4241,6 @@ $(BUILT_TARGET_FILES_PACKAGE): \
$(HOST_OUT_EXECUTABLES)/fs_config \
$(ADD_IMG_TO_TARGET_FILES) \
$(MAKE_RECOVERY_PATCH) \
- $(BUILT_ASSEMBLED_FRAMEWORK_MANIFEST) \
- $(BUILT_ASSEMBLED_VENDOR_MANIFEST) \
- $(BUILT_SYSTEM_MATRIX) \
- $(BUILT_VENDOR_MATRIX) \
$(BUILT_KERNEL_CONFIGS_FILE) \
$(BUILT_KERNEL_VERSION_FILE) \
| $(ACP)
@@ -4507,16 +4503,6 @@ ifdef BUILDING_SYSTEM_OTHER_IMAGE
$(hide) $(call fs_config,$(zip_root)/SYSTEM_OTHER,system/) > $(zip_root)/META/system_other_filesystem_config.txt
endif
@# Metadata for compatibility verification.
- $(hide) cp $(BUILT_SYSTEM_MATRIX) $(zip_root)/META/system_matrix.xml
-ifdef BUILT_ASSEMBLED_FRAMEWORK_MANIFEST
- $(hide) cp $(BUILT_ASSEMBLED_FRAMEWORK_MANIFEST) $(zip_root)/META/system_manifest.xml
-endif
-ifdef BUILT_ASSEMBLED_VENDOR_MANIFEST
- $(hide) cp $(BUILT_ASSEMBLED_VENDOR_MANIFEST) $(zip_root)/META/vendor_manifest.xml
-endif
-ifdef BUILT_VENDOR_MATRIX
- $(hide) cp $(BUILT_VENDOR_MATRIX) $(zip_root)/META/vendor_matrix.xml
-endif
ifdef BUILT_KERNEL_CONFIGS_FILE
$(hide) cp $(BUILT_KERNEL_CONFIGS_FILE) $(zip_root)/META/kernel_configs.txt
endif