diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-07 00:38:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-07 00:38:07 +0000 |
| commit | 8f45fac3823b88e2127250b1256b45d53a6858a4 (patch) | |
| tree | 6f69ca357880ad984db639194cda5e2008583e3b | |
| parent | f067d36268e9191e95e8f7c18214c9780b668dba (diff) | |
| parent | f890bdae5cb1da9f4f50960625c12f951e7bd87b (diff) | |
| download | misc-8f45fac3823b88e2127250b1256b45d53a6858a4.tar.gz | |
Merge "Make asm-7.0 available to the ART APEX" am: 41ac6d62c6 am: f890bdae5c
Change-Id: I280fa0176bc3d569cbafa0caf84fa9d354b2ac3a
| -rw-r--r-- | common/asm/Android.bp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/common/asm/Android.bp b/common/asm/Android.bp index cbe3b4fa..66b61674 100644 --- a/common/asm/Android.bp +++ b/common/asm/Android.bp @@ -64,32 +64,46 @@ java_import { jars: ["asm-util-6.0.jar"], } +java_defaults { + name: "asm-7.0-defaults", + apex_available: [ + "//apex_available:platform", + "com.android.art.release", + "com.android.art.debug", + ], +} + java_import { name: "asm-7.0", host_supported: true, jars: ["asm-7.0.jar"], + defaults: ["asm-7.0-defaults"], } java_import { name: "asm-analysis-7.0", host_supported: true, jars: ["asm-analysis-7.0.jar"], + defaults: ["asm-7.0-defaults"], } java_import { name: "asm-commons-7.0", host_supported: true, jars: ["asm-commons-7.0.jar"], + defaults: ["asm-7.0-defaults"], } java_import { name: "asm-tree-7.0", host_supported: true, jars: ["asm-tree-7.0.jar"], + defaults: ["asm-7.0-defaults"], } java_import { name: "asm-util-7.0", host_supported: true, jars: ["asm-util-7.0.jar"], + defaults: ["asm-7.0-defaults"], } |