diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-25 12:30:19 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-25 12:30:19 +0000 |
commit | 9bca037de1454271dcfbf8bce27cbd25ad262f83 (patch) | |
tree | 939329aa67c4ca133d179e19a26da863f5993a4a | |
parent | 80d36a7524e7a38fc33670d6bf1cd7dae2cc773c (diff) | |
parent | 845305798a7e45e04d9931512cc8fdc21978b63b (diff) | |
download | jarjar-9bca037de1454271dcfbf8bce27cbd25ad262f83.tar.gz |
Snap for 8358640 from 845305798a7e45e04d9931512cc8fdc21978b63b to mainline-go-ipsec-release
Change-Id: Iaa687583a8f2e92d91612a7ffd295f0875106919
5 files changed, 14 insertions, 14 deletions
@@ -47,8 +47,8 @@ java_library_host { java_resource_dirs: ["res"], static_libs: [ - "asm-6.0", - "asm-commons-6.0", + "asm-9.2", + "asm-commons-9.2", ], libs: [ diff --git a/src/android/com/android/jarjar/RemoveAndroidCompatAnnotationsJarTransformer.java b/src/android/com/android/jarjar/RemoveAndroidCompatAnnotationsJarTransformer.java index 990e048..f9e5e14 100644 --- a/src/android/com/android/jarjar/RemoveAndroidCompatAnnotationsJarTransformer.java +++ b/src/android/com/android/jarjar/RemoveAndroidCompatAnnotationsJarTransformer.java @@ -51,7 +51,7 @@ public final class RemoveAndroidCompatAnnotationsJarTransformer extends JarTrans private boolean isClassRemapped; AnnotationRemover(ClassVisitor cv) { - super(Opcodes.ASM6, cv); + super(Opcodes.ASM7, cv); } @Override @@ -74,7 +74,7 @@ public final class RemoveAndroidCompatAnnotationsJarTransformer extends JarTrans Object value) { FieldVisitor superVisitor = super.visitField(access, name, descriptor, signature, value); - return new FieldVisitor(Opcodes.ASM6, superVisitor) { + return new FieldVisitor(Opcodes.ASM7, superVisitor) { @Override public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) { return visitAnnotationCommon(descriptor, @@ -89,7 +89,7 @@ public final class RemoveAndroidCompatAnnotationsJarTransformer extends JarTrans String signature, String[] exceptions) { MethodVisitor superVisitor = super.visitMethod(access, name, descriptor, signature, exceptions); - return new MethodVisitor(Opcodes.ASM6, superVisitor) { + return new MethodVisitor(Opcodes.ASM7, 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 7a758fe..c7614a1 100644 --- a/src/main/com/tonicsystems/jarjar/EmptyClassVisitor.java +++ b/src/main/com/tonicsystems/jarjar/EmptyClassVisitor.java @@ -28,23 +28,23 @@ import org.objectweb.asm.Opcodes; public class EmptyClassVisitor extends ClassVisitor { public EmptyClassVisitor() { - super(Opcodes.ASM6); + super(Opcodes.ASM7); } @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - return new MethodVisitor(Opcodes.ASM6) {}; + return new MethodVisitor(Opcodes.ASM7) {}; } @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - return new AnnotationVisitor(Opcodes.ASM6) {}; + return new AnnotationVisitor(Opcodes.ASM7) {}; } @Override public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) { - return new FieldVisitor(Opcodes.ASM6) {}; + return new FieldVisitor(Opcodes.ASM7) {}; } } diff --git a/src/main/com/tonicsystems/jarjar/StringReader.java b/src/main/com/tonicsystems/jarjar/StringReader.java index 5bb719c..164b0a2 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.ASM6); + super(Opcodes.ASM7); } 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.ASM6){ + return new FieldVisitor(Opcodes.ASM7){ @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.ASM6) { + return new AnnotationVisitor(Opcodes.ASM7) { @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.ASM6){ + MethodVisitor mv = new MethodVisitor(Opcodes.ASM7){ @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 966ac82..db6ec4f 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.ASM6,new ClassWriter(flags)); + super(Opcodes.ASM7,new ClassWriter(flags)); } public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { |