Merge branch 'redwood' into 28.9-platform

1 files changed, 0 insertions, 47 deletions

diff --git a/widget/android/AndroidJNI.cpp b/widget/android/AndroidJNI.cpp
deleted file mode 100644
index 3e27d253b..000000000
--- a/widget/android/AndroidJNI.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: c++; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * 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 "mozilla/Hal.h"
-#include "nsIFile.h"
-#include "nsString.h"
-
-#include "AndroidBridge.h"
-#include "AndroidContentController.h"
-#include "AndroidGraphicBuffer.h"
-
-#include <jni.h>
-#include <pthread.h>
-#include <dlfcn.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include "nsAppShell.h"
-#include "nsWindow.h"
-#include <android/log.h>
-#include "nsIObserverService.h"
-#include "mozilla/Services.h"
-#include "nsThreadUtils.h"
-
-#include "mozilla/Unused.h"
-#include "mozilla/MathAlgorithms.h"
-#include "mozilla/UniquePtr.h"
-
-#include "mozilla/layers/APZCTreeManager.h"
-#include "nsPluginInstanceOwner.h"
-#include "AndroidSurfaceTexture.h"
-
-using namespace mozilla;
-using namespace mozilla::dom;
-using namespace mozilla::layers;
-using namespace mozilla::widget;
-
-/* Forward declare all the JNI methods as extern "C" */
-
-extern "C" {
-/*
- * Incoming JNI methods
- */
-
-}