StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't use the same temp directory to uncompress dex" am: 9963b1af06

Browse Source 
am: 4adb37dc4e

Change-Id: Ic56126482827d08a0869d30b839fb08eb410870e
This commit is contained in:
Victor Hsieh
2018-02-09 07:38:40 +00:00
committed by android-build-merger
parent 416cf2d661 4adb37dc4e
commit 7850bb0060
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/definitions.mk
View File

@@ -2601,11 +2601,12 @@ endef
# #
define uncompress-dexs define uncompress-dexs
$(hide) if (zipinfo $@ '*.dex' 2>/dev/null | grep -v ' stor ' >/dev/null) ; then \ $(hide) if (zipinfo $@ '*.dex' 2>/dev/null | grep -v ' stor ' >/dev/null) ; then \
rm -rf $(dir $@)uncompresseddexs && mkdir $(dir $@)uncompresseddexs; \ tmpdir=$@.tmpdir; \
unzip -q $@ '*.dex' -d $(dir $@)uncompresseddexs && \ rm -rf $$tmpdir && mkdir $$tmpdir; \
unzip -q $@ '*.dex' -d $$tmpdir && \
zip -qd $@ '*.dex' && \ zip -qd $@ '*.dex' && \
( cd $(dir $@)uncompresseddexs && find . -type f | sort | zip -qD -X -0 ../$(notdir $@) -@ ) && \ ( cd $$tmpdir && find . -type f | sort | zip -qD -X -0 ../$(notdir $@) -@ ) && \
rm -rf $(dir $@)uncompresseddexs; \ rm -rf $$tmpdir; \
fi fi
endef endef