commit 2450c55b88caa524d94f890358946fd226c26387
author Krzysztof Kosiński <krzysio@google.com> Fri Nov 04 21:35:51 2022 +0000
committer Krzysztof Kosiński <krzysio@google.com> Thu Nov 10 19:10:14 2022 +0000
tree 9625d10096ed9088c978f3c568e9d0b182270057
parent 141675a123b699a86de0918d71719a43571ec905

Use Guava built from source for AndroidX prebuilts.

Bug: 244341573
Bug: 258221936
Test: presubmit
Change-Id: I74cf3e73d8bd383a8748ef5db1d4bb5fb2587880
Test: None

current/androidx/Android.bp

diff --git a/current/androidx/Android.bp b/current/androidx/Android.bp
index 1a920a7..f087745 100644
--- a/current/androidx/Android.bp
+++ b/current/androidx/Android.bp
@@ -4482,7 +4482,7 @@
         "kotlinx_metadata_jvm",
         "commons-codec",
         "jetbrains-annotations",
-        "guava-21.0",
+        "guava",
     ],
     java_version: "1.7",
 }

update_prebuilts/update_prebuilts.py

diff --git a/update_prebuilts/update_prebuilts.py b/update_prebuilts/update_prebuilts.py
index 46d8e44..6a95dcc 100755
--- a/update_prebuilts/update_prebuilts.py
+++ b/update_prebuilts/update_prebuilts.py
@@ -260,7 +260,7 @@
     'androidx.room:room-compiler': {
         'host': True,
         'extra-static-libs': {
-            'guava-21.0'
+            'guava'
         }
     },
     'androidx.room:room-migration': {