p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use a less freqent dummy file name: zipdummy 

Previously if user has a directory with name dummy in the root of the
source tree, "zip -qd package.apk dummy" fails with:
"zip error: Nothing to do!".
This change mitigates the error.

Change-Id: I642e3bf0378e5b9911a068ecb72f795b3e92f1fe
This commit is contained in:
Ying Wang 2015-02-26 09:36:27 -08:00
parent 37a44faa72
commit dcd90831e5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/Makefile
View File

@ -1536,10 +1536,10 @@ $(PROGUARD_DICT_ZIP) :
unobfuscated_jars=$${dict_files//proguard_dictionary/classes.jar}; \
zip -q $@ $$dict_files $$unobfuscated_jars; \
else \
touch $(dir $@)/dummy; \
(cd $(dir $@) && zip -q $(notdir $@) dummy); \
zip -qd $@ dummy; \
rm $(dir $@)/dummy; \
touch $(dir $@)/zipdummy; \
(cd $(dir $@) && zip -q $(notdir $@) zipdummy); \
zip -qd $@ zipdummy; \
rm $(dir $@)/zipdummy; \
fi
endif # TARGET_BUILD_APPS

8
core/definitions.mk
View File

@ -1779,10 +1779,10 @@ endef
# so we need to give it something.
define create-empty-package
@mkdir -p $(dir $@)
$(hide) touch $(dir $@)dummy
$(hide) (cd $(dir $@) && jar cf $(notdir $@) dummy)
$(hide) zip -qd $@ dummy
$(hide) rm $(dir $@)dummy
$(hide) touch $(dir $@)zipdummy
$(hide) (cd $(dir $@) && jar cf $(notdir $@) zipdummy)
$(hide) zip -qd $@ zipdummy
$(hide) rm $(dir $@)zipdummy
endef
# Copy an arhchive file and delete any class files and empty folders inside.