Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e09b7867 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "Delete VINTF files from target files package." am: 371e3c3b am: 9d97d8eb am: fa1a9a20 

am: 6171f69d

Change-Id: I8045f40275e16ffce0e12bde2253aa9c709a8446
parents 692b6ebf 6171f69d

core/Makefile

+0 −14
Original line number Diff line number Diff line
@@ -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