From 02fd031e008a5310fa8618a0dd4730cbb06b67a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= <krzysio@google.com>
Date: Fri, 4 Nov 2022 19:23:15 +0000
Subject: [PATCH] Update deps for rmtypedefs and mkstubs.

Use Guava built from source and a newer version of asm.

Test: mm
Bug: 244341573
Change-Id: Ic061b6a9b801f1378fafb23e493f1d29c46b06fe
---
 tools/mkstubs/Android.bp    | 2 +-
 tools/rmtypedefs/Android.bp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/mkstubs/Android.bp b/tools/mkstubs/Android.bp
index 821539de6..19c8acb73 100644
--- a/tools/mkstubs/Android.bp
+++ b/tools/mkstubs/Android.bp
@@ -22,5 +22,5 @@ java_library_host {
     name: "mkstubs",
     srcs: ["src/**/*.java"],
     manifest: "manifest.txt",
-    static_libs: ["asm-5.2"],
+    static_libs: ["asm-9.2"],
 }
diff --git a/tools/rmtypedefs/Android.bp b/tools/rmtypedefs/Android.bp
index a548241e0..a5a98d66f 100644
--- a/tools/rmtypedefs/Android.bp
+++ b/tools/rmtypedefs/Android.bp
@@ -22,7 +22,7 @@ java_binary_host {
     manifest: "etc/manifest.txt",
     wrapper: "etc/rmtypedefs",
     static_libs: [
-        "asm-5.2",
-        "guava-21.0",
+        "asm-9.2",
+        "guava",
     ],
 }