Merge "Place the META/ dir first in the target_files.zip." am: 2857b7a3d7
am: 95b0f7d3cc
* commit '95b0f7d3ccfc10659a0c6ac1eaed18284b4e9b55':
Place the META/ dir first in the target_files.zip.
diff --git a/core/Makefile b/core/Makefile
index e444cda..d58fac4 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1724,8 +1724,11 @@
@# 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