commit 9a8cd77f0842432854c806e7f5e01a2d4b476a67
author Morten Krogh-Jespersen <mkroghj@google.com> Fri Aug 11 12:25:46 2023 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Aug 14 08:12:58 2023 +0000
tree 7c2d1472842ac5e7e22ca16791b80898602b2f30
parent 4f0945b25c843413ace170cf48506962848b8ee7

Set explicit JAVA 11 examples path from gradle

Bug: b/270105162
Change-Id: Id41905b1e7b49d44bcbd56dae68c4ea044637b94

d8_r8/test_modules/tests_java_8/build.gradle.kts

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 f8ef982..25914d4 100644
--- a/d8_r8/test_modules/tests_java_8/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_8/build.gradle.kts
@@ -164,7 +164,10 @@
       dependsOn(thirdPartyRuntimeInternalDependenciesTask)
     }
     dependsOn(*sourceSetDependenciesTasks)
-    environment.put("KEEP_ANNO_COMPILED_OUTPUT", keepAnnoCompileTask.outputs.files.getAsPath())
+    environment.put("KEEP_ANNO_JAVAC_BUILD_DIR", keepAnnoCompileTask.outputs.files.getAsPath())
+    // This path is set when compiling examples jar task in DependenciesPlugin.
+    environment.put("EXAMPLES_JAVA_11_JAVAC_BUILD_DIR",
+                    getRoot().resolveAll("build", "test", "examplesJava11", "classes"))
   }
 
   val testJar by registering(Jar::class) {

src/test/java/com/android/tools/r8/ToolHelper.java

diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index f3fcf7d..e7fe52c 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -134,11 +134,19 @@
   public static final String EXAMPLES_JAVA9_BUILD_DIR = TESTS_BUILD_DIR + "examplesJava9/";
   public static final String EXAMPLES_JAVA10_BUILD_DIR = TESTS_BUILD_DIR + "examplesJava10/";
   public static final String EXAMPLES_JAVA11_JAR_DIR = TESTS_BUILD_DIR + "examplesJava11/";
-  public static final String EXAMPLES_JAVA11_BUILD_DIR = BUILD_DIR + "classes/java/examplesJava11/";
   public static final String EXAMPLES_PROTO_BUILD_DIR = TESTS_BUILD_DIR + "examplesProto/";
   public static final String GENERATED_PROTO_BUILD_DIR = GENERATED_TEST_BUILD_DIR + "proto/";
   public static final String SMALI_BUILD_DIR = THIRD_PARTY_DIR + "smali/";
 
+  public static String getExamplesJava11BuildDir() {
+    // TODO(b/270105162): This changes when new gradle setup is default.
+    if (ToolHelper.isNewGradleSetup()) {
+      return System.getenv("EXAMPLES_JAVA_11_JAVAC_BUILD_DIR");
+    } else {
+      return BUILD_DIR + "classes/java/examplesJava11/";
+    }
+  }
+
   public static final Path CHECKED_IN_R8_17_WITH_DEPS =
       Paths.get(THIRD_PARTY_DIR).resolve("r8").resolve("r8_with_deps_17.jar");
 

src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAccessControlTestUtils.java

diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAccessControlTestUtils.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAccessControlTestUtils.java
index a9fcd68..8f73003 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAccessControlTestUtils.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAccessControlTestUtils.java
@@ -22,7 +22,7 @@
   public static final Path JAR =
       Paths.get(ToolHelper.EXAMPLES_JAVA11_JAR_DIR).resolve("nesthostexample" + JAR_EXTENSION);
   public static final Path CLASSES_PATH =
-      Paths.get(ToolHelper.EXAMPLES_JAVA11_BUILD_DIR).resolve("nesthostexample/");
+      Paths.get(ToolHelper.getExamplesJava11BuildDir()).resolve("nesthostexample/");
   public static final String PACKAGE_NAME = "nesthostexample.";
 
   public static final List<String> CLASS_NAMES =

src/test/java/com/android/tools/r8/keepanno/KeepEdgeAnnotationsTest.java

diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepEdgeAnnotationsTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepEdgeAnnotationsTest.java
index f64dade..72ad93c 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepEdgeAnnotationsTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepEdgeAnnotationsTest.java
@@ -71,7 +71,7 @@
   public static Path getKeepAnnoPath() {
     // TODO(b/270105162): This changes when new gradle setup is default.
     if (ToolHelper.isNewGradleSetup()) {
-      return Paths.get(System.getenv("KEEP_ANNO_COMPILED_OUTPUT").split(":")[0]);
+      return Paths.get(System.getenv("KEEP_ANNO_JAVAC_BUILD_DIR").split(":")[0]);
     } else {
       return Paths.get(ToolHelper.BUILD_DIR, "classes", "java", "keepanno");
     }

src/test/java/com/android/tools/r8/shaking/b169045091/NestMemberAccessibilityTest.java

diff --git a/src/test/java/com/android/tools/r8/shaking/b169045091/NestMemberAccessibilityTest.java b/src/test/java/com/android/tools/r8/shaking/b169045091/NestMemberAccessibilityTest.java
index d4d90eb..0b69df7 100644
--- a/src/test/java/com/android/tools/r8/shaking/b169045091/NestMemberAccessibilityTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/b169045091/NestMemberAccessibilityTest.java
@@ -36,7 +36,7 @@
 public class NestMemberAccessibilityTest extends TestBase {
 
   private final Path TEST_DIRECTORY =
-      Paths.get(ToolHelper.EXAMPLES_JAVA11_BUILD_DIR)
+      Paths.get(ToolHelper.getExamplesJava11BuildDir())
           .resolve(
               DescriptorUtils.getBinaryNameFromJavaType(NestHost.class.getPackage().getName()));