Bug 1637452: Part 1 - Fix JNI includes in widget/android; r=geckoview-reviewers,agi

Differential Revision: https://phabricator.services.mozilla.com/D75364

widget/android/AndroidAlerts.cpp

@@ -4,7 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AndroidAlerts.h"
-#include "GeneratedJNIWrappers.h"
+#include "mozilla/java/GeckoRuntimeWrappers.h"
+#include "mozilla/java/WebNotificationWrappers.h"
 #include "nsAlertsUtils.h"
 
 namespace mozilla {

widget/android/AndroidAlerts.h

@@ -13,7 +13,7 @@
 #include "nsIAlertsService.h"
 #include "nsIObserver.h"
 
-#include "GeneratedJNIWrappers.h"
+#include "mozilla/java/WebNotificationWrappers.h"
 
 #include "mozilla/StaticPtr.h"
 

widget/android/AndroidBridge.cpp

@@ -43,7 +43,9 @@
 #include "nsIObserverService.h"
 #include "WidgetUtils.h"
 
-#include "GeneratedJNIWrappers.h"
+#include "mozilla/java/EventDispatcherWrappers.h"
+#include "mozilla/java/GeckoAppShellWrappers.h"
+#include "mozilla/java/GeckoThreadWrappers.h"
 #include "mozilla/java/HardwareCodecCapabilityUtilsWrappers.h"
 
 using namespace mozilla;

widget/android/AndroidBridge.h

@@ -16,7 +16,7 @@
 #include "nsCOMPtr.h"
 #include "nsCOMArray.h"
 
-#include "GeneratedJNIWrappers.h"
+#include "mozilla/jni/Refs.h"
 
 #include "nsIMutableArray.h"
 #include "nsIMIMEInfo.h"

widget/android/AndroidUiThread.cpp

@@ -4,9 +4,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "base/message_loop.h"
-#include "GeneratedJNIWrappers.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/EventQueue.h"
+#include "mozilla/java/GeckoThreadWrappers.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/Mutex.h"

widget/android/Base64UtilsSupport.h

@@ -6,8 +6,8 @@
 #ifndef Base64UtilsSupport_h__
 #define Base64UtilsSupport_h__
 
-#include "GeneratedJNINatives.h"
 #include "mozilla/Base64.h"
+#include "mozilla/java/Base64UtilsNatives.h"
 
 namespace mozilla {
 namespace widget {

widget/android/EventDispatcher.cpp

@@ -15,6 +15,7 @@
 
 #include "mozilla/ScopeExit.h"
 #include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/java/EventCallbackWrappers.h"
 
 // Disable the C++ 2a warning. See bug #1509926
 #if defined(__clang__)

widget/android/EventDispatcher.h

@@ -7,7 +7,6 @@
 #ifndef mozilla_widget_EventDispatcher_h
 #define mozilla_widget_EventDispatcher_h
 
-#include "GeneratedJNINatives.h"
 #include "jsapi.h"
 #include "nsClassHashtable.h"
 #include "nsCOMArray.h"
@@ -15,6 +14,8 @@
 #include "nsHashKeys.h"
 #include "nsPIDOMWindow.h"
 
+#include "mozilla/java/EventDispatcherNatives.h"
+#include "mozilla/java/GeckoBundleWrappers.h"
 #include "mozilla/Mutex.h"
 
 namespace mozilla {

widget/android/GeckoBatteryManager.h

@@ -6,10 +6,10 @@
 #ifndef GeckoBatteryManager_h
 #define GeckoBatteryManager_h
 
-#include "GeneratedJNINatives.h"
 #include "nsAppShell.h"
 
 #include "mozilla/Hal.h"
+#include "mozilla/java/GeckoBatteryManagerNatives.h"
 
 namespace mozilla {
 

widget/android/GeckoEditableSupport.cpp

@@ -13,6 +13,8 @@
 
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/IMEStateManager.h"
+#include "mozilla/java/GeckoEditableChildWrappers.h"
+#include "mozilla/java/GeckoServiceChildProcessWrappers.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_intl.h"
 #include "mozilla/TextComposition.h"

widget/android/GeckoEditableSupport.h

@@ -6,11 +6,12 @@
 #ifndef mozilla_widget_GeckoEditableSupport_h
 #define mozilla_widget_GeckoEditableSupport_h
 
-#include "GeneratedJNIWrappers.h"
 #include "nsAppShell.h"
 #include "nsIWidget.h"
 #include "nsTArray.h"
 
+#include "mozilla/java/GeckoEditableChildNatives.h"
+#include "mozilla/java/SessionTextInputWrappers.h"
 #include "mozilla/TextEventDispatcher.h"
 #include "mozilla/TextEventDispatcherListener.h"
 #include "mozilla/UniquePtr.h"

widget/android/GeckoNetworkManager.h

@@ -6,11 +6,11 @@
 #ifndef GeckoNetworkManager_h
 #define GeckoNetworkManager_h
 
-#include "GeneratedJNINatives.h"
 #include "nsAppShell.h"
 #include "nsCOMPtr.h"
 #include "nsINetworkLinkService.h"
 
+#include "mozilla/java/GeckoNetworkManagerNatives.h"
 #include "mozilla/Services.h"
 
 namespace mozilla {

widget/android/GeckoProcessManager.h

@@ -6,13 +6,13 @@
 #ifndef GeckoProcessManager_h
 #define GeckoProcessManager_h
 
-#include "GeneratedJNINatives.h"
 #include "WidgetUtils.h"
 #include "nsAppShell.h"
 #include "nsWindow.h"
 
 #include "mozilla/RefPtr.h"
 #include "mozilla/dom/ContentProcessManager.h"
+#include "mozilla/java/GeckoProcessManagerNatives.h"
 
 namespace mozilla {
 

widget/android/GeckoScreenOrientation.h

@@ -6,12 +6,12 @@
 #ifndef GeckoScreenOrientation_h
 #define GeckoScreenOrientation_h
 
-#include "GeneratedJNINatives.h"
 #include "nsAppShell.h"
 #include "nsCOMPtr.h"
 #include "nsIScreenManager.h"
 
 #include "mozilla/Hal.h"
+#include "mozilla/java/GeckoScreenOrientationNatives.h"
 
 namespace mozilla {
 

widget/android/GeckoSystemStateListener.h

@@ -6,10 +6,10 @@
 #ifndef GeckoSystemStateListener_h
 #define GeckoSystemStateListener_h
 
-#include "GeneratedJNINatives.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/dom/Document.h"
+#include "mozilla/java/GeckoSystemStateListenerNatives.h"
 #include "nsIWindowMediator.h"
 #include "nsPIDOMWindow.h"
 

widget/android/GeckoTelemetryDelegate.h

@@ -11,8 +11,8 @@
 
 #include <jni.h>
 
+#include "mozilla/java/RuntimeTelemetryNatives.h"
 #include "mozilla/jni/Natives.h"
-#include "GeneratedJNIWrappers.h"
 
 namespace mozilla {
 namespace widget {

widget/android/GeckoVRManager.h

@@ -6,7 +6,7 @@
 #ifndef mozilla_GeckoVRManager_h_
 #define mozilla_GeckoVRManager_h_
 
-#include "GeneratedJNINatives.h"
+#include "mozilla/java/GeckoVRManagerWrappers.h"
 #include "mozilla/jni/Utils.h"
 
 namespace mozilla {

widget/android/ImageDecoderSupport.h

@@ -5,7 +5,7 @@
 #ifndef ImageDecoderSupport_h__
 #define ImageDecoderSupport_h__
 
-#include "GeneratedJNINatives.h"
+#include "mozilla/java/ImageDecoderNatives.h"
 
 class imgIContainerCallback;
 

widget/android/PrefsHelper.h

@@ -6,12 +6,12 @@
 #ifndef PrefsHelper_h
 #define PrefsHelper_h
 
-#include "GeneratedJNINatives.h"
 #include "MainThreadUtils.h"
 #include "nsAppShell.h"
 #include "nsCOMPtr.h"
 #include "nsVariant.h"
 
+#include "mozilla/java/PrefsHelperNatives.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
 

widget/android/ScreenHelperAndroid.cpp

@@ -6,12 +6,13 @@
 
 #include "ScreenHelperAndroid.h"
 #include "AndroidRect.h"
-#include "GeneratedJNINatives.h"
 #include "nsThreadUtils.h"
 
 #include <mozilla/jni/Refs.h>
 
 #include "mozilla/Atomics.h"
+#include "mozilla/java/GeckoAppShellWrappers.h"
+#include "mozilla/java/ScreenManagerHelperNatives.h"
 #include "mozilla/widget/ScreenManager.h"
 
 using namespace mozilla;

widget/android/Telemetry.h

@@ -6,7 +6,7 @@
 #ifndef mozilla_widget_Telemetry_h__
 #define mozilla_widget_Telemetry_h__
 
-#include "GeneratedJNINatives.h"
+#include "mozilla/java/TelemetryUtilsNatives.h"
 #include "nsAppShell.h"
 #include "nsIAndroidBridge.h"
 

widget/android/WebAuthnTokenManager.cpp

@@ -5,6 +5,8 @@
 
 #include "mozilla/dom/AndroidWebAuthnTokenManager.h"
 
+#include "mozilla/java/WebAuthnTokenManagerNatives.h"
+
 namespace mozilla {
 class WebAuthnTokenManager final
     : public java::WebAuthnTokenManager::Natives<WebAuthnTokenManager> {

widget/android/WebExecutorSupport.cpp

@@ -23,6 +23,12 @@
 #include "nsIDNSListener.h"
 #include "nsIDNSRecord.h"
 
+#include "mozilla/java/GeckoInputStreamNatives.h"
+#include "mozilla/java/GeckoResultWrappers.h"
+#include "mozilla/java/GeckoWebExecutorWrappers.h"
+#include "mozilla/java/WebMessageWrappers.h"
+#include "mozilla/java/WebRequestErrorWrappers.h"
+#include "mozilla/java/WebResponseWrappers.h"
 #include "mozilla/net/DNS.h"  // for NetAddr
 #include "mozilla/net/CookieJarSettings.h"
 #include "mozilla/Preferences.h"

widget/android/WebExecutorSupport.h

@@ -6,7 +6,9 @@
 #ifndef WebExecutorSupport_h__
 #define WebExecutorSupport_h__
 
-#include "GeneratedJNINatives.h"
+#include "mozilla/java/GeckoWebExecutorNatives.h"
+#include "mozilla/java/GeckoResultWrappers.h"
+#include "mozilla/java/WebRequestWrappers.h"
 
 namespace mozilla {
 namespace widget {

widget/android/jni/GeckoBundleUtils.h

@@ -7,6 +7,8 @@
 #ifndef mozilla_jni_GeckoBundleUtils_h
 #define mozilla_jni_GeckoBundleUtils_h
 
+#include "mozilla/java/GeckoBundleWrappers.h"
+
 namespace mozilla {
 namespace jni {
 

widget/android/jni/GeckoResultUtils.h

@@ -7,9 +7,8 @@
 #ifndef mozilla_jni_GeckoResultUtils_h
 #define mozilla_jni_GeckoResultUtils_h
 
+#include "mozilla/java/GeckoResultNatives.h"
 #include "mozilla/jni/Conversions.h"
-#include "GeneratedJNIWrappers.h"
-#include "GeneratedJNINatives.h"
 
 namespace mozilla {
 namespace jni {

widget/android/jni/Utils.cpp

@@ -11,8 +11,9 @@
 #include <pthread.h>
 
 #include "mozilla/Assertions.h"
+#include "mozilla/java/GeckoAppShellWrappers.h"
+#include "mozilla/java/GeckoThreadWrappers.h"
 
-#include "GeneratedJNIWrappers.h"
 #include "AndroidBuild.h"
 #include "nsAppShell.h"
 #include "nsExceptionHandler.h"

widget/android/nsAndroidProtocolHandler.cpp

@@ -10,7 +10,7 @@
 #include "android/log.h"
 #include "nsBaseChannel.h"
 #include "AndroidBridge.h"
-#include "GeneratedJNIWrappers.h"
+#include "mozilla/java/GeckoAppShellWrappers.h"
 
 using namespace mozilla;
 

widget/android/nsAppShell.cpp

@@ -33,13 +33,15 @@
 #include "mozilla/dom/BrowserChild.h"
 #include "mozilla/intl/OSPreferences.h"
 #include "mozilla/ipc/GeckoChildProcessHost.h"
+#include "mozilla/java/GeckoAppShellNatives.h"
+#include "mozilla/java/GeckoThreadNatives.h"
+#include "mozilla/java/XPCOMEventTargetNatives.h"
 #include "mozilla/widget/ScreenManager.h"
 #include "prenv.h"
 
 #include "AndroidBridge.h"
 #include "AndroidBridgeUtilities.h"
 #include "AndroidSurfaceTexture.h"
-#include "GeneratedJNINatives.h"
 #include <android/log.h>
 #include <pthread.h>
 #include <wchar.h>

widget/android/nsClipboard.cpp

@@ -2,8 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "mozilla/java/ClipboardWrappers.h"
+#include "mozilla/java/GeckoAppShellWrappers.h"
 #include "nsClipboard.h"
-#include "GeneratedJNIWrappers.h"
 #include "nsISupportsPrimitives.h"
 #include "nsCOMPtr.h"
 #include "nsComponentManagerUtils.h"

widget/android/nsLookAndFeel.cpp

@@ -11,6 +11,8 @@
 #include "gfxFontConstants.h"
 #include "mozilla/FontPropertyTypes.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/java/GeckoAppShellWrappers.h"
+#include "mozilla/java/GeckoSystemStateListenerWrappers.h"
 
 using namespace mozilla;
 using mozilla::dom::ContentChild;

widget/android/nsWindow.cpp

@@ -81,9 +81,16 @@ using mozilla::dom::ContentParent;
 #include "AndroidBridgeUtilities.h"
 #include "AndroidUiThread.h"
 #include "GeckoEditableSupport.h"
-#include "GeneratedJNINatives.h"
 #include "KeyEvent.h"
 #include "MotionEvent.h"
+#include "mozilla/java/EventDispatcherWrappers.h"
+#include "mozilla/java/GeckoAppShellWrappers.h"
+#include "mozilla/java/GeckoEditableChildWrappers.h"
+#include "mozilla/java/GeckoResultWrappers.h"
+#include "mozilla/java/GeckoSessionNatives.h"
+#include "mozilla/java/GeckoSystemStateListenerWrappers.h"
+#include "mozilla/java/PanZoomControllerNatives.h"
+#include "mozilla/java/SessionAccessibilityWrappers.h"
 #include "ScreenHelperAndroid.h"
 
 #include "GeckoProfiler.h"  // For AUTO_PROFILER_LABEL

widget/android/nsWindow.h

@@ -12,8 +12,8 @@
 #include "nsIIdleServiceInternal.h"
 #include "nsTArray.h"
 #include "EventDispatcher.h"
-#include "GeneratedJNIWrappers.h"
 #include "mozilla/EventForwards.h"
+#include "mozilla/java/GeckoBundleWrappers.h"
 #include "mozilla/MozPromise.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/StaticPtr.h"