Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 981a832c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use ASM9 in tools" am: cb82e0cb am: 172e2c5a am: 17313d2d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2240208



Change-Id: Ibcc5dc018d59714fa30e911198ccea3a4989c8e1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb18fbe3 17313d2d

tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ fun main(args: Array<String>) { 
        kotlin.system.exitProcess(2)

    }



    val ancestorCollector = AncestorCollector(Opcodes.ASM7, null)

    val ancestorCollector = AncestorCollector(Opcodes.ASM9, null)



    for (entry in zipFile.entries()) {

        if (entry.name.endsWith(".class")) {

tools/traceinjection/src/com/android/traceinjection/TraceInjectionClassVisitor.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ public class TraceInjectionClassVisitor extends ClassVisitor { 
    private final TraceInjectionConfiguration mParams;

    public TraceInjectionClassVisitor(ClassVisitor classVisitor,

            TraceInjectionConfiguration params) {

        super(Opcodes.ASM7, classVisitor);

        super(Opcodes.ASM9, classVisitor);

        mParams = params;

    }

tools/traceinjection/src/com/android/traceinjection/TraceInjectionMethodAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public class TraceInjectionMethodAdapter extends AdviceAdapter { 


    public TraceInjectionMethodAdapter(MethodVisitor methodVisitor, int access,

            String name, String descriptor, TraceInjectionConfiguration params) {

        super(Opcodes.ASM7, methodVisitor, access, name, descriptor);

        super(Opcodes.ASM9, methodVisitor, access, name, descriptor);

        mParams = params;

        mIsConstructor = "<init>".equals(name);

    }
@@ -157,7 +157,7 @@ public class TraceInjectionMethodAdapter extends AdviceAdapter { 
    class TracingAnnotationVisitor extends AnnotationVisitor {



        TracingAnnotationVisitor(AnnotationVisitor annotationVisitor) {

            super(Opcodes.ASM7, annotationVisitor);

            super(Opcodes.ASM9, annotationVisitor);

        }



        @Override