commit b267e5def06b81702a8d94c902141de1a57a4f58
author Rico Wind <ricow@google.com> Thu Sep 14 13:14:14 2023 +0200
committer Rico Wind <ricow@google.com> Thu Sep 14 11:36:42 2023 +0000
tree 8e5ed77015a07a373aef9942ec2c7503e7e31f61
parent 34f8064110ee4278d4dd0dbd79d245b2cc3c0dad

Place r8 with relocated deps into build/libs/r8.jar

Place r8lib excluding deps in to build/libs

Change-Id: I4d59a9cd0d330ecd03d2f169bbdcac21f67a1ec3

d8_r8/main/build.gradle.kts

diff --git a/d8_r8/main/build.gradle.kts b/d8_r8/main/build.gradle.kts
index 5ddc69a..c34d924 100644
--- a/d8_r8/main/build.gradle.kts
+++ b/d8_r8/main/build.gradle.kts
@@ -168,7 +168,7 @@
     val swissArmy = swissArmyKnife.get().outputs.getFiles().getSingleFile()
     val deps = depsJar.get().outputs.files.getSingleFile()
     inputs.files(listOf(swissArmy, deps))
-    val output = getRoot().resolveAll("build", "libs", "r8-with-relocated-deps.jar")
+    val output = getRoot().resolveAll("build", "libs", "r8.jar")
     outputs.file(output)
     commandLine = baseCompilerCommandLine(
       swissArmy,

d8_r8/test/build.gradle.kts

diff --git a/d8_r8/test/build.gradle.kts b/d8_r8/test/build.gradle.kts
index d73a82d..2e5d20f 100644
--- a/d8_r8/test/build.gradle.kts
+++ b/d8_r8/test/build.gradle.kts
@@ -94,7 +94,7 @@
     val r8Jar = swissArmyKnifeTask.outputs.files.getSingleFile()
     val deps = mainDepsJarTask.outputs.files.getSingleFile()
     inputs.files(listOf(r8Compiler, r8Jar, deps))
-    val output = file(Paths.get("build", "libs", "r8lib-exclude-deps.jar"))
+    val output =  getRoot().resolveAll("build", "libs", "r8lib-exclude-deps.jar")
     outputs.file(output)
     commandLine = createR8LibCommandLine(
       r8Compiler,