Merge "Add ASM 4.0 to prebuilts/tools/"
diff --git a/common/asm-tools/Android.mk b/common/asm-tools/Android.mk
new file mode 100644
index 0000000..f3c4eb8
--- /dev/null
+++ b/common/asm-tools/Android.mk
@@ -0,0 +1,25 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PREBUILT_JAVA_LIBRARIES := \
+    asm-tools:asm-4.0$(COMMON_JAVA_PACKAGE_SUFFIX) \
+    asm-tree-tools:asm-tree-4.0$(COMMON_JAVA_PACKAGE_SUFFIX)
+
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_HOST_PREBUILT)
diff --git a/common/asm-tools/LICENSE.txt b/common/asm-tools/LICENSE.txt
new file mode 100644
index 0000000..9496b17
--- /dev/null
+++ b/common/asm-tools/LICENSE.txt
@@ -0,0 +1,28 @@
+

+ ASM: a very small and fast Java bytecode manipulation framework

+ Copyright (c) 2000-2005 INRIA, France Telecom

+ All rights reserved.

+

+ Redistribution and use in source and binary forms, with or without

+ modification, are permitted provided that the following conditions

+ are met:

+ 1. Redistributions of source code must retain the above copyright

+    notice, this list of conditions and the following disclaimer.

+ 2. Redistributions in binary form must reproduce the above copyright

+    notice, this list of conditions and the following disclaimer in the

+    documentation and/or other materials provided with the distribution.

+ 3. Neither the name of the copyright holders nor the names of its

+    contributors may be used to endorse or promote products derived from

+    this software without specific prior written permission.

+

+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF

+ THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/common/asm-tools/MODULE_LICENSE_BSD_LIKE b/common/asm-tools/MODULE_LICENSE_BSD_LIKE
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/common/asm-tools/MODULE_LICENSE_BSD_LIKE
diff --git a/common/asm-tools/PREBUILT b/common/asm-tools/PREBUILT
new file mode 100644
index 0000000..e8b605f
--- /dev/null
+++ b/common/asm-tools/PREBUILT
@@ -0,0 +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
diff --git a/common/asm-tools/README b/common/asm-tools/README
new file mode 100644
index 0000000..27bd6c0
--- /dev/null
+++ b/common/asm-tools/README
@@ -0,0 +1,13 @@
+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".
+
+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"
+and "asm-tree-tools" for example.
+
+These are maintained separately because the prebuilt/ version is
+branched with the platform, and the prebuilts/tools/ version is
+branched with the tools, and these have different release schedules
+and branches.
diff --git a/common/asm-tools/asm-4.0.jar b/common/asm-tools/asm-4.0.jar
new file mode 100644
index 0000000..6d63075
--- /dev/null
+++ b/common/asm-tools/asm-4.0.jar
Binary files differ
diff --git a/common/asm-tools/asm-analysis-4.0.jar b/common/asm-tools/asm-analysis-4.0.jar
new file mode 100644
index 0000000..48bb9b8
--- /dev/null
+++ b/common/asm-tools/asm-analysis-4.0.jar
Binary files differ
diff --git a/common/asm-tools/asm-commons-4.0.jar b/common/asm-tools/asm-commons-4.0.jar
new file mode 100644
index 0000000..8d564b1
--- /dev/null
+++ b/common/asm-tools/asm-commons-4.0.jar
Binary files differ
diff --git a/common/asm-tools/asm-tree-4.0.jar b/common/asm-tools/asm-tree-4.0.jar
new file mode 100644
index 0000000..aa99d3a
--- /dev/null
+++ b/common/asm-tools/asm-tree-4.0.jar
Binary files differ
diff --git a/common/asm-tools/asm-util-4.0.jar b/common/asm-tools/asm-util-4.0.jar
new file mode 100644
index 0000000..0e10595
--- /dev/null
+++ b/common/asm-tools/asm-util-4.0.jar
Binary files differ
diff --git a/common/asm-tools/asm-xml-4.0.jar b/common/asm-tools/asm-xml-4.0.jar
new file mode 100644
index 0000000..fe5d718
--- /dev/null
+++ b/common/asm-tools/asm-xml-4.0.jar
Binary files differ
diff --git a/common/asm-tools/src.zip b/common/asm-tools/src.zip
new file mode 100644
index 0000000..cea145e
--- /dev/null
+++ b/common/asm-tools/src.zip
Binary files differ