| commit | 4927808d39d3dd78a36cde8a9134546ba8316728 | [log] [tgz] |
|---|---|---|
| author | Benoit Lamarche <benoitlamarche@google.com> | Tue Oct 24 08:54:09 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 24 08:54:09 2017 +0000 |
| tree | 350e481d868202567d16f30702fc7e8691548b5b | |
| parent | e74db7c7e26d93827acf7841f530babffdd5d7de [diff] | |
| parent | 5aa4dafa5847f6e7866ad81f73a69217fa1449b2 [diff] |
Merge "Use ASM6 Opcodes everywhere in locked_region_code_injection" am: 5aa4dafa58 Change-Id: Ic8f892399cdfa746a2fab4a841469f41f0fe98f5
diff --git a/tools/locked_region_code_injection/src/lockedregioncodeinjection/LockFindingClassVisitor.java b/tools/locked_region_code_injection/src/lockedregioncodeinjection/LockFindingClassVisitor.java index a60f2a2..ee0e36c 100644 --- a/tools/locked_region_code_injection/src/lockedregioncodeinjection/LockFindingClassVisitor.java +++ b/tools/locked_region_code_injection/src/lockedregioncodeinjection/LockFindingClassVisitor.java
@@ -76,7 +76,7 @@ private MethodVisitor chain; public LockFindingMethodVisitor(String owner, MethodNode mn, MethodVisitor chain) { - super(Opcodes.ASM6, mn); + super(Utils.ASM_VERSION, mn); assert owner != null; this.owner = owner; this.chain = chain;
diff --git a/tools/locked_region_code_injection/src/lockedregioncodeinjection/Utils.java b/tools/locked_region_code_injection/src/lockedregioncodeinjection/Utils.java index d2a2e7b..219c2b3 100644 --- a/tools/locked_region_code_injection/src/lockedregioncodeinjection/Utils.java +++ b/tools/locked_region_code_injection/src/lockedregioncodeinjection/Utils.java
@@ -19,7 +19,7 @@ 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.