aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllen Hair <allenhair@google.com>2022-03-22 17:43:35 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-22 17:43:35 +0000
commit3f7de11b7b6c1b2ea6aaf6d9edabf9f23c669d8f (patch)
tree3db65b6276ccf20df8aaeae9f628a403e821969f
parent8a6e51becaece1eb8764fe253e196015c3311279 (diff)
parentec0f336191d2fba16b1cbe11c15511f268bc5136 (diff)
downloadlayoutlib-3f7de11b7b6c1b2ea6aaf6d9edabf9f23c669d8f.tar.gz
Merge "Update asm-7.0 to asm-9.2." am: b48d95cd69 am: ec0f336191
Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/2016076 Change-Id: I20f888af278686392fa7f6b2911461ac359ce4d0
-rw-r--r--create/Android.bp4
-rw-r--r--create/tests/Android.bp2
2 files changed, 3 insertions, 3 deletions
diff --git a/create/Android.bp b/create/Android.bp
index 22035bd134..7cdea593e0 100644
--- a/create/Android.bp
+++ b/create/Android.bp
@@ -25,8 +25,8 @@ java_binary_host {
main_class: "com.android.tools.layoutlib.create.Main",
static_libs: [
- "asm-7.0",
- "asm-commons-7.0",
+ "asm-9.2",
+ "asm-commons-9.2",
"guava",
"layoutlib-common",
],
diff --git a/create/tests/Android.bp b/create/tests/Android.bp
index b64b484598..b5e7033f0d 100644
--- a/create/tests/Android.bp
+++ b/create/tests/Android.bp
@@ -39,7 +39,7 @@ java_test_host {
"junit",
"hamcrest",
],
- static_libs: ["asm-7.0"],
+ static_libs: ["asm-9.2"],
// Copy the jar to DIST_DIR for sdk builds
dist: {