Remove r8-18 as bootclasspath for compilations
In new gradle setup, don't fork compilation
Change-Id: I0de18552f69e02bad31a10a677ff3001041d4161
diff --git a/build.gradle b/build.gradle
index 1467498..7485331b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -550,8 +550,6 @@
options.forkOptions.jvmArgs << "-Xss256m"
// Test compilation is sometimes hitting the default limit at 1g, increase it.
options.forkOptions.jvmArgs << "-Xmx3g"
- // Set the bootclass path so compilation is consistent with 1.8 target compatibility.
- options.forkOptions.jvmArgs << "-Xbootclasspath/a:third_party/openjdk/openjdk-rt-1.8/rt.jar"
}
}
diff --git a/d8_r8/library_desugar/build.gradle.kts b/d8_r8/library_desugar/build.gradle.kts
index 768690a..d7f32c6 100644
--- a/d8_r8/library_desugar/build.gradle.kts
+++ b/d8_r8/library_desugar/build.gradle.kts
@@ -26,11 +26,5 @@
tasks {
withType<JavaCompile> {
dependsOn(thirdPartyCompileDependenciesTask)
- options.setFork(true)
- options.forkOptions.memoryMaximumSize = "3g"
- options.forkOptions.jvmArgs = listOf(
- "-Xss256m",
- // Set the bootclass path so compilation is consistent with 1.8 target compatibility.
- "-Xbootclasspath/a:third_party/openjdk/openjdk-rt-1.8/rt.jar")
}
-}
\ No newline at end of file
+}
diff --git a/d8_r8/test_modules/tests_bootstrap/build.gradle.kts b/d8_r8/test_modules/tests_bootstrap/build.gradle.kts
index 12ff996..af2fb9f 100644
--- a/d8_r8/test_modules/tests_bootstrap/build.gradle.kts
+++ b/d8_r8/test_modules/tests_bootstrap/build.gradle.kts
@@ -46,12 +46,6 @@
withType<JavaCompile> {
dependsOn(testJar)
dependsOn(gradle.includedBuild("main").task(":jar"))
- options.setFork(true)
- options.forkOptions.memoryMaximumSize = "3g"
- options.forkOptions.jvmArgs = listOf(
- "-Xss256m",
- // Set the bootclass path so compilation is consistent with 1.8 target compatibility.
- "-Xbootclasspath/a:third_party/openjdk/openjdk-rt-1.8/rt.jar")
}
withType<KotlinCompile> {
diff --git a/d8_r8/test_modules/tests_java_8/build.gradle.kts b/d8_r8/test_modules/tests_java_8/build.gradle.kts
index ea15479..49672fa 100644
--- a/d8_r8/test_modules/tests_java_8/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_8/build.gradle.kts
@@ -144,12 +144,6 @@
dependsOn(gradle.includedBuild("resourceshrinker").task(":jar"))
dependsOn(gradle.includedBuild("main").task(":jar"))
dependsOn(thirdPartyCompileDependenciesTask)
- options.setFork(true)
- options.forkOptions.memoryMaximumSize = "3g"
- options.forkOptions.jvmArgs = listOf(
- "-Xss256m",
- // Set the bootclass path so compilation is consistent with 1.8 target compatibility.
- "-Xbootclasspath/a:third_party/openjdk/openjdk-rt-1.8/rt.jar")
}
withType<KotlinCompile> {
diff --git a/d8_r8/test_modules/tests_java_examplesAndroidN/build.gradle.kts b/d8_r8/test_modules/tests_java_examplesAndroidN/build.gradle.kts
index 093919e..57b641f 100644
--- a/d8_r8/test_modules/tests_java_examplesAndroidN/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_examplesAndroidN/build.gradle.kts
@@ -36,11 +36,5 @@
tasks {
withType<JavaCompile> {
dependsOn(thirdPartyCompileDependenciesTask)
- options.setFork(true)
- options.forkOptions.memoryMaximumSize = "3g"
- options.forkOptions.jvmArgs = listOf(
- "-Xss256m",
- // Set the bootclass path so compilation is consistent with 1.8 target compatibility.
- "-Xbootclasspath/a:third_party/openjdk/openjdk-rt-1.8/rt.jar")
}
}
diff --git a/d8_r8/test_modules/tests_java_examplesAndroidO/build.gradle.kts b/d8_r8/test_modules/tests_java_examplesAndroidO/build.gradle.kts
index 1609864..048fc5d 100644
--- a/d8_r8/test_modules/tests_java_examplesAndroidO/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_examplesAndroidO/build.gradle.kts
@@ -39,13 +39,7 @@
tasks {
withType<JavaCompile> {
dependsOn(thirdPartyCompileDependenciesTask)
- options.setFork(true)
options.compilerArgs.add("-Xlint:-options")
options.compilerArgs.add("-parameters")
- options.forkOptions.memoryMaximumSize = "3g"
- options.forkOptions.jvmArgs = listOf(
- "-Xss256m",
- // Set the bootclass path so compilation is consistent with 1.8 target compatibility.
- "-Xbootclasspath/a:third_party/openjdk/openjdk-rt-1.8/rt.jar")
}
}
diff --git a/d8_r8/test_modules/tests_java_examplesAndroidP/build.gradle.kts b/d8_r8/test_modules/tests_java_examplesAndroidP/build.gradle.kts
index 56cb851..efed289 100644
--- a/d8_r8/test_modules/tests_java_examplesAndroidP/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_examplesAndroidP/build.gradle.kts
@@ -36,11 +36,5 @@
tasks {
withType<JavaCompile> {
dependsOn(thirdPartyCompileDependenciesTask)
- options.setFork(true)
- options.forkOptions.memoryMaximumSize = "3g"
- options.forkOptions.jvmArgs = listOf(
- "-Xss256m",
- // Set the bootclass path so compilation is consistent with 1.8 target compatibility.
- "-Xbootclasspath/a:third_party/openjdk/openjdk-rt-1.8/rt.jar")
}
}
diff --git a/d8_r8/test_modules/tests_java_kotlinR8TestResources/build.gradle.kts b/d8_r8/test_modules/tests_java_kotlinR8TestResources/build.gradle.kts
index 7ccf7cd..06d9518 100644
--- a/d8_r8/test_modules/tests_java_kotlinR8TestResources/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_kotlinR8TestResources/build.gradle.kts
@@ -36,12 +36,6 @@
tasks {
withType<JavaCompile> {
dependsOn(thirdPartyCompileDependenciesTask)
- options.setFork(true)
- options.forkOptions.memoryMaximumSize = "3g"
- options.forkOptions.jvmArgs = listOf(
- "-Xss256m",
- // Set the bootclass path so compilation is consistent with 1.8 target compatibility.
- "-Xbootclasspath/a:third_party/openjdk/openjdk-rt-1.8/rt.jar")
}
withType<KotlinCompile> {
kotlinOptions {
