From: Ying Wang <wangying@google.com>
Date: Thu, 26 Feb 2015 17:36:27 +0000 (-0800)
Subject: Use a less freqent dummy file name: zipdummy
X-Git-Tag: android-x86-6.0-r1~445^2~9^2~14^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dcd90831e57aa619aa53c59053ed769c45a5ddfd;p=android-x86%2Fbuild.git

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
---

diff --git a/core/Makefile b/core/Makefile
index e52fbc8de..0de717adc 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
diff --git a/core/definitions.mk b/core/definitions.mk
index 6951af9e2..e0f61c53a 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -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.