diff options
| author | Ying Wang <wangying@google.com> | 2015-02-26 09:36:27 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-02-26 09:36:27 -0800 |
| commit | dcd90831e57aa619aa53c59053ed769c45a5ddfd (patch) | |
| tree | 45d481dd221981f866e2e6a60e9b68bcae853c88 /core/Makefile | |
| parent | 37a44faa7266c8a7e0cc5077a4c028d6f5bfa7f7 (diff) | |
| download | build-dcd90831e57aa619aa53c59053ed769c45a5ddfd.zip build-dcd90831e57aa619aa53c59053ed769c45a5ddfd.tar.gz build-dcd90831e57aa619aa53c59053ed769c45a5ddfd.tar.bz2 | |
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
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/Makefile b/core/Makefile index e52fbc8..0de717a 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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 |