commit 49448d5bc5479dbddbc1e64c4c2be293e81457cd
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 14 05:59:32 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 14 05:59:32 2018 +0000
tree 1cf6fe1ca1185313aeabdd5d8b5d77f2caecde03
parent 7732b434e933f9ddf0e40994ca592acbf0b6158a
parent 9eaeb56c246ac8b0ba0c305ba2e88d98d09b9225

Merge "Create directories before unzipping dexpreopt zip"

core/dex_preopt_odex_install.mk

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index d1fb4e8..097f84a 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -253,7 +253,7 @@
     LOCAL_POST_INSTALL_CMD += &&
   endif
 
-  LOCAL_POST_INSTALL_CMD += unzip -qo -d $(PRODUCT_OUT) $(my_dexpreopt_zip)
+  LOCAL_POST_INSTALL_CMD += for i in $$(zipinfo -1 $(my_dexpreopt_zip)); do mkdir -p $$(dirname $$i); done && unzip -qo -d $(PRODUCT_OUT) $(my_dexpreopt_zip)
   $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)
   $(LOCAL_INSTALLED_MODULE): $(my_dexpreopt_zip)