Bug 1116589 - Use templated JNI classes in generated bindings; r=snorp

Author: Jim Chen

CLOBBER

@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1056337 - Change default compiler for B2G ICS builds.
+Bug 1116589 - Clobber needed to update autogenerated Android library bindings.

build/annotationProcessors/AnnotationInfo.java

@@ -22,7 +22,7 @@ public AnnotationInfo(String aWrapperName, boolean aIsMultithreaded,
         narrowChars = aNarrowChars;
         catchException = aCatchException;
 
-        if (!noThrow && catchException) {
+        if (noThrow && catchException) {
             // It doesn't make sense to have these together
             throw new IllegalArgumentException("noThrow and catchException are not allowed together");
         }

build/annotationProcessors/AnnotationProcessor.java

@@ -20,9 +20,11 @@ public class AnnotationProcessor {
 
     public static final String GENERATED_COMMENT =
             "// GENERATED CODE\n" +
-            "// Generated by the Java program at /build/annotationProcessors at compile time from\n" +
-            "// annotations on Java methods. To update, change the annotations on the corresponding Java\n" +
-            "// methods and rerun the build. Manually updating this file will cause your build to fail.\n\n";
+            "// Generated by the Java program at /build/annotationProcessors at compile time\n" +
+            "// from annotations on Java methods. To update, change the annotations on the\n" +
+            "// corresponding Javamethods and rerun the build. Manually updating this file\n" +
+            "// will cause your build to fail.\n" +
+            "\n";
 
     public static void main(String[] args) {
         // We expect a list of jars on the commandline. If missing, whinge about it.
@@ -44,29 +46,24 @@ public static void main(String[] args) {
         Iterator<ClassWithOptions> jarClassIterator = IterableJarLoadingURLClassLoader.getIteratorOverJars(args);
 
         StringBuilder headerFile = new StringBuilder(GENERATED_COMMENT);
-        headerFile.append("#ifndef GeneratedJNIWrappers_h__\n" +
-                          "#define GeneratedJNIWrappers_h__\n\n" +
-                          "#include \"nsXPCOMStrings.h\"\n" +
-                          "#include \"AndroidJavaWrappers.h\"\n" +
-                          "\n" +
-                          "namespace mozilla {\n" +
-                          "namespace widget {\n" +
-                          "namespace android {\n" +
-                          "void InitStubs(JNIEnv *env);\n\n");
+        headerFile.append(
+                "#ifndef GeneratedJNIWrappers_h__\n" +
+                "#define GeneratedJNIWrappers_h__\n" +
+                "\n" +
+                "#include \"mozilla/jni/Refs.h\"\n" +
+                "\n" +
+                "namespace mozilla {\n" +
+                "namespace widget {\n" +
+                "\n");
 
         StringBuilder implementationFile = new StringBuilder(GENERATED_COMMENT);
-        implementationFile.append("#include \"GeneratedJNIWrappers.h\"\n" +
-                                  "#include \"AndroidBridgeUtilities.h\"\n" +
-                                  "#include \"nsXPCOMStrings.h\"\n" +
-                                  "#include \"AndroidBridge.h\"\n" +
-                                  "\n" +
-                                  "namespace mozilla {\n" +
-                                  "namespace widget {\n" +
-                                  "namespace android {\n");
-
-        // Used to track the calls to the various class-specific initialisation functions.
-        StringBuilder stubInitialiser = new StringBuilder();
-        stubInitialiser.append("void InitStubs(JNIEnv *env) {\n");
+        implementationFile.append(
+                "#include \"GeneratedJNIWrappers.h\"\n" +
+                "#include \"mozilla/jni/Accessors.h\"\n" +
+                "\n" +
+                "namespace mozilla {\n" +
+                "namespace widget {\n" +
+                "\n");
 
         while (jarClassIterator.hasNext()) {
             ClassWithOptions aClassTuple = jarClassIterator.next();
@@ -79,9 +76,7 @@ public static void main(String[] args) {
             if (!methodIterator.hasNext()) {
                 continue;
             }
-            generatorInstance = new CodeGenerator(aClassTuple.wrappedClass, aClassTuple.generatedName);
-
-            stubInitialiser.append("    ").append(aClassTuple.generatedName).append("::InitStubs(env);\n");
+            generatorInstance = new CodeGenerator(aClassTuple);
 
             // Iterate all annotated members in this class..
             while (methodIterator.hasNext()) {
@@ -103,18 +98,16 @@ public static void main(String[] args) {
             implementationFile.append(generatorInstance.getWrapperFileContents());
         }
 
-        implementationFile.append('\n');
-        stubInitialiser.append("}");
-        implementationFile.append(stubInitialiser);
-
-        implementationFile.append("\n} /* android */\n" +
-                                    "} /* widget */\n" +
-                                    "} /* mozilla */\n");
+        implementationFile.append(
+                "\n" +
+                "} /* widget */\n" +
+                "} /* mozilla */\n");
 
-        headerFile.append("\n} /* android */\n" +
-                            "} /* widget */\n" +
-                            "} /* mozilla */\n" +
-                            "#endif\n");
+        headerFile.append(
+                "\n" +
+                "} /* widget */\n" +
+                "} /* mozilla */\n" +
+                "#endif // GeneratedJNIWrappers_h__\n");
 
         writeOutputFiles(headerFile, implementationFile);
         long e = System.currentTimeMillis();
@@ -158,4 +151,4 @@ private static void writeOutputFiles(StringBuilder aHeaderFile, StringBuilder aI
             }
         }
     }
-}
+}