Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use ASM9 in tools" am: cb82e0cb3e am: 172e2c5a31

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

Change-Id: Ie4b8ee69479ccc79826faa10ad1844a2f12730c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-10-12 09:05:53 +00:00
committed by Automerger Merge Worker
parent eff1d1a17e 172e2c5a31
commit 17313d2dca
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt
View File

@@ -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")) {

2
tools/traceinjection/src/com/android/traceinjection/TraceInjectionClassVisitor.java
View File

@@ -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;
}

4
tools/traceinjection/src/com/android/traceinjection/TraceInjectionMethodAdapter.java
View File

@@ -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