commit 6c91c653090772ac86b9e72c9f36e272f1cece46
author clementbera <clementbera@google.com> Mon Apr 15 17:28:42 2019 +0200
committer clementbera <clementbera@google.com> Mon Apr 15 17:28:42 2019 +0200
tree 29763d9a79d57a6f1f2ff8ac6e85dfa5c831a4d3
parent 2f38bab80c56afce784130fcf64eac3b92562a36

Switched compatibility to ASM7

Lots of files used ASM in ASM6 compatibility, I switched to ASM7.
I introduced an ASM_VERSION internal option which I set to ASM7 and
replaced most references to ASM6 constant to ASM_VERSION. In a few
places using ASM_VERSION was introducing new dependencies so
I just used directly the ASM7 constant.

Bug: 130529338
Change-Id: Ie8bbeb36701198dc25fb2307e5467cb2079f315c

src/test/examplesAndroidO/invokecustom/TestGenerator.java

diff --git a/src/test/examplesAndroidO/invokecustom/TestGenerator.java b/src/test/examplesAndroidO/invokecustom/TestGenerator.java
index 05a6f28..9964ed0 100644
--- a/src/test/examplesAndroidO/invokecustom/TestGenerator.java
+++ b/src/test/examplesAndroidO/invokecustom/TestGenerator.java
@@ -41,7 +41,7 @@
       ClassReader cr = new ClassReader(input);
       ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
       cr.accept(
-          new ClassVisitor(Opcodes.ASM6, cw) {
+          new ClassVisitor(Opcodes.ASM7, cw) {
             @Override
             public void visitEnd() {
               generateMethodTest1(cw);

src/test/examplesAndroidO/invokecustom2/TestGenerator.java

diff --git a/src/test/examplesAndroidO/invokecustom2/TestGenerator.java b/src/test/examplesAndroidO/invokecustom2/TestGenerator.java
index 9bbc03a..377084e 100644
--- a/src/test/examplesAndroidO/invokecustom2/TestGenerator.java
+++ b/src/test/examplesAndroidO/invokecustom2/TestGenerator.java
@@ -42,7 +42,7 @@
       ClassReader cr = new ClassReader(input);
       ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
       cr.accept(
-          new ClassVisitor(Opcodes.ASM6, cw) {
+          new ClassVisitor(Opcodes.ASM7, cw) {
             @Override
             public void visitEnd() {
               generateMethodTest1(cw);

src/test/examplesAndroidO/stringconcat/TestGenerator.java

diff --git a/src/test/examplesAndroidO/stringconcat/TestGenerator.java b/src/test/examplesAndroidO/stringconcat/TestGenerator.java
index 12e5004..72bdfbf 100644
--- a/src/test/examplesAndroidO/stringconcat/TestGenerator.java
+++ b/src/test/examplesAndroidO/stringconcat/TestGenerator.java
@@ -51,12 +51,12 @@
       ClassReader cr = new ClassReader(input);
       ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
       cr.accept(
-          new ClassVisitor(Opcodes.ASM6, cw) {
+          new ClassVisitor(Opcodes.ASM7, cw) {
             @Override
             public MethodVisitor visitMethod(int access,
                 final String methodName, String desc, String signature, String[] exceptions) {
               MethodVisitor mv = super.visitMethod(access, methodName, desc, signature, exceptions);
-              return new MethodVisitor(Opcodes.ASM6, mv) {
+              return new MethodVisitor(Opcodes.ASM7, mv) {
                 private List<Object> recentConstants = new ArrayList<>();
 
                 @Override