Merge "Use ASM6 Opcodes everywhere in locked_region_code_injection" am: 5aa4dafa58

am: 4927808d39

Change-Id: I718efd7536331508531bb7c30dfab3638ef60d0e
This commit is contained in:
Benoit Lamarche
2017-10-24 10:13:58 +00:00
committed by android-build-merger
2 changed files with 2 additions and 2 deletions

View File

@@ -76,7 +76,7 @@ class LockFindingClassVisitor extends ClassVisitor {
private MethodVisitor chain; private MethodVisitor chain;
public LockFindingMethodVisitor(String owner, MethodNode mn, MethodVisitor chain) { public LockFindingMethodVisitor(String owner, MethodNode mn, MethodVisitor chain) {
super(Opcodes.ASM6, mn); super(Utils.ASM_VERSION, mn);
assert owner != null; assert owner != null;
this.owner = owner; this.owner = owner;
this.chain = chain; this.chain = chain;

View File

@@ -19,7 +19,7 @@ import org.objectweb.asm.Opcodes;
public class Utils { public class Utils {
public static final int ASM_VERSION = Opcodes.ASM5; public static final int ASM_VERSION = Opcodes.ASM6;
/** /**
* Reads a comma separated configuration similar to the Jack definition. * Reads a comma separated configuration similar to the Jack definition.