summaryrefslogtreecommitdiffstats
path: root/toolkit/system
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-25 19:45:39 -0500
committerMatt A. Tobin <email@mattatobin.com>2020-02-25 19:45:39 -0500
commit35c26c6c19e66fabcb230fb074e76e243df04d2b (patch)
tree9cbdb0397c76a7477cd60c53347ab33d426f2019 /toolkit/system
parent8f35c37a9e82ea3e99780c1a001641227a00b6a9 (diff)
downloadUXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar
UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar.gz
UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar.lz
UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar.xz
UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.zip
Issue #1053 - Remove android support from toolkit
Note: Does not remove support completely from toolkit/mozapps/installer or from telemetry or AppConstants.jsm
Diffstat (limited to 'toolkit/system')
-rw-r--r--toolkit/system/androidproxy/moz.build11
-rw-r--r--toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp89
2 files changed, 0 insertions, 100 deletions
diff --git a/toolkit/system/androidproxy/moz.build b/toolkit/system/androidproxy/moz.build
deleted file mode 100644
index 5c6b0c105..000000000
--- a/toolkit/system/androidproxy/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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 += [
- 'nsAndroidSystemProxySettings.cpp',
-]
-
-FINAL_LIBRARY = 'xul'
diff --git a/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp b/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp
deleted file mode 100644
index 71e12bb77..000000000
--- a/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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 "nsIURI.h"
-
-#include "nsISystemProxySettings.h"
-#include "nsIServiceManager.h"
-#include "mozilla/ModuleUtils.h"
-#include "nsPrintfCString.h"
-#include "nsNetCID.h"
-#include "nsISupportsPrimitives.h"
-#include "nsIURI.h"
-
-#include "AndroidBridge.h"
-
-class nsAndroidSystemProxySettings : public nsISystemProxySettings
-{
-public:
- NS_DECL_THREADSAFE_ISUPPORTS
- NS_DECL_NSISYSTEMPROXYSETTINGS
-
- nsAndroidSystemProxySettings() {};
- nsresult Init();
-
-private:
- virtual ~nsAndroidSystemProxySettings() {}
-};
-
-NS_IMPL_ISUPPORTS(nsAndroidSystemProxySettings, nsISystemProxySettings)
-
-NS_IMETHODIMP
-nsAndroidSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
-{
- *aMainThreadOnly = true;
- return NS_OK;
-}
-
-
-nsresult
-nsAndroidSystemProxySettings::Init()
-{
- return NS_OK;
-}
-
-nsresult
-nsAndroidSystemProxySettings::GetPACURI(nsACString& aResult)
-{
- return NS_OK;
-}
-
-nsresult
-nsAndroidSystemProxySettings::GetProxyForURI(const nsACString & aSpec,
- const nsACString & aScheme,
- const nsACString & aHost,
- const int32_t aPort,
- nsACString & aResult)
-{
- return mozilla::AndroidBridge::Bridge()->GetProxyForURI(aSpec, aScheme, aHost, aPort, aResult);
-}
-
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAndroidSystemProxySettings, Init)
-
-#define NS_ANDROIDSYSTEMPROXYSERVICE_CID \
- {0xf01f0060, 0x3708, 0x478e, \
- {0xb9, 0x35, 0x3e, 0xce, 0x8b, 0xe2, 0x94, 0xb8}}
-
-NS_DEFINE_NAMED_CID(NS_ANDROIDSYSTEMPROXYSERVICE_CID);
-
-void test() {};
-
-static const mozilla::Module::CIDEntry kSysProxyCIDs[] = {
- { &kNS_ANDROIDSYSTEMPROXYSERVICE_CID, false, nullptr, nsAndroidSystemProxySettingsConstructor },
- { nullptr }
-};
-
-static const mozilla::Module::ContractIDEntry kSysProxyContracts[] = {
- { NS_SYSTEMPROXYSETTINGS_CONTRACTID, &kNS_ANDROIDSYSTEMPROXYSERVICE_CID },
- { nullptr }
-};
-
-static const mozilla::Module kSysProxyModule = {
- mozilla::Module::kVersion,
- kSysProxyCIDs,
- kSysProxyContracts
-};
-
-NSMODULE_DEFN(nsAndroidProxyModule) = &kSysProxyModule;