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

Commit eaf031c9 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Correctly create directories before unzipping dexpreopt zip" 

am: cb4d613e

Change-Id: If2cf225cc0561d771ab9079603cb3a34cff692a6
parents f42b43c4 cb4d613e

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -525,6 +525,9 @@ $(call add-clean-step, rm -f $(HOST_OUT)/bin/aidegen) 
# Remove 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

# ************************************************

core/dex_preopt_odex_install.mk

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ ifdef LOCAL_DEX_PREOPT 
    LOCAL_POST_INSTALL_CMD += &&

  endif



  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_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_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)

  $(LOCAL_INSTALLED_MODULE): $(my_dexpreopt_zip)