Merge "Upgrade to asm 5.0.4"
diff --git a/common/asm/Android.mk b/common/asm/Android.mk
index afcfe13..5f56b79 100644
--- a/common/asm/Android.mk
+++ b/common/asm/Android.mk
@@ -17,7 +17,7 @@
include $(CLEAR_VARS)
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- asm-4.0$(COMMON_JAVA_PACKAGE_SUFFIX)
+ asm-5.0$(COMMON_JAVA_PACKAGE_SUFFIX)
LOCAL_MODULE_TAGS := optional
diff --git a/common/asm/LICENSE.txt b/common/asm/LICENSE.txt
index 9496b17..cc7942e 100644
--- a/common/asm/LICENSE.txt
+++ b/common/asm/LICENSE.txt
@@ -1,6 +1,6 @@
ASM: a very small and fast Java bytecode manipulation framework
- Copyright (c) 2000-2005 INRIA, France Telecom
+ Copyright (c) 2012 France Télécom
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/common/asm/PREBUILT b/common/asm/PREBUILT
index e8b605f..933dfce 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-4.0.tar.gz
+http://download.forge.objectweb.org/asm/asm-5.0.4.tar.gz
diff --git a/common/asm/README b/common/asm/README
index 27bd6c0..9afe920 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-4.0".
+has a module name in the form of "asm-5.0".
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-4.0.jar b/common/asm/asm-4.0.jar
deleted file mode 100644
index 6d63075..0000000
--- a/common/asm/asm-4.0.jar
+++ /dev/null
Binary files differ
diff --git a/common/asm/asm-5.0.jar b/common/asm/asm-5.0.jar
new file mode 100644
index 0000000..cdb283d
--- /dev/null
+++ b/common/asm/asm-5.0.jar
Binary files differ
diff --git a/common/asm/src.zip b/common/asm/src.zip
index cea145e..542e021 100644
--- a/common/asm/src.zip
+++ b/common/asm/src.zip
Binary files differ
