commit 3f54e224cb00dadf62dc0d9d5358b40049d60d94
author Ian Zerny <zerny@google.com> Tue Feb 12 10:51:17 2019 +0100
committer Ian Zerny <zerny@google.com> Tue Feb 12 10:51:17 2019 +0100
tree c8eb2d82edbeda15eb7e4220ff75295888b4bddc
parent 2fcc14bfb4056d157c5f8919651112371bb8fe4c

Use jdk.GetJavaExecutable() in tools.

Bug: 124239658
Change-Id: Ia2fce6eb5f25000f519d499f70fb54d04c7dfd66

tools/toolhelper.py

diff --git a/tools/toolhelper.py b/tools/toolhelper.py
index 9371fb9..10da97d 100644
--- a/tools/toolhelper.py
+++ b/tools/toolhelper.py
@@ -4,7 +4,7 @@
 
 import glob
 import gradle
-import os
+import jdk
 import subprocess
 from threading import Timer
 import utils
@@ -19,7 +19,7 @@
   cmd = []
   if track_memory_file:
     cmd.extend(['tools/track_memory.sh', track_memory_file])
-  cmd.append('java')
+  cmd.append(jdk.GetJavaExecutable())
   if extra_args:
     cmd.extend(extra_args)
   if debug:
@@ -61,7 +61,7 @@
       'compileTestJava',
     ])
   cmd = []
-  cmd.append('java')
+  cmd.append(jdk.GetJavaExecutable())
   if extra_args:
     cmd.extend(extra_args)
   if debug: