From 289b002427f2145ca9d4aec9dc6e9dd3a951218b Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Thu, 17 Oct 2019 23:41:19 +0000 Subject: [PATCH] Delete VINTF files from target files package. This relands "Check VINTF compatibility at OTA generation time." This reverts commit 948b259b52f2a923b2506d8b6804293e43c68817. Reason for revert: blueline_mainline_mixed fixed now Change-Id: Ib42f7183adb1e6f98692bdfbc73c2619227e646d Fixes: 131425279 Test: builds --- core/Makefile | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/core/Makefile b/core/Makefile index 30a46c2f9..5ae99b7a3 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4011,10 +4011,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) @@ -4255,16 +4251,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