Bug 1637452: Part 2 - Fix JNI includes in hal/android; r=geckoview-reviewers,agi
authorAaron Klotz <aklotz@mozilla.com>
Fri, 15 May 2020 17:04:12 +0000
changeset 530317 b28b3a9fcce982b48bd636ae6960f92470967fa6
parent 530316 7de07715929fdb02ced4c0630a7123e9a4ecb74c
child 530318 a0a2619129601a8919af7ea80797e2d8036a2bff
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)
reviewersgeckoview-reviewers, agi
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 2 - Fix JNI includes in hal/android; r=geckoview-reviewers,agi Differential Revision: https://phabricator.services.mozilla.com/D75365
hal/android/AndroidHal.cpp
hal/android/AndroidProcessPriority.cpp
hal/android/AndroidSensor.cpp
--- a/hal/android/AndroidHal.cpp
+++ b/hal/android/AndroidHal.cpp
@@ -3,16 +3,17 @@
  * 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 "Hal.h"
 #include "HalImpl.h"
 #include "WindowIdentifier.h"
 #include "AndroidBridge.h"
 #include "mozilla/dom/network/Constants.h"
+#include "mozilla/java/GeckoAppShellWrappers.h"
 #include "nsIScreenManager.h"
 #include "nsPIDOMWindow.h"
 #include "nsServiceManagerUtils.h"
 
 using namespace mozilla::dom;
 using namespace mozilla::hal;
 
 namespace java = mozilla::java;
--- a/hal/android/AndroidProcessPriority.cpp
+++ b/hal/android/AndroidProcessPriority.cpp
@@ -1,17 +1,19 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #include "Hal.h"
 
-#include "GeneratedJNIWrappers.h"
+#include "mozilla/java/GeckoProcessManagerWrappers.h"
+#include "mozilla/java/GeckoProcessTypeWrappers.h"
+#include "mozilla/java/ServiceAllocatorWrappers.h"
 
 /**
  * Bucket the Gecko HAL process priority level into one of the three Android
  * priority levels.
  */
 static mozilla::java::ServiceAllocator::PriorityLevel::LocalRef
 ToJavaPriorityLevel(const ProcessPriority aPriority) {
   if (aPriority >= PROCESS_PRIORITY_FOREGROUND) {
--- a/hal/android/AndroidSensor.cpp
+++ b/hal/android/AndroidSensor.cpp
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "Hal.h"
-#include "GeneratedJNIWrappers.h"
+#include "mozilla/java/GeckoAppShellWrappers.h"
 
 using namespace mozilla::hal;
 
 namespace mozilla {
 namespace hal_impl {
 
 void EnableSensorNotifications(SensorType aSensor) {
   java::GeckoAppShell::EnableSensor(aSensor);