Use jdk.GetJavaExecutable() in tools.
Bug: 124239658
Change-Id: Ia2fce6eb5f25000f519d499f70fb54d04c7dfd66
diff --git a/tools/run_on_as_app.py b/tools/run_on_as_app.py
index 2889d74..506c583 100755
--- a/tools/run_on_as_app.py
+++ b/tools/run_on_as_app.py
@@ -7,6 +7,7 @@
import apk_utils
import golem
import gradle
+import jdk
import os
import optparse
import shutil
@@ -177,7 +178,7 @@
# Use the copy of r8.jar if it is there.
if os.path.isfile(r8_jar):
- cmd = ['java', '-ea', '-jar', r8_jar, 'extractmarker', apk]
+ cmd = [jdk.GetJavaExecutable(), '-ea', '-jar', r8_jar, 'extractmarker', apk]
else:
script = os.path.join(utils.TOOLS_DIR, 'extractmarker.py')
cmd = ['python', script, apk]
@@ -493,7 +494,7 @@
# is 'r8'.
entry_point = 'com.android.tools.r8.R8'
- cmd = ['java', '-ea:com.android.tools.r8...', '-cp', r8_jar, entry_point,
+ cmd = [jdk.GetJavaExecutable(), '-ea:com.android.tools.r8...', '-cp', r8_jar, entry_point,
'--release', '--min-api', str(min_sdk), '--pg-conf', proguard_config_file,
'--lib', android_jar, '--output', zip_dest, apk]
