Remove D8/R8 java 11 separate build
Bug: b/270027418
Change-Id: I504d1c2d0f706bf22eff4ddcd74f014fc4967b12
diff --git a/build.gradle b/build.gradle
index e7aaa5d..b1d49c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,14 +73,6 @@
srcDirs "third_party/api_database/api_database"
}
}
- main11 {
- java {
- srcDirs = ['src/main/java', 'src/keepanno/java']
- }
- resources {
- srcDirs "third_party/api_database/api_database"
- }
- }
main17 {
java {
srcDirs = ['src/main/java', 'src/keepanno/java']
@@ -249,25 +241,6 @@
implementation group: 'org.ow2.asm', name: 'asm-analysis', version: asmVersion
implementation group: 'org.ow2.asm', name: 'asm-util', version: asmVersion
- main11Implementation "net.sf.jopt-simple:jopt-simple:$joptSimpleVersion"
- main11Implementation "com.google.code.gson:gson:$gsonVersion"
- // Include all of guava when compiling the code, but exclude annotations that we don't
- // need from the packaging.
- main11CompileOnly("com.google.guava:guava:$guavaVersion")
- main11Implementation("com.google.guava:guava:$guavaVersion", {
- exclude group: 'com.google.errorprone'
- exclude group: 'com.google.code.findbugs'
- exclude group: 'com.google.j2objc'
- exclude group: 'org.codehaus.mojo'
- })
- main11Implementation group: 'it.unimi.dsi', name: 'fastutil', version: fastutilVersion
- main11Implementation "org.jetbrains.kotlinx:kotlinx-metadata-jvm:$kotlinExtMetadataJVMVersion"
- main11Implementation group: 'org.ow2.asm', name: 'asm', version: asmVersion
- main11Implementation group: 'org.ow2.asm', name: 'asm-commons', version: asmVersion
- main11Implementation group: 'org.ow2.asm', name: 'asm-tree', version: asmVersion
- main11Implementation group: 'org.ow2.asm', name: 'asm-analysis', version: asmVersion
- main11Implementation group: 'org.ow2.asm', name: 'asm-util', version: asmVersion
-
main17Implementation "net.sf.jopt-simple:jopt-simple:$joptSimpleVersion"
main17Implementation "com.google.code.gson:gson:$gsonVersion"
// Include all of guava when compiling the code, but exclude annotations that we don't
@@ -676,11 +649,6 @@
JavaVersion.VERSION_1_10,
false)
setJdkCompilationWithCompatibility(
- sourceSets.main11.compileJavaTaskName,
- 'jdk-11',
- JavaVersion.VERSION_11,
- false)
-setJdkCompilationWithCompatibility(
sourceSets.main17.compileJavaTaskName,
'jdk-17',
JavaVersion.VERSION_17,
@@ -833,11 +801,6 @@
archiveFileName = 'sources_main.jar'
}
-task repackageSources11(type: Jar) {
- from sourceSets.main11.output
- archiveFileName = 'sources_main_11.jar'
-}
-
task repackageSources17(type: Jar) {
from sourceSets.main17.output
archiveFileName = 'sources_main_17.jar'
@@ -919,20 +882,6 @@
outputs.files r8Task.outputs.files
}
-task r8WithDeps11 {
- dependsOn repackageSources11
- dependsOn repackageDeps
- inputs.files ([repackageSources11.outputs, repackageDeps.outputs])
- def r8Task = r8CreateTask(
- 'WithDeps11',
- 'r8_with_deps_11.jar',
- repackageSources11.outputs.files + repackageDeps.outputs.files,
- true,
- true)
- dependsOn r8Task
- outputs.files r8Task.outputs.files
-}
-
task r8WithDeps17 {
dependsOn repackageSources17
dependsOn repackageDeps
@@ -954,13 +903,6 @@
outputs.file output
}
-task r8WithRelocatedDeps11 {
- def output = "${buildDir}/libs/r8_with_relocated_deps_11.jar"
- dependsOn r8RelocateTask(r8WithDeps11, output)
- inputs.files r8WithDeps11.outputs.files
- outputs.file output
-}
-
task r8WithRelocatedDeps17 {
def output = "${buildDir}/libs/r8_with_relocated_deps_17.jar"
dependsOn r8RelocateTask(r8WithDeps17, output)
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index 2ee694f..1a92de0 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -171,8 +171,6 @@
Paths.get(LIBS_DIR, "r8_no_manifest_without_deps.jar");
public static final Path R8_WITH_RELOCATED_DEPS_JAR =
Paths.get(LIBS_DIR, "r8_with_relocated_deps.jar");
- public static final Path R8_WITH_RELOCATED_DEPS_11_JAR =
- Paths.get(LIBS_DIR, "r8_with_relocated_deps_11.jar");
public static final Path R8_WITH_DEPS_17_JAR = Paths.get(LIBS_DIR, "r8_with_deps_17.jar");
public static final Path R8_WITH_RELOCATED_DEPS_17_JAR =
Paths.get(LIBS_DIR, "r8_with_relocated_deps_17.jar");
diff --git a/src/test/java/com/android/tools/r8/desugar/r8bootstrap/Java11R8BootstrapTest.java b/src/test/java/com/android/tools/r8/desugar/r8bootstrap/Java11R8BootstrapTest.java
deleted file mode 100644
index b3a9adf..0000000
--- a/src/test/java/com/android/tools/r8/desugar/r8bootstrap/Java11R8BootstrapTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) 2022, the R8 project authors. Please see the AUTHORS file
-// 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.
-
-package com.android.tools.r8.desugar.r8bootstrap;
-
-import static com.android.tools.r8.desugar.r8bootstrap.JavaBootstrapUtils.MAIN_KEEP;
-import static com.android.tools.r8.utils.FileUtils.JAR_EXTENSION;
-import static junit.framework.TestCase.assertEquals;
-
-import com.android.tools.r8.Jdk11TestUtils;
-import com.android.tools.r8.TestBase;
-import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersCollection;
-import com.android.tools.r8.TestRuntime.CfVm;
-import com.android.tools.r8.ToolHelper;
-import com.android.tools.r8.cf.bootstrap.BootstrapCurrentEqualityTest;
-import com.google.common.collect.ImmutableList;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * This test relies on a freshly built build/libs/r8_with_relocated_deps_11.jar.
- *
- * <p>The test compiles Hello/R8 with the same settings using R8 compiled with Java 11 (non shrunk),
- * and the same but shrunk with/without nest desugaring. All generated jars should be run correctly
- * and identical.
- */
-@RunWith(Parameterized.class)
-public class Java11R8BootstrapTest extends TestBase {
-
- private static final String[] HELLO_KEEP = {
- "-keep class hello.Hello { public static void main(...);}"
- };
-
- private static Path r8Lib11NoDesugar;
- private static Path r8Lib11Desugar;
-
- public Java11R8BootstrapTest(TestParameters parameters) {
- this.parameters = parameters;
- }
-
- private final TestParameters parameters;
-
- @Parameters(name = "{0}")
- public static TestParametersCollection data() {
- return getTestParameters().withCfRuntimesStartingFromIncluding(CfVm.JDK11).build();
- }
-
- @BeforeClass
- public static void beforeAll() throws Exception {
- r8Lib11NoDesugar = compileR8(false);
- r8Lib11Desugar = compileR8(true);
- }
-
- private static Path compileR8(boolean desugar) throws Exception {
- return JavaBootstrapUtils.compileR8(
- ToolHelper.R8_WITH_RELOCATED_DEPS_11_JAR,
- Jdk11TestUtils.getJdk11LibraryFiles(getStaticTemp()),
- desugar);
- }
-
- private Path[] jarsToCompare() {
- return new Path[] {
- ToolHelper.R8_WITH_RELOCATED_DEPS_11_JAR,
- r8Lib11NoDesugar,
- r8Lib11Desugar
- };
- }
-
- @Test
- public void testHello() throws Exception {
- Assume.assumeTrue(!ToolHelper.isWindows());
- Path prevGeneratedJar = null;
- String prevRunResult = null;
- for (Path jar : jarsToCompare()) {
- Path generatedJar =
- testForExternalR8(Backend.CF, parameters.getRuntime())
- .useProvidedR8(jar)
- .addProgramFiles(Paths.get(ToolHelper.EXAMPLES_BUILD_DIR, "hello" + JAR_EXTENSION))
- .addKeepRules(HELLO_KEEP)
- .compile()
- .outputJar();
- String runResult =
- ToolHelper.runJava(
- parameters.getRuntime().asCf(), ImmutableList.of(generatedJar), "hello.Hello")
- .toString();
- if (prevRunResult != null) {
- assertEquals(prevRunResult, runResult);
- }
- prevRunResult = runResult;
- if (prevGeneratedJar != null) {
- uploadJarsToCloudStorageIfTestFails(
- BootstrapCurrentEqualityTest::assertProgramsEqual, prevGeneratedJar, generatedJar);
- }
- prevGeneratedJar = generatedJar;
- }
- }
-
- @Test
- public void testR8() throws Exception {
- Assume.assumeTrue(!ToolHelper.isWindows());
- Assume.assumeTrue(parameters.isCfRuntime());
- Assume.assumeTrue(CfVm.JDK11.lessThanOrEqual(parameters.getRuntime().asCf().getVm()));
- Path prevGeneratedJar = null;
- for (Path jar : jarsToCompare()) {
- Path generatedJar =
- testForExternalR8(Backend.CF, parameters.getRuntime())
- .useProvidedR8(jar)
- .addProgramFiles(Paths.get(ToolHelper.EXAMPLES_BUILD_DIR, "hello" + JAR_EXTENSION))
- .addKeepRuleFiles(MAIN_KEEP)
- .compile()
- .outputJar();
- if (prevGeneratedJar != null) {
- uploadJarsToCloudStorageIfTestFails(
- BootstrapCurrentEqualityTest::assertProgramsEqual, prevGeneratedJar, generatedJar);
- }
- prevGeneratedJar = generatedJar;
- }
- }
-}
diff --git a/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaBootstrapUtils.java b/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaBootstrapUtils.java
index 63d7dde..a21d5f7 100644
--- a/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaBootstrapUtils.java
+++ b/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaBootstrapUtils.java
@@ -19,7 +19,7 @@
static boolean exists(Path r8WithRelocatedDeps) {
// This test runs only if the dependencies have been generated using:
- // <code> tools/gradle.py r8WithRelocatedDeps17 r8WithRelocatedDeps11 </code>
+ // <code> tools/gradle.py r8WithRelocatedDeps17 </code>
return Files.exists(r8WithRelocatedDeps);
}
@@ -36,10 +36,7 @@
.applyIf(
desugar,
builder ->
- builder.addOptionsModification(
- options -> {
- options.desugarState = DesugarState.ON;
- }))
+ builder.addOptionsModification(options -> options.desugarState = DesugarState.ON))
.compile()
.inspect(inspector -> assertNests(inspector, desugar))
.writeToZip();
diff --git a/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaD8CompilationTest.java b/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaD8CompilationTest.java
index 1970880..b07fba2 100644
--- a/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaD8CompilationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaD8CompilationTest.java
@@ -47,8 +47,7 @@
public static List<Object[]> data() {
return buildParameters(
getTestParameters().withNoneRuntime().build(),
- ImmutableList.of(
- ToolHelper.R8_WITH_RELOCATED_DEPS_11_JAR, ToolHelper.R8_WITH_RELOCATED_DEPS_17_JAR));
+ ImmutableList.of(ToolHelper.R8_WITH_RELOCATED_DEPS_17_JAR));
}
private static void assertNoNests(CodeInspector inspector) {
diff --git a/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaR8CompilationTest.java b/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaR8CompilationTest.java
index 09cb049..b28ef17 100644
--- a/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaR8CompilationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaR8CompilationTest.java
@@ -40,8 +40,7 @@
.withApiLevelsStartingAtIncluding(AndroidApiLevel.O)
.withDexRuntimes()
.build(),
- ImmutableList.of(
- ToolHelper.R8_WITH_RELOCATED_DEPS_11_JAR, ToolHelper.R8_WITH_RELOCATED_DEPS_17_JAR));
+ ImmutableList.of(ToolHelper.R8_WITH_RELOCATED_DEPS_17_JAR));
}
private static final Path MAIN_KEEP = Paths.get("src/main/keep.txt");
