aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse/plugins
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2014-12-19 18:10:05 -0800
committerTor Norbye <tnorbye@google.com>2014-12-19 18:16:49 -0800
commit22289161515b34689da70365a9e0549c7aafc994 (patch)
treea0d9977646a5d503ab7c4dbb1a4fc47d48eff8d1 /eclipse/plugins
parent028925bbfa330eee5d4b43e10b9f7f1c0fc6863f (diff)
downloadsdk-22289161515b34689da70365a9e0549c7aafc994.zip
sdk-22289161515b34689da70365a9e0549c7aafc994.tar.gz
sdk-22289161515b34689da70365a9e0549c7aafc994.tar.bz2
Update ADT with ASM 5.0.3
Change-Id: I03d846ce1bf9210ca8c35da9cf11a395fd950251
Diffstat (limited to 'eclipse/plugins')
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/.classpath6
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF6
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectClassLoader.java2
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.tests/.classpath6
4 files changed, 10 insertions, 10 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
index fcf27a5..4476b4c 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath
@@ -14,9 +14,9 @@
<classpathentry exported="true" kind="lib" path="libs/manifest-merger.jar" sourcepath="/ManifestMerger"/>
<classpathentry exported="true" kind="lib" path="libs/lombok-ast-0.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="libs/propertysheet.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/asm-4.0.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/asm-analysis-4.0.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/asm-tree-4.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/asm-5.0.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/asm-analysis-5.0.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/asm-tree-5.0.3.jar"/>
<classpathentry exported="true" kind="lib" path="libs/swtmenubar.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
index 9c8158b..5f20b0f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
@@ -12,9 +12,9 @@ Bundle-ClassPath: .,
libs/lint-api.jar,
libs/lint-checks.jar,
libs/lombok-ast-0.2.2.jar,
- libs/asm-4.0.jar,
- libs/asm-tree-4.0.jar,
- libs/asm-analysis-4.0.jar,
+ libs/asm-5.0.3.jar,
+ libs/asm-tree-5.0.3.jar,
+ libs/asm-analysis-5.0.3.jar,
libs/propertysheet.jar,
libs/ant-glob.jar,
libs/swtmenubar.jar,
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectClassLoader.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectClassLoader.java
index 38460a4..e07f099 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectClassLoader.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectClassLoader.java
@@ -177,7 +177,7 @@ public final class ProjectClassLoader extends ClassLoader {
public static byte[] rewriteClass(byte[] classData, final int maxVersion, final int minVersion) {
assert maxVersion >= minVersion;
ClassWriter classWriter = new ClassWriter(0);
- ClassVisitor classVisitor = new ClassVisitor(Opcodes.ASM4, classWriter) {
+ ClassVisitor classVisitor = new ClassVisitor(Opcodes.ASM5, classWriter) {
@Override
public void visit(int version, int access, String name, String signature,
String superName, String[] interfaces) {
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
index 83bfa23..af8e888 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath
@@ -17,8 +17,8 @@
<classpathentry kind="lib" path="/plugin-adt/libs/lint-checks.jar" sourcepath="/lint-checks"/>
<classpathentry kind="lib" path="/plugin-base/libs/sdk-common.jar"/>
<classpathentry kind="lib" path="/plugin-adt/libs/lombok-ast-0.2.2.jar"/>
- <classpathentry kind="lib" path="/plugin-adt/libs/asm-4.0.jar"/>
- <classpathentry kind="lib" path="/plugin-adt/libs/asm-analysis-4.0.jar"/>
- <classpathentry kind="lib" path="/plugin-adt/libs/asm-tree-4.0.jar"/>
+ <classpathentry kind="lib" path="/plugin-adt/libs/asm-5.0.3.3.3.jar"/>
+ <classpathentry kind="lib" path="/plugin-adt/libs/asm-analysis-5.0.3.jar"/>
+ <classpathentry kind="lib" path="/plugin-adt/libs/asm-tree-5.0.3.jar"/>
<classpathentry kind="lib" path="/plugin-adt/libs/manifest-merger.jar" sourcepath="/manifest-merger"/>
</classpath>