Revert "Run all Java 17 tests"
This reverts commit bfbd56e095b7206b74feb1219a24d7dd2f8f22b1.
Bug: b/337801526
Change-Id: I0e7667e5b90b5d1f601152c62625daeb41e37ffb
diff --git a/tools/jdk.py b/tools/jdk.py
index d16cad0..3b41c3b 100755
--- a/tools/jdk.py
+++ b/tools/jdk.py
@@ -15,17 +15,11 @@
def GetJdkHome():
- return GetJdk17Home()
+ return GetJdk11Home()
def GetJdkRoot():
- return GetJdk17Root()
-
-
-def GetJdk17Root():
- root = os.path.join(JDK_DIR, 'jdk-17')
- os_root = GetOSPath(root)
- return os_root if os_root else os.environ['JAVA_HOME']
+ return GetJdk11Root()
def GetJdk11Root():
@@ -55,15 +49,6 @@
return dirs
-def GetJdk17Home():
- root = GetJdk17Root()
- # osx has the home inside Contents/Home in the bundle
- if defines.IsOsX():
- return os.path.join(root, 'Contents', 'Home')
- else:
- return root
-
-
def GetJdk11Home():
root = GetJdk11Root()
# osx has the home inside Contents/Home in the bundle
