am 019891c1: am fc9cd4f5: Create an empty zip file if no dict file found.
* commit '019891c1b858e571edd748e884b18d22d8efd10a':
Create an empty zip file if no dict file found.
diff --git a/core/Makefile b/core/Makefile
index d8b00c6..bd63c11 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1401,7 +1401,7 @@
# Only for apps_only build.
#
ifdef TARGET_BUILD_APPS
-PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/proguard-dict-$(FILE_NAME_TAG).zip
+PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-$(FILE_NAME_TAG).zip
# the dependency will be set up later in build/core/main.mk.
$(PROGUARD_DICT_ZIP) :
@echo "Packaging Proguard obfuscation dictionary files."
@@ -1409,7 +1409,10 @@
if [ -n "$$dict_files" ]; then \
zip -q $@ $$dict_files; \
else \
- touch $@; \
+ touch $(dir $@)/dummy; \
+ (cd $(dir $@) && zip -q $(notdir $@) dummy); \
+ zip -qd $@ dummy; \
+ rm $(dir $@)/dummy; \
fi
endif # TARGET_BUILD_APPS