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

Commit 01283297 authored by Alex Deymo's avatar Alex Deymo Committed by android-build-merger
Browse files

Merge "Place the META/ dir first in the target_files.zip." am: 2857b7a3 

am: 95b0f7d3

* commit '95b0f7d3':
  Place the META/ dir first in the target_files.zip.
parents 39f1d880 95b0f7d3

core/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -1724,8 +1724,11 @@ ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true) 
	@# If breakpad symbols have been generated, add them to the zip.

	$(hide) $(ACP) -r $(TARGET_OUT_BREAKPAD) $(zip_root)/BREAKPAD

endif

	@# Zip everything up, preserving symlinks

	$(hide) (cd $(zip_root) && zip -qryX ../$(notdir $@) .)

	@# Zip everything up, preserving symlinks and placing META/ files first to

	@# help early validation of the .zip file while uploading it.

	$(hide) (cd $(zip_root) && \

	        zip -qryX ../$(notdir $@) ./META && \

	        zip -qryXu ../$(notdir $@) .)

	@# Run fs_config on all the system, vendor, boot ramdisk,

	@# and recovery ramdisk files in the zip, and save the output

	$(hide) zipinfo -1 $@ | awk 'BEGIN { FS="SYSTEM/" } /^SYSTEM\// {print "system/" $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -C -D $(TARGET_OUT) -S $(SELINUX_FC) > $(zip_root)/META/filesystem_config.txt