Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 01:44:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1389598 - Part 4: Remove remaining gonk refs. r=froydnj

Browse Source 
--HG--
extra : rebase_source : 063c7f95dda063eafabfa1921366bd1957b8fe73
This commit is contained in:
Eric Rahm 2017-08-11 17:45:18 -07:00
parent 9732475fe0
commit 0938982c90
30 changed files with 29 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Android.mk
View File

@ -1,5 +0,0 @@
# 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/.
# empty file to block B2G/Gonk from trying to build anything inside mozilla-central

11
accessible/jsat/PointerAdapter.jsm
View File

@ -44,17 +44,6 @@ var PointerRelay = { // jshint ignore:line
"touchend": true };
break;
case "gonk":
this._eventsOfInterest = {
"touchstart": true,
"touchmove": true,
"touchend": true,
"mousedown": false,
"mousemove": false,
"mouseup": false,
"click": false };
break;
default:
// Desktop.
this._eventsOfInterest = {

3
config/system-headers
View File

@ -392,9 +392,6 @@ DiskInit.h
dlfcn.h
dlgs.h
dl.h
#ifdef MOZ_WIDGET_GONK
dns_sd.h
#endif
docobj.h
dos/dosextens.h
dos.h

13
devtools/shared/discovery/discovery.js
View File

@ -160,18 +160,7 @@ LocalDevice.prototype = {
* Triggers the |name| setter to persist if needed.
*/
_generate: function () {
if (Services.appinfo.widgetToolkit == "gonk") {
// For Firefox OS devices, create one from the device name plus a little
// randomness. The goal is just to distinguish devices in an office
// environment where many people may have the same device model for
// testing purposes (which would otherwise all report the same name).
let name = libcutils.property_get("ro.product.device");
// Pick a random number from [0, 2^32)
let randomID = Math.floor(Math.random() * Math.pow(2, 32));
// To hex and zero pad
randomID = ("00000000" + randomID.toString(16)).slice(-8);
this.name = name + "-" + randomID;
} else if (Services.appinfo.widgetToolkit == "android") {
if (Services.appinfo.widgetToolkit == "android") {
// For Firefox for Android, use the device's model name.
// TODO: Bug 1180997: Find the right way to expose an editable name
this.name = sysInfo.get("device");

4
hal/HalTypes.h
View File

@ -63,8 +63,8 @@ enum ProcessPriority {
* Values that can be passed to hal::SetCurrentThreadPriority(). These should be
* functional in nature, such as COMPOSITOR, instead of levels, like LOW/HIGH.
* This allows us to tune our priority scheme for the system in one place such
* that it makes sense holistically for the overall operating system. On gonk
* or android we may want different priority schemes than on windows, etc.
* that it makes sense holistically for the overall operating system. On
* android we may want different priority schemes than on windows, etc.
*/
enum ThreadPriority {
THREAD_PRIORITY_COMPOSITOR,

2
hal/moz.build
View File

@ -95,7 +95,7 @@ else:
'fallback/FallbackVibration.cpp',
]
# Fallbacks for backends implemented on Gonk only.
# Fallbacks for backends no longer implemented.
UNIFIED_SOURCES += [
'fallback/FallbackDiskSpaceWatcher.cpp',
'fallback/FallbackProcessPriority.cpp',

4
ipc/dbus/RawDBusConnection.h
View File

@ -4,8 +4,8 @@
* 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_ipc_dbus_gonk_rawdbusconnection_h__
#define mozilla_ipc_dbus_gonk_rawdbusconnection_h__
#ifndef mozilla_ipc_dbus_rawdbusconnection_h__
#define mozilla_ipc_dbus_rawdbusconnection_h__
#include <dbus/dbus.h>
#include "mozilla/ipc/DBusConnectionRefPtr.h"

4
memory/build/mozmemory_wrap.h
View File

@ -58,13 +58,13 @@
* unprefixed, as well as duplication functions.
* Jemalloc-specific functions are also left unprefixed.
*
* - On Android and Gonk, all functions are left unprefixed. Additionally,
* - On Android all functions are left unprefixed. Additionally,
* C++ allocation functions (operator new/delete) are also exported and
* unprefixed.
*
* - On other systems (mostly Linux), all functions are left unprefixed.
*
* Only Android and Gonk add C++ allocation functions.
* Only Android adds C++ allocation functions.
*
* Proper exporting of the various functions is done with the MOZ_MEMORY_API
* and MOZ_JEMALLOC_API macros. MOZ_MEMORY_API is meant to be used for malloc

3
moz.build
View File

@ -16,9 +16,6 @@ with Files('LEGAL'):
with Files('aclocal.m4'):
BUG_COMPONENT = ('Core', 'Build Config')
with Files('Android.mk'):
BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
with Files('client.*'):
BUG_COMPONENT = ('Core', 'Build Config')

3
netwerk/dns/nsIDNSService.idl
View File

@ -132,8 +132,7 @@ interface nsIDNSService : nsISupports
* This function is identical to asyncResolve except an additional
* parameter aNetwortInterface. If parameter aNetworkInterface is an empty
* string function will return the same result as asyncResolve.
* Setting aNetworkInterface value make only sense for gonk,because it
* an per networking interface query is possible.
* Setting aNetworkInterface is deprecated.
*/
[implicit_jscontext, optional_argc]
nsICancelable asyncResolveExtended(in AUTF8String aHostName,

2
old-configure.in
View File

@ -4025,7 +4025,7 @@ fi
AC_SUBST(MOZ_DISABLE_STARTUPCACHE)
dnl ========================================================
dnl = Enable Pico Speech Synthesis (Gonk usually)
dnl = Enable Pico Speech Synthesis
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(synth-pico,
[ --enable-synth-pico Set compile flags necessary for compiling Pico Web Speech API ],

9
testing/mochitest/runtests.py
View File

@ -2162,11 +2162,10 @@ toolbar#nav-bar {
# install specialpowers and mochikit addons
addons = Addons(self.marionette)
if mozinfo.info.get('toolkit') != 'gonk':
addons.install(create_zip(
os.path.join(here, 'extensions', 'specialpowers')
))
addons.install(create_zip(self.mochijar))
addons.install(create_zip(
os.path.join(here, 'extensions', 'specialpowers')
))
addons.install(create_zip(self.mochijar))
self.execute_start_script()

2
testing/modules/tests/xpcshell/xpcshell.ini
View File

@ -1,6 +1,6 @@
[DEFAULT]
head =
skip-if = toolkit == 'android' || toolkit == 'gonk'
skip-if = toolkit == 'android'
[test_assert.js]
[test_mockRegistrar.js]

5
testing/mozbase/mozrunner/mozrunner/utils.py
View File

@ -102,10 +102,7 @@ def test_environment(xrePath, env=None, crashreporter=True, debugger=False,
envVar = None
dmdLibrary = None
preloadEnvVar = None
if 'toolkit' in mozinfo.info and mozinfo.info['toolkit'] == "gonk":
# Skip all of this, it's only valid for the host.
pass
elif mozinfo.isUnix:
if mozinfo.isUnix:
envVar = "LD_LIBRARY_PATH"
env['MOZILLA_FIVE_HOME'] = xrePath
dmdLibrary = "libdmd.so"

1
testing/xpcshell/example/unit/xpcshell.ini
View File

@ -4,7 +4,6 @@
[DEFAULT]
head =
skip-if = toolkit == 'gonk'
support-files =
subdir/file.txt
file.txt

11
toolkit/components/captivedetect/captivedetect.js
View File

@ -90,8 +90,6 @@ function LoginObserver(captivePortalDetector) {
.getService(Ci.nsIHttpActivityDistributor);
let urlFetcher = null;
let waitForNetworkActivity = Services.appinfo.widgetToolkit == "gonk";
let pageCheckingDone = function pageCheckingDone() {
if (state === LOGIN_OBSERVER_STATE_VERIFYING) {
urlFetcher = null;
@ -180,14 +178,7 @@ function LoginObserver(captivePortalDetector) {
state = LOGIN_OBSERVER_STATE_VERIFY_NEEDED;
// Fall though to start polling timer
case LOGIN_OBSERVER_STATE_IDLE:
if (waitForNetworkActivity) {
timer.initWithCallback(this,
captivePortalDetector._pollingTime,
timer.TYPE_ONE_SHOT);
break;
}
// if we don't need to wait for network activity, just fall through
// to perform a captive portal check.
// Just fall through to perform a captive portal check.
case LOGIN_OBSERVER_STATE_VERIFY_NEEDED:
// Polling the canonical website since network stays idle for a while
state = LOGIN_OBSERVER_STATE_VERIFYING;

2
toolkit/components/osfile/modules/osfile_async_front.jsm
View File

@ -776,7 +776,7 @@ File.prototype = {
};
if (SharedAll.Constants.Sys.Name != "Android" && SharedAll.Constants.Sys.Name != "Gonk") {
if (SharedAll.Constants.Sys.Name != "Android") {
/**
* Set the last access and modification date of the file.
* The time stamp resolution is 1 second at best, but might be worse

7
toolkit/components/osfile/tests/xpcshell/test_constants.js
View File

@ -15,12 +15,7 @@ add_task(async function check_definition() {
do_check_true(OS.Constants.Path!=null);
do_check_true(OS.Constants.Sys!=null);
//check system name
if (OS.Constants.Sys.Name == "Gonk") {
// Services.appinfo.OS doesn't know the difference between Gonk and Android
do_check_eq(Services.appinfo.OS, "Android");
} else {
do_check_eq(Services.appinfo.OS, OS.Constants.Sys.Name);
}
do_check_eq(Services.appinfo.OS, OS.Constants.Sys.Name);
//check if using DEBUG build
if (Components.classes["@mozilla.org/xpcom/debug;1"].getService(Components.interfaces.nsIDebug2).isDebugBuild == true) {

4
toolkit/components/osfile/tests/xpcshell/test_osfile_async_setDates.js
View File

@ -95,8 +95,8 @@ add_task(async function test_nonproto() {
// Prototypical tests, operating on |File| handles.
add_task(async function test_proto() {
if (OS.Constants.Sys.Name == "Android" || OS.Constants.Sys.Name == "Gonk") {
do_print("File.prototype.setDates is not implemented for Android/B2G");
if (OS.Constants.Sys.Name == "Android") {
do_print("File.prototype.setDates is not implemented for Android");
do_check_eq(OS.File.prototype.setDates, undefined);
return;
}

2
toolkit/components/osfile/tests/xpcshell/test_path_constants.js
View File

@ -58,7 +58,7 @@ add_task(async function test_simple_paths() {
// Test presence of paths that only exist on Desktop platforms
add_task(async function test_desktop_paths() {
if (OS.Constants.Sys.Name == "Android" || OS.Constants.Sys.Name == "Gonk") {
if (OS.Constants.Sys.Name == "Android") {
return;
}
do_check_true(!!OS.Constants.Path.desktopDir);

3
toolkit/crashreporter/crashreporter.mozbuild
View File

@ -35,7 +35,4 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
'-Wno-c++11-narrowing',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
DEFINES['ELFSIZE'] = 32
DEFINES['NO_STABS_SUPPORT'] = True

2
toolkit/crashreporter/nsExceptionHandler.cpp
View File

@ -1285,7 +1285,7 @@ BuildTempPath(char* aBuf, size_t aBufLen)
static size_t
BuildTempPath(char* aBuf, size_t aBufLen)
{
// GeckoAppShell or Gonk's init.rc sets this in the environment
// GeckoAppShell sets this in the environment
const char *tempenv = PR_GetEnv("TMPDIR");
if (!tempenv) {
return false;

2
toolkit/mozapps/extensions/extensions.manifest
View File

@ -5,7 +5,6 @@ component {e0a106ed-6ad4-47a4-b6af-2f1c8aa4712d} nsBlocklistServiceContent.js pr
contract @mozilla.org/extensions/blocklist;1 {e0a106ed-6ad4-47a4-b6af-2f1c8aa4712d} process=content
category update-timer nsBlocklistService @mozilla.org/extensions/blocklist;1,getService,blocklist-background-update-timer,extensions.blocklist.interval,86400
#ifndef MOZ_WIDGET_GONK
component {4399533d-08d1-458c-a87a-235f74451cfa} addonManager.js
contract @mozilla.org/addons/integration;1 {4399533d-08d1-458c-a87a-235f74451cfa}
#ifndef MOZ_WIDGET_ANDROID
@ -20,6 +19,5 @@ category JavaScript-global-property InstallTrigger @mozilla.org/addons/installtr
category addon-provider-module PluginProvider resource://gre/modules/addons/PluginProvider.jsm
#endif
category addon-provider-module GMPProvider resource://gre/modules/addons/GMPProvider.jsm
#endif
component {8866d8e3-4ea5-48b7-a891-13ba0ac15235} amWebAPI.js
contract @mozilla.org/addon-web-api/manager;1 {8866d8e3-4ea5-48b7-a891-13ba0ac15235}

3
toolkit/mozapps/installer/packager.mk
View File

@ -27,9 +27,6 @@ ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD
$(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(DEPTH)/installer-stage && true
endif
ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
ELF_HACK_FLAGS = --fill
endif
export USE_ELF_HACK ELF_HACK_FLAGS
# Override the value of OMNIJAR_NAME from config.status with the value

4
toolkit/mozapps/installer/upload-files.mk
View File

@ -335,9 +335,7 @@ endif
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
OPTIMIZEJARS = 1
ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
DISABLE_JAR_COMPRESSION = 1
endif
DISABLE_JAR_COMPRESSION = 1
endif
# A js binary is needed to perform verification of JavaScript minification.

2
toolkit/mozapps/update/nsIUpdateService.idl
View File

@ -413,7 +413,7 @@ interface nsIUpdateProcessor : nsISupports
* On Windows, this can also be used for switching to an applied
* update request.
* @param update The update being applied, or null if this is a switch
* to updated application request. Must be non-null on GONK.
* to updated application request.
*/
void processUpdate(in nsIUpdate update);
};

4
uriloader/exthandler/nsExternalHelperAppService.cpp
View File

@ -1799,7 +1799,7 @@ void nsExternalAppHandler::SendStatusChange(ErrorType type, nsresult rv, nsIRequ
if (type == kWriteError) {
// Attempt to write without sufficient permissions.
#if defined(ANDROID)
// On Android (and Gonk), this means the SD card is present but
// On Android this means the SD card is present but
// unavailable (read-only).
msgId = "SDAccessErrorCardReadOnly";
#else
@ -1820,7 +1820,7 @@ void nsExternalAppHandler::SendStatusChange(ErrorType type, nsresult rv, nsIRequ
}
#if defined(ANDROID)
else if (type == kWriteError) {
// On Android (and Gonk), this means the SD card is missing (not in
// On Android this means the SD card is missing (not in
// SD slot).
msgId = "SDAccessErrorCardMissing";
break;

2
widget/NativeKeyToDOMCodeName.h
View File

@ -21,7 +21,7 @@
#define CODE_MAP_MAC(aCPPCodeName, aNativeKey)
// GTK and Qt on Linux
#define CODE_MAP_X11(aCPPCodeName, aNativeKey)
// Android and Gonk
// Android
#define CODE_MAP_ANDROID(aCPPCodeName, aNativeKey)
#if defined(XP_WIN)

2
widget/tests/TestAppShellSteadyState.cpp
View File

@ -310,7 +310,7 @@ already_AddRefed<nsIAppShell>
GetAppShell()
{
static const char* platforms[] = {
"android", "mac", "gonk", "gtk", "qt", "win"
"android", "mac", "gtk", "qt", "win"
};
NS_NAMED_LITERAL_CSTRING(contractPrefix, "@mozilla.org/widget/appshell/");

17
xpcom/build/nsXULAppAPI.h
View File

@ -169,27 +169,10 @@
*
* Mac: ~/Library/Caches/Mozilla/updates/<absolute path to app dir>
*
* Gonk: /data/local
*
* All others: Parent directory of XRE_EXECUTABLE_FILE.
*/
#define XRE_UPDATE_ROOT_DIR "UpdRootD"
/**
* A directory service key which provides an alternate location
* to UpdRootD to to store large files. This key is currently
* only implemented in the Gonk directory service provider.
*/
#define XRE_UPDATE_ARCHIVE_DIR "UpdArchD"
/**
* A directory service key which provides the directory where an OS update is
* applied.
* At present this is supported only in Gonk.
*/
#define XRE_OS_UPDATE_APPLY_TO_DIR "OSUpdApplyToD"
/**
* Begin an XUL application. Does not return until the user exits the
* application.