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

am: e22afd4998

Change-Id: Ied0d73ed404185b26fa69605b81beccdd8bad6ab
This commit is contained in:
Nan Zhang 2017-03-21 22:33:24 +00:00 committed by android-build-merger
commit b7ef9849c3

View file

@ -2167,7 +2167,7 @@ endif
@# 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