6 files changed, 0 insertions, 129 deletions
diff --git a/dom/system/android/AndroidLocationProvider.cpp b/dom/system/android/AndroidLocationProvider.cpp
deleted file mode 100644
index 48694012a7..0000000000
--- a/dom/system/android/AndroidLocationProvider.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; 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 "nsGeolocation.h"
-#include "nsGeoPosition.h"
-#include "AndroidLocationProvider.h"
-#include "GeneratedJNIWrappers.h"
-
-using namespace mozilla;
-
-extern nsIGeolocationUpdate *gLocationCallback;
-
-NS_IMPL_ISUPPORTS(AndroidLocationProvider, nsIGeolocationProvider)
-
-AndroidLocationProvider::AndroidLocationProvider()
-{
-}
-
-AndroidLocationProvider::~AndroidLocationProvider()
-{
-    NS_IF_RELEASE(gLocationCallback);
-}
-
-NS_IMETHODIMP
-AndroidLocationProvider::Startup()
-{
-    java::GeckoAppShell::EnableLocation(true);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-AndroidLocationProvider::Watch(nsIGeolocationUpdate* aCallback)
-{
-    NS_IF_RELEASE(gLocationCallback);
-    gLocationCallback = aCallback;
-    NS_IF_ADDREF(gLocationCallback);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-AndroidLocationProvider::Shutdown()
-{
-    java::GeckoAppShell::EnableLocation(false);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-AndroidLocationProvider::SetHighAccuracy(bool enable)
-{
-    java::GeckoAppShell::EnableLocationHighAccuracy(enable);
-    return NS_OK;
-}
diff --git a/dom/system/android/AndroidLocationProvider.h b/dom/system/android/AndroidLocationProvider.h
deleted file mode 100644
index f6dc905b73..0000000000
--- a/dom/system/android/AndroidLocationProvider.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; 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 AndroidLocationProvider_h
-#define AndroidLocationProvider_h
-
-#include "nsIGeolocationProvider.h"
-
-class AndroidLocationProvider final : public nsIGeolocationProvider
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIGEOLOCATIONPROVIDER
-
-    AndroidLocationProvider();
-private:
-    ~AndroidLocationProvider();
-};
-
-#endif /* AndroidLocationProvider_h */
diff --git a/dom/system/android/moz.build b/dom/system/android/moz.build
deleted file mode 100644
index ad4a7c2341..0000000000
--- a/dom/system/android/moz.build
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-SOURCES += [
-    'AndroidLocationProvider.cpp',
-    'nsHapticFeedback.cpp',
-]
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xul'
-LOCAL_INCLUDES += [
-    '/dom/geolocation',
-]
diff --git a/dom/system/android/nsHapticFeedback.cpp b/dom/system/android/nsHapticFeedback.cpp
deleted file mode 100644
index 37b51767aa..0000000000
--- a/dom/system/android/nsHapticFeedback.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; 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 "mozilla/dom/ContentChild.h"
-#include "nsHapticFeedback.h"
-#include "GeneratedJNIWrappers.h"
-
-using namespace mozilla;
-
-NS_IMPL_ISUPPORTS(nsHapticFeedback, nsIHapticFeedback)
-
-NS_IMETHODIMP
-nsHapticFeedback::PerformSimpleAction(int32_t aType)
-{
-    java::GeckoAppShell::PerformHapticFeedback(aType == LongPress);
-    return NS_OK;
-}
diff --git a/dom/system/android/nsHapticFeedback.h b/dom/system/android/nsHapticFeedback.h
deleted file mode 100644
index 3b5c01c445..0000000000
--- a/dom/system/android/nsHapticFeedback.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; 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 "nsIHapticFeedback.h"
-
-class nsHapticFeedback final : public nsIHapticFeedback
-{
-private:
-  ~nsHapticFeedback() {}
-
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIHAPTICFEEDBACK
-};
diff --git a/dom/system/moz.build b/dom/system/moz.build
index fb41fd4f2d..31097d2481 100644
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -7,8 +7,6 @@ toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 
 if toolkit == 'windows':
     DIRS += ['windows']
-elif toolkit == 'android':
-    DIRS += ['android']
 elif toolkit in ('gtk2', 'gtk3'):
     DIRS += ['linux']