diff options
| author | Allen Hair <allenhair@google.com> | 2022-03-22 17:50:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-22 17:50:57 +0000 |
| commit | 1ece9cec57c5e76876826e280833d27df6aa4e09 (patch) | |
| tree | 04a073792c5343b320d1a8a3898e231b113f84a0 | |
| parent | 127be7019ec6c3109904f5943b83389c118a2d2f (diff) | |
| parent | 3f7de11b7b6c1b2ea6aaf6d9edabf9f23c669d8f (diff) | |
| download | layoutlib-android13-qpr2-s2-release.tar.gz | |
Merge "Update asm-7.0 to asm-9.2." am: b48d95cd69 am: ec0f336191 am: 3f7de11b7bt_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-release
Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/2016076
Change-Id: Ib3c346805d29e190931a6e73409d9854b7cd2c5a
| -rw-r--r-- | create/Android.bp | 4 | ||||
| -rw-r--r-- | create/tests/Android.bp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/create/Android.bp b/create/Android.bp index 2be2680d1a..96622e958e 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", "layoutlib_create-classpath", 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: { |