# HG changeset patch
# User erikj
# Date 1354897422 -3600
# Node ID a29ecb044d0f683db31b536e0c09f3b71b12a067
# Parent  76cc9bd3ece407d3a15d3bea537b57927973c5e7
8004045: build-infra: Error 12 from zip when updating src.zip
Summary: Hiding this error from make so that it doesn't fail
Reviewed-by: ohrstrom, dholmes

diff -r 76cc9bd3ece4 -r a29ecb044d0f common/makefiles/JavaCompilation.gmk
--- a/common/makefiles/JavaCompilation.gmk	Wed Jul 05 18:31:27 2017 +0200
+++ b/common/makefiles/JavaCompilation.gmk	Fri Dec 07 17:23:42 2012 +0100
@@ -275,10 +275,12 @@
     # Explicitly excluded files can be given with absolute path. The patsubst solution
     # isn't perfect but the likelyhood of an absolute path to match something in a src
     # dir is very small.
+    # If zip has nothing to do, it returns 12 and would fail the build. Check for 12
+    # and only fail if it's not.
     $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
 		$(MKDIR) -p $$(@D)
 		$(ECHO) Updating $$($1_NAME)
-		$$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))))$$(NEWLINE)) true
+		$$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true
 		$(TOUCH) $$@
 endef