Rename jdk11 folders to match jdk9 and jdk15
Change-Id: I2bf11cf920f9cb3488e2465fa6a9f8a704dcd22e
diff --git a/.gitignore b/.gitignore
index 7d1f237..a5b9426 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,12 +114,12 @@
third_party/openjdk/jdk-15/windows.tar.gz
third_party/openjdk/jdk-11-test
third_party/openjdk/jdk-11-test.tar.gz
-third_party/openjdk/jdk-11/Linux
-third_party/openjdk/jdk-11/Linux.tar.gz
-third_party/openjdk/jdk-11/Mac
-third_party/openjdk/jdk-11/Mac.tar.gz
-third_party/openjdk/jdk-11/Windows
-third_party/openjdk/jdk-11/Windows.tar.gz
+third_party/openjdk/jdk-11/linux
+third_party/openjdk/jdk-11/linux.tar.gz
+third_party/openjdk/jdk-11/osx
+third_party/openjdk/jdk-11/osx.tar.gz
+third_party/openjdk/jdk-11/windows
+third_party/openjdk/jdk-11/windows.tar.gz
third_party/openjdk/jdk8/darwin-x86
third_party/openjdk/jdk8/darwin-x86.tar.gz
third_party/openjdk/jdk8/linux-x86
diff --git a/build.gradle b/build.gradle
index 197a5e5..d80eb7e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -367,18 +367,18 @@
linux: [
"third_party": ["openjdk/openjdk-9.0.4/linux",
"openjdk/jdk8/linux-x86",
- "openjdk/jdk-11/Linux",
+ "openjdk/jdk-11/linux",
"openjdk/jdk-15/linux"],
],
osx: [
"third_party": ["openjdk/openjdk-9.0.4/osx",
"openjdk/jdk8/darwin-x86",
- "openjdk/jdk-11/Mac",
+ "openjdk/jdk-11/osx",
"openjdk/jdk-15/osx"],
],
windows: [
"third_party": ["openjdk/openjdk-9.0.4/windows",
- "openjdk/jdk-11/Windows",
+ "openjdk/jdk-11/windows",
"openjdk/jdk-15/windows"],
],
]
@@ -589,44 +589,47 @@
JavaVersion.VERSION_1_9,
false)
setJdkCompilationWithCompatibility(
+ sourceSets.examplesJava11.compileJavaTaskName,
+ 'jdk-11',
+ JavaVersion.VERSION_11,
+ false)
+setJdkCompilationWithCompatibility(
+ sourceSets.examplesJava10.compileJavaTaskName,
+ 'jdk-11',
+ JavaVersion.VERSION_1_10,
+ false)
+setJdkCompilationWithCompatibility(
+ sourceSets.examplesJava11.compileJavaTaskName,
+ 'jdk-11',
+ JavaVersion.VERSION_11,
+ false)
+setJdkCompilationWithCompatibility(
+ sourceSets.examplesTestNGRunner.compileJavaTaskName,
+ 'jdk-11',
+ JavaVersion.VERSION_11,
+ false)
+setJdkCompilationWithCompatibility(
+ sourceSets.jdk11TimeTests.compileJavaTaskName,
+ 'jdk-11',
+ JavaVersion.VERSION_11,
+ false)
+setJdkCompilationWithCompatibility(
sourceSets.examplesJava15.compileJavaTaskName,
'jdk-15',
JavaVersion.VERSION_15,
true)
-def setJdk11CompilationWithCompatibility(String sourceSet, JavaVersion compatibility) {
- tasks.named(sourceSet).get().configure {
- def jdkDir = 'third_party/openjdk/jdk-11/'
- options.fork = true
- options.forkOptions.jvmArgs = []
- if (OperatingSystem.current().isLinux()) {
- options.forkOptions.javaHome = file(jdkDir + 'Linux')
- } else if (OperatingSystem.current().isMacOsX()) {
- options.forkOptions.javaHome = file(jdkDir + 'Mac/Contents/Home')
- } else {
- options.forkOptions.javaHome = file(jdkDir + 'Windows')
- }
- sourceCompatibility = compatibility
- targetCompatibility = compatibility
- }
-}
-
-setJdk11CompilationWithCompatibility(sourceSets.examplesJava10.compileJavaTaskName, JavaVersion.VERSION_1_10)
-setJdk11CompilationWithCompatibility(sourceSets.examplesJava11.compileJavaTaskName, JavaVersion.VERSION_11)
-setJdk11CompilationWithCompatibility(sourceSets.examplesTestNGRunner.compileJavaTaskName, JavaVersion.VERSION_11)
-setJdk11CompilationWithCompatibility(sourceSets.jdk11TimeTests.compileJavaTaskName, JavaVersion.VERSION_11)
-
task compileMainWithJava11 (type: JavaCompile) {
dependsOn downloadDeps
def jdkDir = 'third_party/openjdk/jdk-11/'
options.fork = true
options.forkOptions.jvmArgs = []
if (OperatingSystem.current().isLinux()) {
- options.forkOptions.javaHome = file(jdkDir + 'Linux')
+ options.forkOptions.javaHome = file(jdkDir + 'linux')
} else if (OperatingSystem.current().isMacOsX()) {
- options.forkOptions.javaHome = file(jdkDir + 'Mac/Contents/Home')
+ options.forkOptions.javaHome = file(jdkDir + 'osx/Contents/Home')
} else {
- options.forkOptions.javaHome = file(jdkDir + 'Windows')
+ options.forkOptions.javaHome = file(jdkDir + 'windows')
}
source = sourceSets.main.allSource
destinationDir = file(java11ClassFiles)
diff --git a/src/test/java/com/android/tools/r8/TestRuntime.java b/src/test/java/com/android/tools/r8/TestRuntime.java
index ac2fce4..04b61c0 100644
--- a/src/test/java/com/android/tools/r8/TestRuntime.java
+++ b/src/test/java/com/android/tools/r8/TestRuntime.java
@@ -83,44 +83,28 @@
return new CfRuntime(CfVm.JDK8, home);
}
- public static CfRuntime getCheckedInJdk9() {
- Path home;
+ private static Path getCheckedInJdkHome(Path path) {
if (ToolHelper.isLinux()) {
- home = JDK9_PATH.resolve("linux");
+ return path.resolve("linux");
} else if (ToolHelper.isMac()) {
- home = JDK9_PATH.resolve("osx");
+ return path.resolve("osx");
} else {
assert ToolHelper.isWindows();
- home = JDK9_PATH.resolve("windows");
+ return path.resolve("windows");
}
- return new CfRuntime(CfVm.JDK9, home);
+ }
+
+ public static CfRuntime getCheckedInJdk9() {
+ return new CfRuntime(CfVm.JDK9, getCheckedInJdkHome(JDK9_PATH));
}
public static CfRuntime getCheckedInJdk11() {
- Path home;
- if (ToolHelper.isLinux()) {
- home = JDK11_PATH.resolve("Linux");
- } else if (ToolHelper.isMac()) {
- home = Paths.get(JDK11_PATH.toString(), "Mac", "Contents", "Home");
- } else {
- assert ToolHelper.isWindows();
- home = JDK11_PATH.resolve("Windows");
- }
- return new CfRuntime(CfVm.JDK11, home);
+ return new CfRuntime(CfVm.JDK11, getCheckedInJdkHome(JDK11_PATH));
}
// TODO(b/169692487): Add this to 'getCheckedInCfRuntimes' when we start having support for JDK15.
public static CfRuntime getCheckedInJdk15() {
- Path home;
- if (ToolHelper.isLinux()) {
- home = JDK15_PATH.resolve("linux");
- } else if (ToolHelper.isMac()) {
- home = JDK15_PATH.resolve("osx");
- } else {
- assert ToolHelper.isWindows();
- home = JDK15_PATH.resolve("windows");
- }
- return new CfRuntime(CfVm.JDK15, home);
+ return new CfRuntime(CfVm.JDK15, getCheckedInJdkHome(JDK15_PATH));
}
public static List<CfRuntime> getCheckedInCfRuntimes() {
diff --git a/third_party/openjdk/jdk-11/Linux.tar.gz.sha1 b/third_party/openjdk/jdk-11/Linux.tar.gz.sha1
deleted file mode 100644
index 7b3bb4e..0000000
--- a/third_party/openjdk/jdk-11/Linux.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-63d8982af46e1300e617ec3b266d44209ad38ffd
\ No newline at end of file
diff --git a/third_party/openjdk/jdk-11/Mac.tar.gz.sha1 b/third_party/openjdk/jdk-11/Mac.tar.gz.sha1
deleted file mode 100644
index f95676e..0000000
--- a/third_party/openjdk/jdk-11/Mac.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0e44bc7f7029397681fb6822729785887d565339
\ No newline at end of file
diff --git a/third_party/openjdk/jdk-11/Windows.tar.gz.sha1 b/third_party/openjdk/jdk-11/Windows.tar.gz.sha1
deleted file mode 100644
index ee3ec56..0000000
--- a/third_party/openjdk/jdk-11/Windows.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f332709d19bd53e8ceee3b5bd82b6355d00c9ae9
\ No newline at end of file
diff --git a/third_party/openjdk/jdk-11/linux.tar.gz.sha1 b/third_party/openjdk/jdk-11/linux.tar.gz.sha1
new file mode 100644
index 0000000..4b310c1
--- /dev/null
+++ b/third_party/openjdk/jdk-11/linux.tar.gz.sha1
@@ -0,0 +1 @@
+b6f2e70af4adce81ddd3fd72778dcad442b01864
\ No newline at end of file
diff --git a/third_party/openjdk/jdk-11/osx.tar.gz.sha1 b/third_party/openjdk/jdk-11/osx.tar.gz.sha1
new file mode 100644
index 0000000..13c2e79
--- /dev/null
+++ b/third_party/openjdk/jdk-11/osx.tar.gz.sha1
@@ -0,0 +1 @@
+4212f0fcd33202e7ae1ea6a4d10cdedeb3c166b4
\ No newline at end of file
diff --git a/third_party/openjdk/jdk-11/windows.tar.gz.sha1 b/third_party/openjdk/jdk-11/windows.tar.gz.sha1
new file mode 100644
index 0000000..acd4eb7
--- /dev/null
+++ b/third_party/openjdk/jdk-11/windows.tar.gz.sha1
@@ -0,0 +1 @@
+c190e8fb2715e30dc5a30c765dd11321c852d56f
\ No newline at end of file
