diff options
author | Aurimas Liutikas <aurimas@google.com> | 2020-06-16 23:28:06 +0000 |
---|---|---|
committer | Makoto Onuki <omakoto@google.com> | 2020-08-27 11:10:59 -0700 |
commit | 74fa38efb354a0c401c8d19aab072532cdee045d (patch) | |
tree | d87a4461235b6b79d96bd06a51887e6169fb5a3c | |
parent | 5b13ad48e094eec6de98894924b46806641816df (diff) | |
parent | 569afa9f7cd1d079ff1d5550ae0670243346d6c9 (diff) | |
download | jarjar-android11-mainline-media-release.tar.gz |
Start using ASM6 in jarjar am: f5f35e26f7 am: b633f13f1b am: 0429a93299 am: 98fe5fb8fb am: 569afa9f7candroid-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-release
Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/1339699
Exempt-From-Owner-Approval: Snapping to master
Bug: 146727827
Test: build
Change-Id: Ic2d29d0c1ff9cbad282f81a3c9e8ecc5ab6d731a
Merged-in: Ic2d29d0c1ff9cbad282f81a3c9e8ecc5ab6d731a
6 files changed, 13 insertions, 13 deletions
diff --git a/src/main/com/tonicsystems/jarjar/DepFindVisitor.java b/src/main/com/tonicsystems/jarjar/DepFindVisitor.java index 9d6611e..bad909e 100644 --- a/src/main/com/tonicsystems/jarjar/DepFindVisitor.java +++ b/src/main/com/tonicsystems/jarjar/DepFindVisitor.java @@ -25,7 +25,7 @@ import org.objectweb.asm.*; import org.objectweb.asm.Type; import org.objectweb.asm.commons.*; -class DepFindVisitor extends RemappingClassAdapter +class DepFindVisitor extends ClassRemapper { public DepFindVisitor(Map<String, String> classes, String source, DepHandler handler) throws IOException { super(null, new DepFindRemapper(classes, source, handler)); diff --git a/src/main/com/tonicsystems/jarjar/EmptyClassVisitor.java b/src/main/com/tonicsystems/jarjar/EmptyClassVisitor.java index 348e03d..7a758fe 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.ASM4); + super(Opcodes.ASM6); } @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - return new MethodVisitor(Opcodes.ASM4) {}; + return new MethodVisitor(Opcodes.ASM6) {}; } @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - return new AnnotationVisitor(Opcodes.ASM4) {}; + return new AnnotationVisitor(Opcodes.ASM6) {}; } @Override public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) { - return new FieldVisitor(Opcodes.ASM4) {}; + return new FieldVisitor(Opcodes.ASM6) {}; } } diff --git a/src/main/com/tonicsystems/jarjar/KeepProcessor.java b/src/main/com/tonicsystems/jarjar/KeepProcessor.java index 0176b84..3ed4636 100644 --- a/src/main/com/tonicsystems/jarjar/KeepProcessor.java +++ b/src/main/com/tonicsystems/jarjar/KeepProcessor.java @@ -26,7 +26,7 @@ import org.objectweb.asm.commons.*; // TODO: this can probably be refactored into JarClassVisitor, etc. class KeepProcessor extends Remapper implements JarProcessor { - private final ClassVisitor cv = new RemappingClassAdapter(new EmptyClassVisitor(), this); + private final ClassVisitor cv = new ClassRemapper(new EmptyClassVisitor(), this); private final List<Wildcard> wildcards; private final List<String> roots = new ArrayList<String>(); private final Map<String, Set<String>> depend = new HashMap<String, Set<String>>(); diff --git a/src/main/com/tonicsystems/jarjar/StringReader.java b/src/main/com/tonicsystems/jarjar/StringReader.java index ba7bb29..5bb719c 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.ASM4); + super(Opcodes.ASM6); } 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.ASM4){ + return new FieldVisitor(Opcodes.ASM6){ @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.ASM4) { + return new AnnotationVisitor(Opcodes.ASM6) { @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.ASM4){ + MethodVisitor mv = new MethodVisitor(Opcodes.ASM6){ @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 bbb8590..966ac82 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.ASM4,new ClassWriter(flags)); + super(Opcodes.ASM6,new ClassWriter(flags)); } public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { diff --git a/src/main/com/tonicsystems/jarjar/util/RemappingClassTransformer.java b/src/main/com/tonicsystems/jarjar/util/RemappingClassTransformer.java index fd1b9d7..9c1d4c9 100644 --- a/src/main/com/tonicsystems/jarjar/util/RemappingClassTransformer.java +++ b/src/main/com/tonicsystems/jarjar/util/RemappingClassTransformer.java @@ -17,12 +17,12 @@ package com.tonicsystems.jarjar.util; import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.commons.ClassRemapper; import org.objectweb.asm.commons.Remapper; -import org.objectweb.asm.commons.RemappingClassAdapter; import com.tonicsystems.jarjar.EmptyClassVisitor; -public class RemappingClassTransformer extends RemappingClassAdapter +public class RemappingClassTransformer extends ClassRemapper { public RemappingClassTransformer(Remapper pr) { super(new EmptyClassVisitor(), pr); |