Bug 1637452: Part 3 - Fix JNI includes in xpcom; r=froydnj
authorAaron Klotz <aklotz@mozilla.com>
Fri, 15 May 2020 17:04:15 +0000
changeset 530318 a0a2619129601a8919af7ea80797e2d8036a2bff
parent 530317 b28b3a9fcce982b48bd636ae6960f92470967fa6
child 530319 72ca0eb1f30bead7b7d3c0737ffb9eeaeea90d62
push id37420
push usernerli@mozilla.com
push dateFri, 15 May 2020 21:52:36 +0000
treeherdermozilla-central@f340bbb582d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1637452
milestone78.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 1637452: Part 3 - Fix JNI includes in xpcom; r=froydnj In this bug we're moving away from monolithic JNI headers to class-specific headers so that we don't have to rebuild the world every time we make a change to a JNI interface. Differential Revision: https://phabricator.services.mozilla.com/D75366
xpcom/base/nsSystemInfo.cpp
xpcom/components/ManifestParser.cpp
xpcom/io/nsLocalFileUnix.cpp
--- a/xpcom/base/nsSystemInfo.cpp
+++ b/xpcom/base/nsSystemInfo.cpp
@@ -52,17 +52,17 @@
 #  include "nsCharSeparatedTokenizer.h"
 
 #  include <map>
 #  include <string>
 #endif
 
 #ifdef MOZ_WIDGET_ANDROID
 #  include "AndroidBuild.h"
-#  include "GeneratedJNIWrappers.h"
+#  include "mozilla/java/GeckoAppShellWrappers.h"
 #  include "mozilla/jni/Utils.h"
 #endif
 
 #ifdef XP_MACOSX
 #  include <sys/sysctl.h>
 #endif
 
 #if defined(XP_LINUX) && defined(MOZ_SANDBOX)
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -19,16 +19,17 @@
 #  include <CoreServices/CoreServices.h>
 #  include "nsCocoaFeatures.h"
 #elif defined(MOZ_WIDGET_GTK)
 #  include <gtk/gtk.h>
 #endif
 
 #ifdef MOZ_WIDGET_ANDROID
 #  include "AndroidBridge.h"
+#  include "mozilla/java/GeckoAppShellWrappers.h"
 #endif
 
 #include "mozilla/Services.h"
 
 #include "nsCRT.h"
 #include "nsConsoleMessage.h"
 #include "nsTextFormatter.h"
 #include "nsVersionComparator.h"
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -58,17 +58,17 @@
 #  include "CocoaFileUtils.h"
 #  include "prmem.h"
 #  include "plbase64.h"
 
 static nsresult MacErrorMapper(OSErr inErr);
 #endif
 
 #ifdef MOZ_WIDGET_ANDROID
-#  include "GeneratedJNIWrappers.h"
+#  include "mozilla/java/GeckoAppShellWrappers.h"
 #  include "nsIMIMEService.h"
 #  include <linux/magic.h>
 #endif
 
 #include "nsNativeCharsetUtils.h"
 #include "nsTraceRefcnt.h"
 #include "nsHashKeys.h"