Commit e7ed11f0 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Android: Set bytecode rewriters to use ASM7

This allows them to process code targeting JDK11.

Bug: 693079
Change-Id: If638e78796d2f2098cb0c0f0fc0b89739b5d43e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1882627
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709908}
parent f83aca34
......@@ -49,14 +49,14 @@ import org.objectweb.asm.Opcodes;
*/
class AssertionEnablerClassAdapter extends ClassVisitor {
AssertionEnablerClassAdapter(ClassVisitor visitor) {
super(Opcodes.ASM5, visitor);
super(Opcodes.ASM7, visitor);
}
@Override
public MethodVisitor visitMethod(final int access, final String name, String desc,
String signature, String[] exceptions) {
return new RewriteAssertMethodVisitor(
Opcodes.ASM5, super.visitMethod(access, name, desc, signature, exceptions));
Opcodes.ASM7, super.visitMethod(access, name, desc, signature, exceptions));
}
static class RewriteAssertMethodVisitor extends MethodVisitor {
......
......@@ -8,7 +8,7 @@ import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
import static org.objectweb.asm.Opcodes.ACONST_NULL;
import static org.objectweb.asm.Opcodes.ALOAD;
import static org.objectweb.asm.Opcodes.ARETURN;
import static org.objectweb.asm.Opcodes.ASM5;
import static org.objectweb.asm.Opcodes.ASM7;
import static org.objectweb.asm.Opcodes.BIPUSH;
import static org.objectweb.asm.Opcodes.GETSTATIC;
import static org.objectweb.asm.Opcodes.IFNE;
......@@ -78,7 +78,7 @@ class CustomResourcesClassAdapter extends ClassVisitor {
CustomResourcesClassAdapter(ClassVisitor visitor, String className, String superClassName,
ClassLoader classLoader) {
super(ASM5, visitor);
super(ASM7, visitor);
this.mClassName = className;
this.mSuperClassName = superClassName;
this.mClassLoader = classLoader;
......@@ -165,7 +165,7 @@ class CustomResourcesClassAdapter extends ClassVisitor {
*/
private static final class RewriteGetIdentifierMethodVisitor extends MethodVisitor {
RewriteGetIdentifierMethodVisitor(MethodVisitor mv) {
super(ASM5, mv);
super(ASM7, mv);
}
@Override
......
......@@ -4,7 +4,7 @@
package org.chromium.bytecode;
import static org.objectweb.asm.Opcodes.ASM5;
import static org.objectweb.asm.Opcodes.ASM7;
import static org.objectweb.asm.Opcodes.INVOKESTATIC;
import org.objectweb.asm.AnnotationVisitor;
......@@ -27,7 +27,7 @@ class ThreadAssertionClassAdapter extends ClassVisitor {
"Landroid/support/annotation/WorkerThread;";
ThreadAssertionClassAdapter(ClassVisitor visitor) {
super(ASM5, visitor);
super(ASM7, visitor);
}
@Override
......@@ -41,7 +41,7 @@ class ThreadAssertionClassAdapter extends ClassVisitor {
String mAssertMethodName = "";
AddAssertMethodVisitor(MethodVisitor mv) {
super(ASM5, mv);
super(ASM7, mv);
}
/**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment