commit ede4e488a5fe84e9e9d523615e6d6cd5c7535d29
author Mathias Rav <mathiasr@google.com> Tue Mar 06 11:34:48 2018 +0100
committer Mathias Rav <mathiasr@google.com> Tue Mar 06 11:34:48 2018 +0100
tree 7cbdc9779de23085f491608109f137eb26e2814e
parent b9035ca1fd2eeacba7f31677f8b10e1f62fb32d1

Fix errorprone issues with CL 17620

Fixes b9035ca1 ("CfApplicationWriter: Handle annotations, generic signatures,
throws", 2018-03-06, I0a3eabbf3abf0df3f78e9846aa66b12a2bc806df).

* Unused imports
* Line wrapping in AnnotationTestRunner

Change-Id: I8a78fb5127b10074fd3c6618458fbf53c21b3236

src/main/java/com/android/tools/r8/jar/CfApplicationWriter.java

diff --git a/src/main/java/com/android/tools/r8/jar/CfApplicationWriter.java b/src/main/java/com/android/tools/r8/jar/CfApplicationWriter.java
index 4eea8a8..5eb2bb7 100644
--- a/src/main/java/com/android/tools/r8/jar/CfApplicationWriter.java
+++ b/src/main/java/com/android/tools/r8/jar/CfApplicationWriter.java
@@ -23,20 +23,11 @@
 import com.android.tools.r8.graph.DexValue;
 import com.android.tools.r8.graph.DexValue.DexValueAnnotation;
 import com.android.tools.r8.graph.DexValue.DexValueArray;
-import com.android.tools.r8.graph.DexValue.DexValueBoolean;
-import com.android.tools.r8.graph.DexValue.DexValueByte;
-import com.android.tools.r8.graph.DexValue.DexValueChar;
-import com.android.tools.r8.graph.DexValue.DexValueDouble;
 import com.android.tools.r8.graph.DexValue.DexValueEnum;
 import com.android.tools.r8.graph.DexValue.DexValueField;
-import com.android.tools.r8.graph.DexValue.DexValueFloat;
-import com.android.tools.r8.graph.DexValue.DexValueInt;
-import com.android.tools.r8.graph.DexValue.DexValueLong;
 import com.android.tools.r8.graph.DexValue.DexValueMethod;
 import com.android.tools.r8.graph.DexValue.DexValueMethodHandle;
 import com.android.tools.r8.graph.DexValue.DexValueMethodType;
-import com.android.tools.r8.graph.DexValue.DexValueNull;
-import com.android.tools.r8.graph.DexValue.DexValueShort;
 import com.android.tools.r8.graph.DexValue.DexValueString;
 import com.android.tools.r8.graph.DexValue.DexValueType;
 import com.android.tools.r8.graph.DexValue.UnknownDexValue;

src/test/java/com/android/tools/r8/cf/AnnotationTestRunner.java

diff --git a/src/test/java/com/android/tools/r8/cf/AnnotationTestRunner.java b/src/test/java/com/android/tools/r8/cf/AnnotationTestRunner.java
index addfa58..7f3827e 100644
--- a/src/test/java/com/android/tools/r8/cf/AnnotationTestRunner.java
+++ b/src/test/java/com/android/tools/r8/cf/AnnotationTestRunner.java
@@ -23,8 +23,8 @@
 
   @Test
   public void test() throws Exception {
-    ProcessResult runInput = ToolHelper
-        .runJava(ToolHelper.getClassPathForTests(), CLASS.getCanonicalName());
+    ProcessResult runInput =
+        ToolHelper.runJava(ToolHelper.getClassPathForTests(), CLASS.getCanonicalName());
     assertEquals(0, runInput.exitCode);
     Path out = temp.getRoot().toPath();
     R8.run(