commit 31237c368d0154bb1f59449f5583fca7d44da472
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Oct 13 10:59:53 2023 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Oct 13 10:59:53 2023 +0200
tree f5c3fc22a5a2c25c97343bb5a5f89300396ea6a3
parent 0c3531c1a7ab305616e28d23d5412ef2d4684271

Update test task names in utils.py

Change-Id: Ia4a4e9c8dc391f202ad920549ee1052d4f4b24e9

d8_r8/test/build.gradle.kts

diff --git a/d8_r8/test/build.gradle.kts b/d8_r8/test/build.gradle.kts
index 9df3cc1..ee967fa 100644
--- a/d8_r8/test/build.gradle.kts
+++ b/d8_r8/test/build.gradle.kts
@@ -202,15 +202,15 @@
   val assembleRetraceLibWithRelocatedDeps by registering(Exec::class) {
     dependsOn(assembleR8LibWithRelocatedDeps, mainDepsJarTask, r8WithRelocatedDepsTask)
     val mainDepsJar = mainDepsJarTask.getSingleOutputFile()
-    val r8LibWithRelocatedDeps = assembleR8LibWithRelocatedDeps.getSingleOutputFile()
+    val r8LibWithRelocatedDepsJar = assembleR8LibWithRelocatedDeps.getSingleOutputFile()
     val r8WithRelocatedDepsJar = r8WithRelocatedDepsTask.getSingleOutputFile()
-    inputs.files(mainDepsJar, r8LibWithRelocatedDeps, r8WithRelocatedDepsJar)
-    val inputMap = file("$r8LibWithRelocatedDeps.map")
+    inputs.files(mainDepsJar, r8LibWithRelocatedDepsJar, r8WithRelocatedDepsJar)
+    val inputMap = file("$r8LibWithRelocatedDepsJar.map")
     val outputJar = getRoot().resolveAll("build", "libs", "r8retrace.jar")
     outputs.file(outputJar)
     commandLine = createR8LibCommandLine(
       r8WithRelocatedDepsJar,
-      r8LibWithRelocatedDeps,
+      r8LibWithRelocatedDepsJar,
       outputJar,
       listOf(getRoot().resolveAll("src", "main", "keep_retrace.txt")),
       excludingDepsVariant = false,
@@ -387,7 +387,7 @@
     testR8Lib(assembleR8LibNoDeps, unzipRewrittenTestsForR8LibNoDeps)
   }
 
-  val sourcesJar by registering(Jar::class) {
+  val packageSources by registering(Jar::class) {
     dependsOn(mainSourcesTask)
     dependsOn(resourceShrinkerSourcesTask)
     dependsOn(keepAnnoSourcesTask)

tools/utils.py

diff --git a/tools/utils.py b/tools/utils.py
index 87c9fe0..93314dc 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -46,11 +46,11 @@
 GRADLE_TASK_CONSOLIDATED_LICENSE = ':main:consolidatedLicense'
 GRADLE_TASK_KEEP_ANNO_JAR = ':keepanno:keepAnnoAnnotationsJar'
 GRADLE_TASK_R8 = ':main:r8WithRelocatedDeps'
-GRADLE_TASK_R8LIB = ':test:r8LibWithRelocatedDeps'
-GRADLE_TASK_R8LIB_NO_DEPS = ':test:r8LibNoDeps'
-GRADLE_TASK_RETRACE = ':test:retraceWithRelocatedDeps'
-GRADLE_TASK_RETRACE_NO_DEPS = ':test:retraceNoDeps'
-GRADLE_TASK_SOURCE_JAR = ':test:sourcesJar'
+GRADLE_TASK_R8LIB = ':test:assembleR8LibWithRelocatedDeps'
+GRADLE_TASK_R8LIB_NO_DEPS = ':test:assembleR8LibNoDeps'
+GRADLE_TASK_RETRACE = ':test:assembleRetraceLibWithRelocatedDeps'
+GRADLE_TASK_RETRACE_NO_DEPS = ':test:assembleRetraceLibNoDeps'
+GRADLE_TASK_SOURCE_JAR = ':test:packageSources'
 GRADLE_TASK_SWISS_ARMY_KNIFE = ':main:swissArmyKnife'
 GRADLE_TASK_TEST = ':test:test'
 GRADLE_TASK_ALL_TESTS_WITH_APPLY_MAPPING_JAR = ':test:allTestsWithApplyMapping'