commit 07dfa23c96c0648cb6c483a08b8aa619cd104aa8
author Ian Zerny <zerny@google.com> Thu Feb 01 15:01:21 2024 +0100
committer Ian Zerny <zerny@google.com> Fri Feb 02 12:03:04 2024 +0000
tree e2800037ef51c0e527d0e0fdb1fc057eb1126056
parent 6711c7d3d23c8e7507d3bdc986a170c2db82d70f

Remove unneeded "retrace" path

Change-Id: Icb453f8d1d6d1722cc50827184c8c6c964f237e4

d8_r8/test/build.gradle.kts

diff --git a/d8_r8/test/build.gradle.kts b/d8_r8/test/build.gradle.kts
index 4a1de06..c2f5a0b 100644
--- a/d8_r8/test/build.gradle.kts
+++ b/d8_r8/test/build.gradle.kts
@@ -354,7 +354,6 @@
     systemProperty("EXAMPLES_JAVA_11_JAVAC_BUILD_DIR",
             getRoot().resolveAll("build", "test", "examplesJava11", "classes"))
     systemProperty("R8_RUNTIME_PATH", r8LibJar)
-    systemProperty("RETRACE_RUNTIME_PATH", r8LibJar)
     systemProperty("R8_DEPS", mainDepsJarTask.getSingleOutputFile())
     systemProperty("com.android.tools.r8.artprofilerewritingcompletenesscheck", "true")
 

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 613a7c2..0d492cc 100644
--- a/d8_r8/test_modules/tests_java_8/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_8/build.gradle.kts
@@ -143,11 +143,6 @@
         File.pathSeparator + getRoot().resolveAll("src", "main", "resources") +
         File.pathSeparator + resourceShrinkerJavaCompileTask.outputs.files.getAsPath().split(File.pathSeparator)[0] +
         File.pathSeparator + resourceShrinkerKotlinCompileTask.outputs.files.getAsPath().split(File.pathSeparator)[1])
-    systemProperty(
-      "RETRACE_RUNTIME_PATH",
-      mainCompileTask.outputs.files.getAsPath().split(File.pathSeparator)[0] +
-        File.pathSeparator + mainDepsJarTask.outputs.files.singleFile +
-        File.pathSeparator + getRoot().resolveAll("src", "main", "resources"))
     systemProperty("R8_DEPS", mainDepsJarTask.outputs.files.singleFile)
     systemProperty("com.android.tools.r8.artprofilerewritingcompletenesscheck", "true")
   }

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 2d7a5c0..0831935 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -182,8 +182,7 @@
   }
 
   public static Path getRetracePath() {
-    assert System.getProperty("RETRACE_RUNTIME_PATH") != null;
-    return Paths.get(System.getProperty("RETRACE_RUNTIME_PATH"));
+    return getR8MainPath();
   }
 
   public static Path getKeepAnnoPath() {