From 64eb7d8afff0a90dc6260a0a48ad25d46422e12c Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Wed, 29 Jul 2015 15:11:15 -0400
Subject: [PATCH] Bug 1186517 - Adjust white spacing in generated files; r=me

---
 build/annotationProcessors/AnnotationProcessor.java | 3 ---
 build/annotationProcessors/CodeGenerator.java       | 3 ++-
 widget/android/GeneratedJNIWrappers.cpp             | 1 -
 widget/android/GeneratedJNIWrappers.h               | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/build/annotationProcessors/AnnotationProcessor.java b/build/annotationProcessors/AnnotationProcessor.java
index 3c0d2c5e2240..0562fdf339a5 100644
--- a/build/annotationProcessors/AnnotationProcessor.java
+++ b/build/annotationProcessors/AnnotationProcessor.java
@@ -116,18 +116,15 @@ public class AnnotationProcessor {
         }
 
         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");
diff --git a/build/annotationProcessors/CodeGenerator.java b/build/annotationProcessors/CodeGenerator.java
index 702e1beebad7..1ff751e2fc9e 100644
--- a/build/annotationProcessors/CodeGenerator.java
+++ b/build/annotationProcessors/CodeGenerator.java
@@ -527,7 +527,8 @@ public class CodeGenerator {
                 "};\n" +
                 "\n" +
                 "template<class Impl>\n" +
-                "constexpr JNINativeMethod " + clsName + "::Natives<Impl>::methods[];\n");
+                "constexpr JNINativeMethod " + clsName + "::Natives<Impl>::methods[];\n" +
+                "\n");
         return natives.toString();
     }
 }
diff --git a/widget/android/GeneratedJNIWrappers.cpp b/widget/android/GeneratedJNIWrappers.cpp
index acac4ef2013c..eef340b2758b 100644
--- a/widget/android/GeneratedJNIWrappers.cpp
+++ b/widget/android/GeneratedJNIWrappers.cpp
@@ -1334,6 +1334,5 @@ void Clipboard::SetClipboardText(mozilla::jni::String::Param a0)
     return mozilla::jni::Method<SetClipboardText_t>::Call(nullptr, nullptr, a0);
 }
 
-
 } /* widget */
 } /* mozilla */
diff --git a/widget/android/GeneratedJNIWrappers.h b/widget/android/GeneratedJNIWrappers.h
index 3c527ae2cc2f..be3d98f8e7ec 100644
--- a/widget/android/GeneratedJNIWrappers.h
+++ b/widget/android/GeneratedJNIWrappers.h
@@ -3139,7 +3139,6 @@ public:
 
 };
 
-
 } /* widget */
 } /* mozilla */
 #endif // GeneratedJNIWrappers_h