diff options
author | Sorin Basca <sorinbasca@google.com> | 2022-05-24 16:36:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-24 16:36:24 +0000 |
commit | 5ba764dec879ba5b8f370e5c41d2a63cf05f7aed (patch) | |
tree | d0be614b63c67f6986734b5e3ee200bfe107a3a1 | |
parent | b1a1069e3f2d394bb143bd768713c60c85cce0e7 (diff) | |
parent | 79c6383b54915d1d4af7766d05e4733559eb611e (diff) | |
download | jarjar-5ba764dec879ba5b8f370e5c41d2a63cf05f7aed.tar.gz |
Update ASM usage to ASM9 am: 019476e4b5 am: cfc4dab18b am: 79c6383b54
Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2104327
Change-Id: I741274b5d858cef36de01dd73ca885b9b47f4ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
4 files changed, 15 insertions, 13 deletions
diff --git a/src/android/com/android/jarjar/RemoveAndroidCompatAnnotationsJarTransformer.java b/src/android/com/android/jarjar/RemoveAndroidCompatAnnotationsJarTransformer.java index f9e5e14..052e358 100644 --- a/src/android/com/android/jarjar/RemoveAndroidCompatAnnotationsJarTransformer.java +++ b/src/android/com/android/jarjar/RemoveAndroidCompatAnnotationsJarTransformer.java @@ -33,6 +33,8 @@ import java.util.function.Supplier; */ public final class RemoveAndroidCompatAnnotationsJarTransformer extends JarTransformer { + private static int ASM_VERSION = Opcodes.ASM9; + private static final Set<String> REMOVE_ANNOTATIONS = Set.of( "Landroid/compat/annotation/UnsupportedAppUsage;"); @@ -51,7 +53,7 @@ public final class RemoveAndroidCompatAnnotationsJarTransformer extends JarTrans private boolean isClassRemapped; AnnotationRemover(ClassVisitor cv) { - super(Opcodes.ASM7, cv); + super(ASM_VERSION, cv); } @Override @@ -74,7 +76,7 @@ public final class RemoveAndroidCompatAnnotationsJarTransformer extends JarTrans Object value) { FieldVisitor superVisitor = super.visitField(access, name, descriptor, signature, value); - return new FieldVisitor(Opcodes.ASM7, superVisitor) { + return new FieldVisitor(ASM_VERSION, superVisitor) { @Override public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) { return visitAnnotationCommon(descriptor, @@ -89,7 +91,7 @@ public final class RemoveAndroidCompatAnnotationsJarTransformer extends JarTrans String signature, String[] exceptions) { MethodVisitor superVisitor = super.visitMethod(access, name, descriptor, signature, exceptions); - return new MethodVisitor(Opcodes.ASM7, superVisitor) { + return new MethodVisitor(ASM_VERSION, superVisitor) { @Override public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) { return visitAnnotationCommon(descriptor, diff --git a/src/main/com/tonicsystems/jarjar/EmptyClassVisitor.java b/src/main/com/tonicsystems/jarjar/EmptyClassVisitor.java index c7614a1..9a05516 100644 --- a/src/main/com/tonicsystems/jarjar/EmptyClassVisitor.java +++ b/src/main/com/tonicsystems/jarjar/EmptyClassVisitor.java @@ -22,29 +22,29 @@ import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; /** - * An ASM3 EmptyVisitor replacement + * An EmptyVisitor replacement * @author <a href="mailto:blackdrag@gmx.org">Jochen "blackdrag" Theodorou</a> */ public class EmptyClassVisitor extends ClassVisitor { public EmptyClassVisitor() { - super(Opcodes.ASM7); + super(Opcodes.ASM9); } @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - return new MethodVisitor(Opcodes.ASM7) {}; + return new MethodVisitor(Opcodes.ASM9) {}; } @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - return new AnnotationVisitor(Opcodes.ASM7) {}; + return new AnnotationVisitor(Opcodes.ASM9) {}; } @Override public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) { - return new FieldVisitor(Opcodes.ASM7) {}; + return new FieldVisitor(Opcodes.ASM9) {}; } } diff --git a/src/main/com/tonicsystems/jarjar/StringReader.java b/src/main/com/tonicsystems/jarjar/StringReader.java index 164b0a2..c3cc273 100644 --- a/src/main/com/tonicsystems/jarjar/StringReader.java +++ b/src/main/com/tonicsystems/jarjar/StringReader.java @@ -24,7 +24,7 @@ abstract class StringReader extends ClassVisitor private String className; public StringReader() { - super(Opcodes.ASM7); + super(Opcodes.ASM9); } abstract public void visitString(String className, String value, int line); @@ -42,7 +42,7 @@ abstract class StringReader extends ClassVisitor public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) { handleObject(value); - return new FieldVisitor(Opcodes.ASM7){ + return new FieldVisitor(Opcodes.ASM9){ @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { return StringReader.this.visitAnnotation(desc, visible); @@ -52,7 +52,7 @@ abstract class StringReader extends ClassVisitor @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - return new AnnotationVisitor(Opcodes.ASM7) { + return new AnnotationVisitor(Opcodes.ASM9) { @Override public void visit(String name, Object value) { handleObject(value); @@ -71,7 +71,7 @@ abstract class StringReader extends ClassVisitor @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - MethodVisitor mv = new MethodVisitor(Opcodes.ASM7){ + MethodVisitor mv = new MethodVisitor(Opcodes.ASM9){ @Override public void visitLdcInsn(Object cst) { handleObject(cst); diff --git a/src/main/com/tonicsystems/jarjar/util/GetNameClassWriter.java b/src/main/com/tonicsystems/jarjar/util/GetNameClassWriter.java index db6ec4f..cd2cc9b 100644 --- a/src/main/com/tonicsystems/jarjar/util/GetNameClassWriter.java +++ b/src/main/com/tonicsystems/jarjar/util/GetNameClassWriter.java @@ -25,7 +25,7 @@ public class GetNameClassWriter extends ClassVisitor private String className; public GetNameClassWriter(int flags) { - super(Opcodes.ASM7,new ClassWriter(flags)); + super(Opcodes.ASM9,new ClassWriter(flags)); } public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { |