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

Merge "Use a less freqent dummy file name: zipdummy"

Browse Source
This commit is contained in:
Ying Wang
2015-02-26 17:57:57 +00:00
committed by Gerrit Code Review
parent 37a44faa72 dcd90831e5
commit 4eec22a662
2 changed files with 8 additions and 8 deletions
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}; \ unobfuscated_jars=$${dict_files//proguard_dictionary/classes.jar}; \
zip -q $@ $$dict_files $$unobfuscated_jars; \ zip -q $@ $$dict_files $$unobfuscated_jars; \
else \ else \
touch $(dir $@)/dummy; \ touch $(dir $@)/zipdummy; \
(cd $(dir $@) && zip -q $(notdir $@) dummy); \ (cd $(dir $@) && zip -q $(notdir $@) zipdummy); \
zip -qd $@ dummy; \ zip -qd $@ zipdummy; \
rm $(dir $@)/dummy; \ rm $(dir $@)/zipdummy; \
fi fi
endif # TARGET_BUILD_APPS endif # TARGET_BUILD_APPS

8
core/definitions.mk
View File

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