Backed out changeset 0cf61343793a (bug 1287946)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 21 Jul 2016 08:07:13 +0200
changeset 305965 de1db0ba27a71eb7d6c8ce93123967e5ab582b2e
parent 305964 5643545ad4992dc69233b6b5bef4887fb10fec0c
child 305966 138937cd04cb1ee5620cdb2f31e977e28783fe3b
push id79730
push usercbook@mozilla.com
push dateThu, 21 Jul 2016 06:15:05 +0000
treeherdermozilla-inbound@28f30533c635 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1287946
milestone50.0a1
backs out0cf61343793a9036528cebc3524a52f718ef0ba4
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 0cf61343793a (bug 1287946)
build/annotationProcessors/AnnotationProcessor.java
build/annotationProcessors/SDKProcessor.java
--- a/build/annotationProcessors/AnnotationProcessor.java
+++ b/build/annotationProcessors/AnnotationProcessor.java
@@ -52,36 +52,36 @@ public class AnnotationProcessor {
 
         headerFile.append(
                 "#ifndef " + getHeaderGuardName(HEADER_FILE) + "\n" +
                 "#define " + getHeaderGuardName(HEADER_FILE) + "\n" +
                 "\n" +
                 "#include \"mozilla/jni/Refs.h\"\n" +
                 "\n" +
                 "namespace mozilla {\n" +
-                "namespace java {\n" +
+                "namespace widget {\n" +
                 "\n");
 
         implementationFile.append(
                 "#include \"GeneratedJNIWrappers.h\"\n" +
                 "#include \"mozilla/jni/Accessors.h\"\n" +
                 "\n" +
                 "namespace mozilla {\n" +
-                "namespace java {\n" +
+                "namespace widget {\n" +
                 "\n");
 
         nativesFile.append(
                 "#ifndef " + getHeaderGuardName(NATIVES_FILE) + "\n" +
                 "#define " + getHeaderGuardName(NATIVES_FILE) + "\n" +
                 "\n" +
                 "#include \"GeneratedJNIWrappers.h\"\n" +
                 "#include \"mozilla/jni/Natives.h\"\n" +
                 "\n" +
                 "namespace mozilla {\n" +
-                "namespace java {\n" +
+                "namespace widget {\n" +
                 "\n");
 
         while (jarClassIterator.hasNext()) {
             generateClass(jarClassIterator.next());
         }
 
         implementationFile.append(
                 "} /* widget */\n" +
--- a/build/annotationProcessors/SDKProcessor.java
+++ b/build/annotationProcessors/SDKProcessor.java
@@ -72,27 +72,27 @@ public class SDKProcessor {
         StringBuilder headerFile = new StringBuilder(GENERATED_COMMENT);
         headerFile.append(
                 "#ifndef " + generatedFilePrefix + "_h__\n" +
                 "#define " + generatedFilePrefix + "_h__\n" +
                 "\n" +
                 "#include \"mozilla/jni/Refs.h\"\n" +
                 "\n" +
                 "namespace mozilla {\n" +
-                "namespace java {\n" +
+                "namespace widget {\n" +
                 "namespace sdk {\n" +
                 "\n");
 
         StringBuilder implementationFile = new StringBuilder(GENERATED_COMMENT);
         implementationFile.append(
                 "#include \"" + generatedFilePrefix + ".h\"\n" +
                 "#include \"mozilla/jni/Accessors.h\"\n" +
                 "\n" +
                 "namespace mozilla {\n" +
-                "namespace java {\n" +
+                "namespace widget {\n" +
                 "namespace sdk {\n" +
                 "\n");
 
         // Used to track the calls to the various class-specific initialisation functions.
         ClassLoader loader = null;
         try {
             loader = URLClassLoader.newInstance(new URL[] { new URL("file://" + sdkJar) },
                                                 SDKProcessor.class.getClassLoader());