Bug 1637452: Part 7 - Fix JNI includes in netwerk; r=necko-reviewers,valentin
authorAaron Klotz <aklotz@mozilla.com>
Fri, 15 May 2020 17:04:32 +0000
changeset 530322 4456de293db4390ca828f8b2a9eeaea054cef837
parent 530321 4878cd1cdc0e7f4a10cd5359b638e1849af13044
child 530323 1e9b2a06812e1ee16064955a65213410f8623483
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)
reviewersnecko-reviewers, valentin
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 7 - Fix JNI includes in netwerk; r=necko-reviewers,valentin 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/D75370
netwerk/base/Tickler.cpp
netwerk/ipc/SocketProcessParent.cpp
netwerk/system/android/nsAndroidNetworkLinkService.cpp
--- a/netwerk/base/Tickler.cpp
+++ b/netwerk/base/Tickler.cpp
@@ -7,18 +7,18 @@
 
 #ifdef MOZ_USE_WIFI_TICKLER
 #  include "nsComponentManagerUtils.h"
 #  include "nsINamed.h"
 #  include "nsServiceManagerUtils.h"
 #  include "nsThreadUtils.h"
 #  include "prnetdb.h"
 
+#  include "mozilla/java/GeckoAppShellWrappers.h"
 #  include "mozilla/jni/Utils.h"
-#  include "GeneratedJNIWrappers.h"
 
 namespace mozilla {
 namespace net {
 
 NS_IMPL_ISUPPORTS(Tickler, nsISupportsWeakReference, Tickler)
 
 Tickler::Tickler()
     : mLock("Tickler::mLock"),
--- a/netwerk/ipc/SocketProcessParent.cpp
+++ b/netwerk/ipc/SocketProcessParent.cpp
@@ -21,16 +21,20 @@
 #include "nsNSSIOLayer.h"
 #include "PSMIPCCommon.h"
 #include "secerr.h"
 #ifdef MOZ_WEBRTC
 #  include "mozilla/dom/ContentProcessManager.h"
 #  include "mozilla/dom/BrowserParent.h"
 #  include "mozilla/net/WebrtcTCPSocketParent.h"
 #endif
+#if defined(MOZ_WIDGET_ANDROID)
+#  include "mozilla/java/GeckoProcessManagerWrappers.h"
+#  include "mozilla/java/GeckoProcessTypeWrappers.h"
+#endif  // defined(MOZ_WIDGET_ANDROID)
 
 namespace mozilla {
 namespace net {
 
 static SocketProcessParent* sSocketProcessParent;
 
 SocketProcessParent::SocketProcessParent(SocketProcessHost* aHost)
     : mHost(aHost) {
--- a/netwerk/system/android/nsAndroidNetworkLinkService.cpp
+++ b/netwerk/system/android/nsAndroidNetworkLinkService.cpp
@@ -8,16 +8,17 @@
 #include "nsServiceManagerUtils.h"
 
 #include "nsIObserverService.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/Services.h"
 #include "mozilla/Logging.h"
 
 #include "AndroidBridge.h"
+#include "mozilla/java/GeckoAppShellWrappers.h"
 
 namespace java = mozilla::java;
 
 static mozilla::LazyLogModule gNotifyAddrLog("nsAndroidNetworkLinkService");
 #define LOG(args) MOZ_LOG(gNotifyAddrLog, mozilla::LogLevel::Debug, args)
 
 NS_IMPL_ISUPPORTS(nsAndroidNetworkLinkService, nsINetworkLinkService,
                   nsIObserver)