commit e22afd49980e632ad34ee27ca68666fbd49951e6
author Nan Zhang <nanzhang@google.com> Tue Mar 21 22:24:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 21 22:24:52 2017 +0000
tree 405d2803f9b70235e39f7d2c7f3c121747a9f6f6
parent 235e3426390c469151fee969ad2b88fcee7a5b15
parent 8b6458e9a966c7c1d65f482c15e1620e2f1b7ca3

Merge "Fixed the issue that dirname: META got zipped twice."
am: 8b6458e9a9

Change-Id: Idd8eb1727778c52a8abea497477e3999c3d9706d

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index ab88b90..5b31e73 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2161,7 +2161,7 @@
 	@# Zip everything up, preserving symlinks and placing META/ files first to
 	@# help early validation of the .zip file while uploading it.
 	$(hide) find $(zip_root)/META | sort >$@.list
-	$(hide) find $(zip_root) | grep -v "^$(zip_root)/META/" | sort >>$@.list
+	$(hide) find $(zip_root) -path $(zip_root)/META -prune -o -print | sort >>$@.list
 	$(hide) $(SOONG_ZIP) -d -o $@ -C $(zip_root) -l $@.list
 
 .PHONY: target-files-package