Jack support for annotation processor.

Does not include any support for including class files generated
by annotation processors.

Change-Id: Id4006301d588875f822ff84fa90db10fd616ab00

2 files changed, 10 insertions, 8 deletions

diff --git a/jack/tests/com/android/jack/TestTools.java b/jack/tests/com/android/jack/TestTools.java
index 99aec20..cfc9dc8 100644
--- a/jack/tests/com/android/jack/TestTools.java
+++ b/jack/tests/com/android/jack/TestTools.java
@@ -194,10 +194,10 @@ public class TestTools {
         "jack-tests/prebuilts/core-stubs-mini.jack").getAbsolutePath();
   }
 
-  @CheckForNull
+  @Nonnull
   public static String getClasspathAsString(@CheckForNull File[] files) {
     if (files == null || files.length == 0) {
-      return null;
+      return "";
     }
     StringBuilder classpathStr = new StringBuilder();
     for (int i = 0; i < files.length; i++) {
@@ -209,7 +209,7 @@ public class TestTools {
     return classpathStr.toString();
   }
 
-  @CheckForNull
+  @Nonnull
   public static String getClasspathsAsString(
       @CheckForNull File[] bootClasspath, @CheckForNull File[] classpath) {
     if (bootClasspath == null) {
@@ -222,12 +222,12 @@ public class TestTools {
     }
   }
 
-  @CheckForNull
+  @Nonnull
   private static String concatClasspathStrings(
-      @CheckForNull String bootclasspath, @CheckForNull String classpath) {
+      @Nonnull String bootclasspath, @Nonnull String classpath) {
     if (bootclasspath == null || bootclasspath.isEmpty()) {
       return classpath;
-    } else if (classpath == null || classpath.isEmpty()) {
+    } else if (classpath.isEmpty()) {
       return bootclasspath;
     } else {
       StringBuilder classpathStr = new StringBuilder(bootclasspath);
diff --git a/jack/tests/com/android/jack/errorhandling/annotationprocessor/ResourceAnnotationProcessor.java b/jack/tests/com/android/jack/errorhandling/annotationprocessor/ResourceAnnotationProcessor.java
index 2aca1bb..ae2eba0 100644
--- a/jack/tests/com/android/jack/errorhandling/annotationprocessor/ResourceAnnotationProcessor.java
+++ b/jack/tests/com/android/jack/errorhandling/annotationprocessor/ResourceAnnotationProcessor.java
@@ -38,6 +38,7 @@ import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import javax.tools.Diagnostic.Kind;
+import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 
 /**
@@ -71,8 +72,9 @@ public class ResourceAnnotationProcessor extends AbstractProcessor {
       try {
         assert env != null;
 
-        OutputStream os = env.getFiler()
-            .createResource(StandardLocation.CLASS_OUTPUT, "", FILENAME)
+        FileObject resource = env.getFiler()
+            .createResource(StandardLocation.CLASS_OUTPUT, "", FILENAME);
+        OutputStream os = resource
             .openOutputStream();
         Writer writer = new OutputStreamWriter(os);
         try {