am 4f3d3147: Merge "Add java_args as a valid option" into klp-modular-dev

* commit '4f3d3147': Add java_args as a valid option

am 4f3d3147: Merge "Add java_args as a valid option" into klp-modular-dev
* commit '4f3d3147': Add java_args as a valid option
03f8a4df · Baligh Uddin · Android Git Automerger · 95c17467 · 4f3d3147 · 03f8a4df
Commit 03f8a4df authored 10 years ago by Baligh Uddin Committed by Android Git Automerger 10 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

tools/releasetools/common.py tools/releasetools/common.py +2 -2

No files found.
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -581,8 +581,8 @@ def ParseOptions(argv,
    opts, args = getopt.getopt(
        argv, "hvp:s:x:" + extra_opts,
        ["help", "verbose", "path=", "signapk_path=", "extra_signapk_args=",
-         "java_path=", "public_key_suffix=", "private_key_suffix=",
-         "device_specific=", "extra="] +
+         "java_path=", "java_args=", "public_key_suffix=",
+         "private_key_suffix=", "device_specific=", "extra="] +
        list(extra_long_opts))
  except getopt.GetoptError, err:
    Usage(docstring)