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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2288134 Change-Id: I4b3861bcdd953f78a209063140d9fa19be7ac9df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 18:47:51 +00:00
parent 30919118f9 b1e981dd69
commit d4f2a8e747
2 changed files with 2 additions and 2 deletions
--- a/tools/locked_region_code_injection/Android.bp
+++ b/tools/locked_region_code_injection/Android.bp
@@ -16,6 +16,6 @@ java_binary_host {
        "asm-commons-9.2",
        "asm-tree-9.2",
        "asm-analysis-9.2",
-        "guava-21.0",
+        "guava",
    ],
 }
--- a/tools/traceinjection/Android.bp
+++ b/tools/traceinjection/Android.bp
@@ -16,7 +16,7 @@ java_binary_host {
        "asm-commons-9.2",
        "asm-tree-9.2",
        "asm-analysis-9.2",
-        "guava-21.0",
+        "guava",
    ],
 }