Bug 1291229 - Fix typo for moving Java bindings to mozilla::java namespace. r=jchen
authorJames Cheng <jacheng@mozilla.com>
Fri, 05 Aug 2016 13:23:44 -0400
changeset 397520 8ee6f2eb8b349a351f6f76585eb85e0ec2b5c475
parent 397519 744db8f3ad0c72caf78aeac2e24df78b7a374d17
child 397521 5a915c1da4ebb8cb00fdc63c685bd0f8e9854044
push id25332
push usermaglione.k@gmail.com
push dateSat, 06 Aug 2016 21:21:51 +0000
reviewersjchen
bugs1291229
milestone51.0a1
Bug 1291229 - Fix typo for moving Java bindings to mozilla::java namespace. r=jchen MozReview-Commit-ID: KGAS6EhnwAI
CLOBBER
build/annotationProcessors/AnnotationProcessor.java
build/annotationProcessors/SDKProcessor.java
widget/android/GeneratedJNINatives.h
widget/android/GeneratedJNIWrappers.cpp
widget/android/GeneratedJNIWrappers.h
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Merge day clobber
\ No newline at end of file
+Bug 1291229 - clobber due to changes in generated code (bug 1182840)
--- a/build/annotationProcessors/AnnotationProcessor.java
+++ b/build/annotationProcessors/AnnotationProcessor.java
@@ -79,26 +79,26 @@ public class AnnotationProcessor {
                 "namespace java {\n" +
                 "\n");
 
         while (jarClassIterator.hasNext()) {
             generateClass(jarClassIterator.next());
         }
 
         implementationFile.append(
-                "} /* widget */\n" +
+                "} /* java */\n" +
                 "} /* mozilla */\n");
 
         headerFile.append(
-                "} /* widget */\n" +
+                "} /* java */\n" +
                 "} /* mozilla */\n" +
                 "#endif // " + getHeaderGuardName(HEADER_FILE) + "\n");
 
         nativesFile.append(
-                "} /* widget */\n" +
+                "} /* java */\n" +
                 "} /* mozilla */\n" +
                 "#endif // " + getHeaderGuardName(NATIVES_FILE) + "\n");
 
         writeOutputFile(SOURCE_FILE, implementationFile);
         writeOutputFile(HEADER_FILE, headerFile);
         writeOutputFile(NATIVES_FILE, nativesFile);
 
         long e = System.currentTimeMillis();
--- a/build/annotationProcessors/SDKProcessor.java
+++ b/build/annotationProcessors/SDKProcessor.java
@@ -106,22 +106,22 @@ public class SDKProcessor {
 
             generateClass(Class.forName(className, true, loader),
                           implementationFile,
                           headerFile);
         }
 
         implementationFile.append(
                 "} /* sdk */\n" +
-                "} /* widget */\n" +
+                "} /* java */\n" +
                 "} /* mozilla */\n");
 
         headerFile.append(
                 "} /* sdk */\n" +
-                "} /* widget */\n" +
+                "} /* java */\n" +
                 "} /* mozilla */\n" +
                 "#endif\n");
 
         writeOutputFiles(outdir, generatedFilePrefix, headerFile, implementationFile);
         long e = System.currentTimeMillis();
         System.out.println("SDK processing complete in " + (e - s) + "ms");
     }
 
--- a/widget/android/GeneratedJNINatives.h
+++ b/widget/android/GeneratedJNINatives.h
@@ -633,11 +633,11 @@ const JNINativeMethod NativeJSObject::Na
             mozilla::jni::NativeStub<NativeJSObject::ToBundle_t, Impl>
             ::template Wrap<&Impl::ToBundle>),
 
     mozilla::jni::MakeNativeMethod<NativeJSObject::ToString_t>(
             mozilla::jni::NativeStub<NativeJSObject::ToString_t, Impl>
             ::template Wrap<&Impl::ToString>)
 };
 
-} /* widget */
+} /* java */
 } /* mozilla */
 #endif // GeneratedJNINatives_h
--- a/widget/android/GeneratedJNIWrappers.cpp
+++ b/widget/android/GeneratedJNIWrappers.cpp
@@ -2276,10 +2276,10 @@ constexpr char NativeJSObject::OptString
 constexpr char NativeJSObject::OptStringArray_t::signature[];
 
 constexpr char NativeJSObject::ToBundle_t::name[];
 constexpr char NativeJSObject::ToBundle_t::signature[];
 
 constexpr char NativeJSObject::ToString_t::name[];
 constexpr char NativeJSObject::ToString_t::signature[];
 
-} /* widget */
+} /* java */
 } /* mozilla */
--- a/widget/android/GeneratedJNIWrappers.h
+++ b/widget/android/GeneratedJNIWrappers.h
@@ -5571,11 +5571,11 @@ public:
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static const bool isMultithreaded = true;
 
     template<class Impl> class Natives;
 };
 
-} /* widget */
+} /* java */
 } /* mozilla */
 #endif // GeneratedJNIWrappers_h