commit b1e981dd6982e93b3fe9719bea9ba25d1765cb77
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 07 18:02:40 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 07 18:02:40 2022 +0000
tree 3ff8bfdbadd64ecb407cef8832ea4b9fe00bdeff
parent 2f81ba23b182f6809ad714b53d5a3d886d239ab5
parent 927a9ea7b9734deef0302b1b83678777b4c4d20d

Merge "Use Guava built from source in tools." am: 927a9ea7b9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2288134

Change-Id: I26370d3d3156e4a98ed4dae089f00ff993fd686b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tools/locked_region_code_injection/Android.bp

diff --git a/tools/locked_region_code_injection/Android.bp b/tools/locked_region_code_injection/Android.bp
index 6efd1f6..ff1f8e2 100644
--- a/tools/locked_region_code_injection/Android.bp
+++ b/tools/locked_region_code_injection/Android.bp
@@ -16,6 +16,6 @@
         "asm-commons-9.2",
         "asm-tree-9.2",
         "asm-analysis-9.2",
-        "guava-21.0",
+        "guava",
     ],
 }

tools/traceinjection/Android.bp

diff --git a/tools/traceinjection/Android.bp b/tools/traceinjection/Android.bp
index 39d1b1c..bb32df6 100644
--- a/tools/traceinjection/Android.bp
+++ b/tools/traceinjection/Android.bp
@@ -16,7 +16,7 @@
         "asm-commons-9.2",
         "asm-tree-9.2",
         "asm-analysis-9.2",
-        "guava-21.0",
+        "guava",
     ],
 }