Use Opcodes.ASM9 as the ASM version
Bug: 233029164
Test: TH
Change-Id: Iabb356da27b63625cc48b70a462d9b575ee38dcd
diff --git a/build/android/bytecode/java/org/chromium/bytecode/EmptyOverrideGeneratorClassAdapter.java b/build/android/bytecode/java/org/chromium/bytecode/EmptyOverrideGeneratorClassAdapter.java
index 3cf3a83..f5009d8 100644
--- a/build/android/bytecode/java/org/chromium/bytecode/EmptyOverrideGeneratorClassAdapter.java
+++ b/build/android/bytecode/java/org/chromium/bytecode/EmptyOverrideGeneratorClassAdapter.java
@@ -7,7 +7,7 @@
import static org.objectweb.asm.Opcodes.ACC_ABSTRACT;
import static org.objectweb.asm.Opcodes.ACC_INTERFACE;
import static org.objectweb.asm.Opcodes.ALOAD;
-import static org.objectweb.asm.Opcodes.ASM7;
+import static org.objectweb.asm.Opcodes.ASM9;
import static org.objectweb.asm.Opcodes.ILOAD;
import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
import static org.objectweb.asm.Opcodes.IRETURN;
@@ -26,7 +26,7 @@
public EmptyOverrideGeneratorClassAdapter(
ClassVisitor cv, ArrayList<MethodDescription> methodsToGenerate) {
- super(ASM7, cv);
+ super(ASM9, cv);
mMethodsToGenerate = methodsToGenerate;
}
diff --git a/build/android/bytecode/java/org/chromium/bytecode/FragmentActivityReplacer.java b/build/android/bytecode/java/org/chromium/bytecode/FragmentActivityReplacer.java
index 0966be0..1e02aab 100644
--- a/build/android/bytecode/java/org/chromium/bytecode/FragmentActivityReplacer.java
+++ b/build/android/bytecode/java/org/chromium/bytecode/FragmentActivityReplacer.java
@@ -96,7 +96,7 @@
private final ClassLoader mClassLoader;
private InvocationReplacer(ClassVisitor baseVisitor, boolean singleAndroidX) {
- super(Opcodes.ASM7, baseVisitor);
+ super(Opcodes.ASM9, baseVisitor);
mSingleAndroidX = singleAndroidX;
mClassLoader = new ResourceStubbingClassLoader();
}
@@ -105,7 +105,7 @@
public MethodVisitor visitMethod(
int access, String name, String descriptor, String signature, String[] exceptions) {
MethodVisitor base = super.visitMethod(access, name, descriptor, signature, exceptions);
- return new MethodVisitor(Opcodes.ASM7, base) {
+ return new MethodVisitor(Opcodes.ASM9, base) {
@Override
public void visitMethodInsn(int opcode, String owner, String name,
String descriptor, boolean isInterface) {
@@ -218,7 +218,7 @@
*/
private static class FragmentClassVisitor extends ClassVisitor {
private FragmentClassVisitor(ClassVisitor baseVisitor) {
- super(Opcodes.ASM7, baseVisitor);
+ super(Opcodes.ASM9, baseVisitor);
}
@Override
@@ -276,7 +276,7 @@
*/
private static class SupportLifecycleFragmentImplClassVisitor extends ClassVisitor {
private SupportLifecycleFragmentImplClassVisitor(ClassVisitor baseVisitor) {
- super(Opcodes.ASM7, baseVisitor);
+ super(Opcodes.ASM9, baseVisitor);
}
@Override
diff --git a/build/android/bytecode/java/org/chromium/bytecode/MethodCheckerClassAdapter.java b/build/android/bytecode/java/org/chromium/bytecode/MethodCheckerClassAdapter.java
index 6794a77..20ec227 100644
--- a/build/android/bytecode/java/org/chromium/bytecode/MethodCheckerClassAdapter.java
+++ b/build/android/bytecode/java/org/chromium/bytecode/MethodCheckerClassAdapter.java
@@ -7,7 +7,7 @@
import static org.objectweb.asm.ClassReader.EXPAND_FRAMES;
import static org.objectweb.asm.Opcodes.ACC_ABSTRACT;
import static org.objectweb.asm.Opcodes.ACC_INTERFACE;
-import static org.objectweb.asm.Opcodes.ASM7;
+import static org.objectweb.asm.Opcodes.ASM9;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
@@ -45,7 +45,7 @@
public MethodCheckerClassAdapter(
ArrayList<MethodDescription> methodsToCheck, ClassLoader jarClassLoader) {
- super(ASM7);
+ super(ASM9);
mMethodsToCheck = methodsToCheck;
mJarClassLoader = jarClassLoader;
}
diff --git a/build/android/bytecode/java/org/chromium/bytecode/ParentMethodCheckerClassAdapter.java b/build/android/bytecode/java/org/chromium/bytecode/ParentMethodCheckerClassAdapter.java
index 4656c34..3bd0db4 100644
--- a/build/android/bytecode/java/org/chromium/bytecode/ParentMethodCheckerClassAdapter.java
+++ b/build/android/bytecode/java/org/chromium/bytecode/ParentMethodCheckerClassAdapter.java
@@ -8,7 +8,7 @@
import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
import static org.objectweb.asm.Opcodes.ACC_PROTECTED;
import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static org.objectweb.asm.Opcodes.ASM7;
+import static org.objectweb.asm.Opcodes.ASM9;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.MethodVisitor;
@@ -30,7 +30,7 @@
public ParentMethodCheckerClassAdapter(
ArrayList<MethodDescription> methodsToCheck, ClassLoader jarClassLoader) {
- super(ASM7);
+ super(ASM9);
mMethodsToCheck = methodsToCheck;
mJarClassLoader = jarClassLoader;
}
diff --git a/build/android/bytecode/java/org/chromium/bytecode/TraceEventAdderClassAdapter.java b/build/android/bytecode/java/org/chromium/bytecode/TraceEventAdderClassAdapter.java
index f2d03fb..1b86495 100644
--- a/build/android/bytecode/java/org/chromium/bytecode/TraceEventAdderClassAdapter.java
+++ b/build/android/bytecode/java/org/chromium/bytecode/TraceEventAdderClassAdapter.java
@@ -4,7 +4,7 @@
package org.chromium.bytecode;
-import static org.objectweb.asm.Opcodes.ASM7;
+import static org.objectweb.asm.Opcodes.ASM9;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.MethodVisitor;
@@ -20,7 +20,7 @@
private String mShortClassName;
TraceEventAdderClassAdapter(ClassVisitor visitor, ArrayList<MethodDescription> methodsToTrace) {
- super(ASM7, visitor);
+ super(ASM9, visitor);
mMethodsToTrace = methodsToTrace;
}
diff --git a/build/android/bytecode/java/org/chromium/bytecode/TraceEventAdderMethodAdapter.java b/build/android/bytecode/java/org/chromium/bytecode/TraceEventAdderMethodAdapter.java
index 11f2a27..2c1afed 100644
--- a/build/android/bytecode/java/org/chromium/bytecode/TraceEventAdderMethodAdapter.java
+++ b/build/android/bytecode/java/org/chromium/bytecode/TraceEventAdderMethodAdapter.java
@@ -4,7 +4,7 @@
package org.chromium.bytecode;
-import static org.objectweb.asm.Opcodes.ASM7;
+import static org.objectweb.asm.Opcodes.ASM9;
import static org.objectweb.asm.Opcodes.ATHROW;
import static org.objectweb.asm.Opcodes.INVOKESTATIC;
import static org.objectweb.asm.Opcodes.IRETURN;
@@ -56,7 +56,7 @@
public TraceEventAdderMethodAdapter(
MethodVisitor methodVisitor, String shortClassName, String methodName) {
- super(ASM7, methodVisitor);
+ super(ASM9, methodVisitor);
mEventName = shortClassName + "." + methodName;
}
