commit f6c74ce120f75093294756559d0a9ada3d1f99da
author Rico Wind <ricow@google.com> Tue Dec 04 08:50:55 2018 +0100
committer Rico Wind <ricow@google.com> Tue Dec 04 08:50:55 2018 +0100
tree 36f1f547d8ca71e216c71460e5b9d52cd37f5584
parent 04587b28c098c52ab7ba3212960a070b515fae1c

Fix dependency for generating R8'ed versions of our tools

Change-Id: I3eefa154f85e758736a0a7370af6be2f1ac1f120

build.gradle

diff --git a/build.gradle b/build.gradle
index b6e669f..6bfb83a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -377,6 +377,16 @@
     }
 }
 
+task downloadOpenJDKrt {
+   cloudDependencies.each { entry ->
+        entry.value.each { entryFile ->
+            if (entryFile.contains("openjdk-rt")) {
+                dependsOn "download_deps_${entry.key}/${entryFile}"
+            }
+        }
+    }
+}
+
 task downloadDx {
     cloudDependencies.each { entry ->
         entry.value.each { entryFile ->
@@ -597,6 +607,7 @@
     inputs.files files(pgconf, "build/libs/r8.jar")
     outputs.file output
     dependsOn R8
+    dependsOn downloadOpenJDKrt
     commandLine r8CfCommandLine(R8.outputs.files[0], output, pgconf)
     workingDir = projectDir
 }
@@ -606,6 +617,7 @@
     def output = "build/libs/d8-r8.jar"
     inputs.files files(pgconf, "build/libs/d8.jar")
     outputs.file output
+    dependsOn downloadOpenJDKrt
     dependsOn D8
     commandLine r8CfCommandLine(R8.outputs.files[0], output, pgconf)
     workingDir = projectDir
@@ -617,6 +629,7 @@
     inputs.files files(pgconf, "build/libs/compatdx.jar")
     outputs.file output
     dependsOn CompatDx
+    dependsOn downloadOpenJDKrt
     commandLine r8CfCommandLine(R8.outputs.files[0], output, pgconf)
     workingDir = projectDir
 }
@@ -627,6 +640,7 @@
     inputs.files files(pgconf, "build/libs/compatproguard.jar")
     outputs.file output
     dependsOn CompatProguard
+    dependsOn downloadOpenJDKrt
     commandLine r8CfCommandLine(R8.outputs.files[0], output, pgconf)
     workingDir = projectDir
 }