Bug 1637452: Part 9 - Fix JNI includes in accessible/android; r=eeejay
authorAaron Klotz <aklotz@mozilla.com>
Fri, 15 May 2020 17:04:36 +0000
changeset 530324 742536dad963b2e477931c706d01ba41a5de984b
parent 530323 1e9b2a06812e1ee16064955a65213410f8623483
child 530325 979783ce4d1ef8e19ac06fc8bb7ab7162e70736d
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)
reviewerseeejay
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 9 - Fix JNI includes in accessible/android; r=eeejay Differential Revision: https://phabricator.services.mozilla.com/D75372
accessible/android/AccessibleWrap.h
accessible/android/SessionAccessibility.h
--- a/accessible/android/AccessibleWrap.h
+++ b/accessible/android/AccessibleWrap.h
@@ -2,18 +2,19 @@
 /* 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/. */
 
 #ifndef mozilla_a11y_AccessibleWrap_h_
 #define mozilla_a11y_AccessibleWrap_h_
 
 #include "Accessible.h"
-#include "GeneratedJNIWrappers.h"
 #include "mozilla/a11y/ProxyAccessible.h"
+#include "mozilla/java/GeckoBundleWrappers.h"
+#include "mozilla/java/SessionAccessibilityWrappers.h"
 #include "nsCOMPtr.h"
 
 namespace mozilla {
 namespace a11y {
 
 class AccessibleWrap : public Accessible {
  public:
   AccessibleWrap(nsIContent* aContent, DocAccessible* aDoc);
--- a/accessible/android/SessionAccessibility.h
+++ b/accessible/android/SessionAccessibility.h
@@ -1,18 +1,17 @@
 /* -*- 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/. */
 
 #ifndef mozilla_a11y_SessionAccessibility_h_
 #define mozilla_a11y_SessionAccessibility_h_
 
-#include "GeneratedJNINatives.h"
-#include "GeneratedJNIWrappers.h"
+#include "mozilla/java/SessionAccessibilityNatives.h"
 #include "nsAppShell.h"
 #include "nsThreadUtils.h"
 #include "nsWindow.h"
 
 namespace mozilla {
 namespace a11y {
 
 class AccessibleWrap;