From 1131d89b426d7da401885d37a50a908c9f87d2a1 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Fri, 5 Sep 2014 11:18:07 -0700 Subject: [PATCH] Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools Bug: 17393134 Change-Id: Ic2325d7c1e1e7292c9339e169efbed526f82263c (cherry picked from commit 339ee4968a26d3a795ecfcd798c6e2d7b01d81d9) --- tools/releasetools/common.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index d27be6f14..3eaa9579e 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -44,6 +44,7 @@ OPTIONS.search_path = "out/host/linux-x86" OPTIONS.signapk_path = "framework/signapk.jar" # Relative to search_path OPTIONS.extra_signapk_args = [] OPTIONS.java_path = "java" # Use the one on the path by default. +OPTIONS.java_args = "-Xmx2048m" # JVM Args OPTIONS.public_key_suffix = ".x509.pem" OPTIONS.private_key_suffix = ".pk8" OPTIONS.verbose = False @@ -456,7 +457,7 @@ def SignFile(input_name, output_name, key, password, align=None, else: sign_name = output_name - cmd = [OPTIONS.java_path, "-Xmx2048m", "-jar", + cmd = [OPTIONS.java_path, OPTIONS.java_args, "-jar", os.path.join(OPTIONS.search_path, OPTIONS.signapk_path)] cmd.extend(OPTIONS.extra_signapk_args) if whole_file: @@ -604,6 +605,8 @@ def ParseOptions(argv, OPTIONS.extra_signapk_args = shlex.split(a) elif o in ("--java_path",): OPTIONS.java_path = a + elif o in ("--java_args",): + OPTIONS.java_args = a elif o in ("--public_key_suffix",): OPTIONS.public_key_suffix = a elif o in ("--private_key_suffix",):