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

Revert "Correctly create directories before unzipping dexpreopt zip"

Browse Source 
This reverts commit 2bb1f518fd.

Test: none
Bug: 119412419
This commit is contained in:
Colin Cross
2018-12-14 11:45:47 -08:00
parent 9c9ea97fa0
commit 10846f99fb
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CleanSpec.mk
View File

@@ -525,9 +525,6 @@ $(call add-clean-step, rm -f $(HOST_OUT)/bin/aidegen)
# Remove perfprofd # Remove perfprofd
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/perfprofd) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/perfprofd)
# Remove incorrectly created directories in the source tree
$(call add-clean-step, find system/app system/priv-app system/framework system_other -depth -type d -print0 | xargs -0 rmdir)
# ************************************************ # ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

2
core/dex_preopt_odex_install.mk
View File

@@ -253,7 +253,7 @@ ifdef LOCAL_DEX_PREOPT
LOCAL_POST_INSTALL_CMD += && LOCAL_POST_INSTALL_CMD += &&
endif endif
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) 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): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)
$(LOCAL_INSTALLED_MODULE): $(my_dexpreopt_zip) $(LOCAL_INSTALLED_MODULE): $(my_dexpreopt_zip)