commit 09e8a4697be1991df7bb3bc4566d47f1e3503086
author Ian Zerny <zerny@google.com> Tue Mar 26 08:59:32 2019 +0100
committer Ian Zerny <zerny@google.com> Tue Mar 26 08:59:32 2019 +0100
tree 1112a223f7e59fc904468c6b02ad594e12897904
parent d55ce271f03ba3bce5dbbcceea1faae0b14c56e1

Link third_party before checking java version.

Change-Id: I45558037efc24b4f3bd7f7fe3c55ad58bfdd6b68

tools/run_proguard_dx_on_app.py

diff --git a/tools/run_proguard_dx_on_app.py b/tools/run_proguard_dx_on_app.py
index 4e408ff..c485ed2 100755
--- a/tools/run_proguard_dx_on_app.py
+++ b/tools/run_proguard_dx_on_app.py
@@ -61,10 +61,10 @@
   return parser.parse_args(argv)
 
 def Main(argv):
-  utils.check_java_version()
   options = parse_arguments(argv)
   if options.golem:
     golem.link_third_party()
+  utils.check_java_version()
   outdir = options.out
 
   if options.app == 'gmscore':

tools/test_framework.py

diff --git a/tools/test_framework.py b/tools/test_framework.py
index f30d7d9..99e0719 100755
--- a/tools/test_framework.py
+++ b/tools/test_framework.py
@@ -65,11 +65,11 @@
   return parser.parse_args()
 
 def Main():
-  utils.check_java_version()
   args = parse_arguments()
-  output_dir = args.output
   if args.golem:
     golem.link_third_party()
+  utils.check_java_version()
+  output_dir = args.output
   with utils.TempDir() as temp_dir:
 
     if not output_dir: