commit 4d244c3a322a61eb22d1006d3b13148baa4ef630
author Morten Krogh-Jespersen <mkroghj@google.com> Thu Sep 14 09:20:02 2023 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Thu Sep 14 07:34:32 2023 +0000
tree b8f5089c8e862445cccb83c859968ed3b7f8d74b
parent ff8a1cbb3d1fc9ec633dc1230afd8f83fa263a19

Fix desugar library tests by downloading guava-jre

Bug: b/270105162
Change-Id: I363bc2b286ece2c0a0d61f99ffe196b93a755f55

d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt

diff --git a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
index 9dd2b09..d4ccc60 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
@@ -402,6 +402,10 @@
     "gson",
     Paths.get("third_party", "gson", "gson-2.10.1").toFile(),
     Paths.get("third_party", "gson", "gson-2.10.1.tar.gz.sha1").toFile())
+  val guavaJre = ThirdPartyDependency(
+    "guava-jre",
+    Paths.get("third_party", "guava", "guava-32.1.2-jre").toFile(),
+    Paths.get("third_party", "guava", "guava-32.1.2-jre.tar.gz.sha1").toFile())
   val desugarJdkLibs11 = ThirdPartyDependency(
     "desugar-jdk-libs-11",
     Paths.get("third_party", "openjdk", "desugar_jdk_libs_11").toFile(),
@@ -642,6 +646,7 @@
   ThirdPartyDeps.desugarJdkLibs11,
   ThirdPartyDeps.examplesAndroidOLegacy,
   ThirdPartyDeps.gson,
+  ThirdPartyDeps.guavaJre,
   ThirdPartyDeps.jacoco,
   ThirdPartyDeps.java8Runtime,
   ThirdPartyDeps.jdk11Test,