commit 194a8ec8aee8511d90354c4b97fecfd0df52c837
author Ying Wang <wangying@google.com> Mon Jun 06 14:34:52 2011 -0700
committer Ying Wang <wangying@google.com> Mon Jun 06 14:34:52 2011 -0700
tree fe836e77fa22a49aa7f453bce9aabff1417a3247
parent 4387dc3ee112839226bccc9454d6a7e539850320

Use arg list file to pass arguments to jar.

To fix error "/bin/bash: Argument list too long"

Change-Id: Ie336b18f9a7eba38d94a6e32c07a88589ce9f1fd

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 89db88e..9251017 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1576,7 +1576,9 @@
 endef
 
 define add-java-resources-to-package
-$(hide) jar uf $@ $(PRIVATE_EXTRA_JAR_ARGS)
+$(call dump-words-to-file, $(PRIVATE_EXTRA_JAR_ARGS), $(dir $@)jar-arg-list)
+$(hide) jar uf $@ @$(dir $@)jar-arg-list
+@rm -f $(dir $@)jar-arg-list
 endef
 
 # Sign a package using the specified key/cert.
@@ -1619,7 +1621,7 @@
 define transform-host-java-to-package
 @echo "host Java: $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))"
 $(call compile-java,$(HOST_JAVAC),$(PRIVATE_BOOTCLASSPATH))
-$(hide) if [ ! -z "$(PRIVATE_EXTRA_JAR_ARGS)" ]; then jar uf $@ $(PRIVATE_EXTRA_JAR_ARGS); fi
+$(if $(PRIVATE_EXTRA_JAR_ARGS), $(call add-java-resources-to-package))
 endef
 
 ###########################################################