diff options
| author | Colin Cross <ccross@android.com> | 2016-12-21 17:09:39 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-02-13 13:05:23 -0800 |
| commit | fec8e5c23d671560c58b0d9affe8c2ab741869b0 (patch) | |
| tree | ad6d5731cf0799a90a147fa9ffd97d3ab0094b1d /common/asm | |
| parent | 6c63582b051dc9eb5af5efd6fb23f53be319d99f (diff) | |
| download | misc-fec8e5c23d671560c58b0d9affe8c2ab741869b0.tar.gz | |
Upgrade to asm 5.2
Needed by desugar tool. Also adds asm-tree.
Test: m -j checkbuild tests cts
Change-Id: I6e455a9a0ab51f10dd03aacfaefe7705cd65944b
Diffstat (limited to 'common/asm')
| -rw-r--r-- | common/asm/Android.mk | 7 | ||||
| -rw-r--r-- | common/asm/PREBUILT | 2 | ||||
| -rw-r--r-- | common/asm/README | 2 | ||||
| -rw-r--r-- | common/asm/asm-5.0.jar | bin | 53297 -> 0 bytes | |||
| -rw-r--r-- | common/asm/asm-5.2.jar | bin | 0 -> 53259 bytes | |||
| -rw-r--r-- | common/asm/asm-commons-5.0.jar | bin | 41796 -> 0 bytes | |||
| -rw-r--r-- | common/asm/asm-commons-5.2.jar | bin | 0 -> 47197 bytes | |||
| -rw-r--r-- | common/asm/asm-tree-5.2.jar | bin | 0 -> 29582 bytes |
8 files changed, 5 insertions, 6 deletions
diff --git a/common/asm/Android.mk b/common/asm/Android.mk index cc523a34..aa84369f 100644 --- a/common/asm/Android.mk +++ b/common/asm/Android.mk @@ -17,9 +17,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_PREBUILT_JAVA_LIBRARIES := \ - asm-5.0$(COMMON_JAVA_PACKAGE_SUFFIX) \ - asm-commons-5.0$(COMMON_JAVA_PACKAGE_SUFFIX) \ - -LOCAL_MODULE_TAGS := optional + asm-5.2.jar \ + asm-commons-5.2.jar \ + asm-tree-5.2.jar include $(BUILD_HOST_PREBUILT) diff --git a/common/asm/PREBUILT b/common/asm/PREBUILT index 933dfce4..adf859bd 100644 --- a/common/asm/PREBUILT +++ b/common/asm/PREBUILT @@ -1,4 +1,4 @@ The objects in this prebuilt directory can be rebuilt using the source archive hosted at -http://download.forge.objectweb.org/asm/asm-5.0.4.tar.gz +http://download.forge.ow2.org/asm/asm-5.2.tar.gz diff --git a/common/asm/README b/common/asm/README index 9afe920e..d60cb6ba 100644 --- a/common/asm/README +++ b/common/asm/README @@ -1,7 +1,7 @@ We have 2 versions of the ASM library in our source tree: The one in prebuilt/common/asm is used for build-time utilities. It -has a module name in the form of "asm-5.0". +has a module name in the form of "asm-5.2". The one in prebuilts/tools/common/asm-tools is shipped in the SDK/tools/lib/ folder. It has modules names in the form of "asm-tools" diff --git a/common/asm/asm-5.0.jar b/common/asm/asm-5.0.jar Binary files differdeleted file mode 100644 index cdb283dd..00000000 --- a/common/asm/asm-5.0.jar +++ /dev/null diff --git a/common/asm/asm-5.2.jar b/common/asm/asm-5.2.jar Binary files differnew file mode 100644 index 00000000..aea11818 --- /dev/null +++ b/common/asm/asm-5.2.jar diff --git a/common/asm/asm-commons-5.0.jar b/common/asm/asm-commons-5.0.jar Binary files differdeleted file mode 100644 index e89265f1..00000000 --- a/common/asm/asm-commons-5.0.jar +++ /dev/null diff --git a/common/asm/asm-commons-5.2.jar b/common/asm/asm-commons-5.2.jar Binary files differnew file mode 100644 index 00000000..cdd2e45c --- /dev/null +++ b/common/asm/asm-commons-5.2.jar diff --git a/common/asm/asm-tree-5.2.jar b/common/asm/asm-tree-5.2.jar Binary files differnew file mode 100644 index 00000000..20394674 --- /dev/null +++ b/common/asm/asm-tree-5.2.jar |