aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross2018-12-14 00:44:25 -0600
committerColin Cross2018-12-14 01:32:06 -0600
commit2bb1f518fdf8b1483ecb876e9acb9431f93eb8e6 (patch)
tree82ae4962603ad63231d249166448badce30fca44 /core/dex_preopt_odex_install.mk
parent9eaeb56c246ac8b0ba0c305ba2e88d98d09b9225 (diff)
downloadplatform-build-2bb1f518fdf8b1483ecb876e9acb9431f93eb8e6.tar.gz
platform-build-2bb1f518fdf8b1483ecb876e9acb9431f93eb8e6.tar.xz
platform-build-2bb1f518fdf8b1483ecb876e9acb9431f93eb8e6.zip
Correctly create directories before unzipping dexpreopt zip
Ie7daa94e107d53eff075ca58dbe721bd9d7fc8c2 attempted to pre-create the directories that unzip would unzip into, but incorrectly created them in the top of the source tree instead of in $(PRODUCT_OUT). Fix the directory location and add a cleanspec to clean up the incorrect directories in the source tree. Bug: 119412419 Test: m correctly cleans up incorrect directories in source tree Test: extract unzip command from out/verbose.log.gz and add bash -x Change-Id: Ica006a007d112c232311435aaac0c0e476232b67
Diffstat (limited to 'core/dex_preopt_odex_install.mk')
-rw-r--r--core/dex_preopt_odex_install.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 097f84a2b..d13e3153c 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -253,7 +253,7 @@ ifdef LOCAL_DEX_PREOPT
253 LOCAL_POST_INSTALL_CMD += && 253 LOCAL_POST_INSTALL_CMD += &&
254 endif 254 endif
255 255
256 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) 256 LOCAL_POST_INSTALL_CMD += for i in $$(zipinfo -1 $(my_dexpreopt_zip)); do mkdir -p $(PRODUCT_OUT)/$$(dirname $$i); done && unzip -qo -d $(PRODUCT_OUT) $(my_dexpreopt_zip)
257 $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD) 257 $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)
258 $(LOCAL_INSTALLED_MODULE): $(my_dexpreopt_zip) 258 $(LOCAL_INSTALLED_MODULE): $(my_dexpreopt_zip)
259 259