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

Commit 7aecf33e authored by Victor Hsieh's avatar Victor Hsieh
Browse files

Don't use the same temp directory to uncompress dex 

This was ok for apk because they are in different parent directory.

Test: marlin built
Bug: 63920015
Bug: 30972906
Change-Id: I5ed00824fda9e7e0a99c825402753c21a06ba6c5
parent b5751e4b

core/definitions.mk

+5 −4
Original line number Diff line number Diff line
@@ -2601,11 +2601,12 @@ endef 
#

define uncompress-dexs

$(hide) if (zipinfo $@ '*.dex' 2>/dev/null | grep -v ' stor ' >/dev/null) ; then \

  rm -rf $(dir $@)uncompresseddexs && mkdir $(dir $@)uncompresseddexs; \

  unzip -q $@ '*.dex' -d $(dir $@)uncompresseddexs && \

  tmpdir=$@.tmpdir; \

  rm -rf $$tmpdir && mkdir $$tmpdir; \

  unzip -q $@ '*.dex' -d $$tmpdir && \

  zip -qd $@ '*.dex' && \

  ( cd $(dir $@)uncompresseddexs && find . -type f | sort | zip -qD -X -0 ../$(notdir $@) -@ ) && \

  rm -rf $(dir $@)uncompresseddexs; \

  ( cd $$tmpdir && find . -type f | sort | zip -qD -X -0 ../$(notdir $@) -@ ) && \

  rm -rf $$tmpdir; \

  fi

endef