Update tests to work with jdk11 as the system runtime.
This is in preperation for updating the system runtime.
Bug: b/227300698
Change-Id: Ic21efb5002e89792d220a44cd8ac276724067431
diff --git a/tools/jdk.py b/tools/jdk.py
index 23cacc8..ea6be86 100755
--- a/tools/jdk.py
+++ b/tools/jdk.py
@@ -3,14 +3,18 @@
# for details. All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
-import defines
import os
import sys
+import defines
+
JDK_DIR = os.path.join(defines.THIRD_PARTY, 'openjdk')
def GetJdkHome():
- root = os.path.join(JDK_DIR, 'openjdk-9.0.4')
+ return GetJdk9Home()
+
+def GetJdk11Home():
+ root = os.path.join(JDK_DIR, 'jdk-11')
if defines.IsLinux():
return os.path.join(root, 'linux')
elif defines.IsOsX():
@@ -20,8 +24,8 @@
else:
return os.environ['JAVA_HOME']
-def GetJdk11Home():
- root = os.path.join(JDK_DIR, 'jdk-11')
+def GetJdk9Home():
+ root = os.path.join(JDK_DIR, 'openjdk-9.0.4')
if defines.IsLinux():
return os.path.join(root, 'linux')
elif defines.IsOsX():
