Bug 1186517 - Adjust white spacing in generated files; r=me
authorJim Chen <nchen@mozilla.com>
Wed, 29 Jul 2015 15:11:15 -0400
changeset 286928 0229401cfa6940f5f659059386dbcda986873024
parent 286927 866e22abf3714ee8af9a8de4b2c9206b8be6ae6e
child 286929 86ca0d45483df9231d18c0cad291ce9e8a7e3461
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1186517
milestone42.0a1
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
Bug 1186517 - Adjust white spacing in generated files; r=me
build/annotationProcessors/AnnotationProcessor.java
build/annotationProcessors/CodeGenerator.java
widget/android/GeneratedJNIWrappers.cpp
widget/android/GeneratedJNIWrappers.h
--- a/build/annotationProcessors/AnnotationProcessor.java
+++ b/build/annotationProcessors/AnnotationProcessor.java
@@ -111,28 +111,25 @@ public class AnnotationProcessor {
             }
 
             headerFile.append(generatorInstance.getHeaderFileContents());
             implementationFile.append(generatorInstance.getWrapperFileContents());
             nativesFile.append(generatorInstance.getNativesFileContents());
         }
 
         implementationFile.append(
-                "\n" +
                 "} /* widget */\n" +
                 "} /* mozilla */\n");
 
         headerFile.append(
-                "\n" +
                 "} /* widget */\n" +
                 "} /* mozilla */\n" +
                 "#endif // " + getHeaderGuardName(HEADER_FILE) + "\n");
 
         nativesFile.append(
-                "\n" +
                 "} /* widget */\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/CodeGenerator.java
+++ b/build/annotationProcessors/CodeGenerator.java
@@ -522,12 +522,13 @@ public class CodeGenerator {
         }
         natives.append(
                 "public:\n" +
                 "    static constexpr JNINativeMethod methods[] = {" + nativesInits + '\n' +
                 "    };\n" +
                 "};\n" +
                 "\n" +
                 "template<class Impl>\n" +
-                "constexpr JNINativeMethod " + clsName + "::Natives<Impl>::methods[];\n");
+                "constexpr JNINativeMethod " + clsName + "::Natives<Impl>::methods[];\n" +
+                "\n");
         return natives.toString();
     }
 }
--- a/widget/android/GeneratedJNIWrappers.cpp
+++ b/widget/android/GeneratedJNIWrappers.cpp
@@ -1329,11 +1329,10 @@ bool Clipboard::HasText()
 constexpr char Clipboard::SetClipboardText_t::name[];
 constexpr char Clipboard::SetClipboardText_t::signature[];
 
 void Clipboard::SetClipboardText(mozilla::jni::String::Param a0)
 {
     return mozilla::jni::Method<SetClipboardText_t>::Call(nullptr, nullptr, a0);
 }
 
-
 } /* widget */
 } /* mozilla */
--- a/widget/android/GeneratedJNIWrappers.h
+++ b/widget/android/GeneratedJNIWrappers.h
@@ -3134,12 +3134,11 @@ public:
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static void SetClipboardText(mozilla::jni::String::Param);
 
 };
 
-
 } /* widget */
 } /* mozilla */
 #endif // GeneratedJNIWrappers_h