Bug 1389598 - Part 4: Remove remaining gonk refs. r=froydnj
authorEric Rahm <erahm@mozilla.com>
Fri, 11 Aug 2017 17:45:18 -0700
changeset 375739 65558d987c7ea5b6f35cb09c1f444c7d4353935e
parent 375738 69da38fcf84c9091473c4c501df11d6f6b9e0e60
child 375740 4f4487cc2d30d988742109868dcf21c4113f12f5
child 375780 f349e0705a1ca75c2680d3816777423b764dbd19
push id49170
push userkwierso@gmail.com
push dateSat, 19 Aug 2017 00:21:52 +0000
treeherderautoland@3083bebb7d9d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1389598
milestone57.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 1389598 - Part 4: Remove remaining gonk refs. r=froydnj
Android.mk
accessible/jsat/PointerAdapter.jsm
config/system-headers
devtools/shared/discovery/discovery.js
hal/HalTypes.h
hal/moz.build
ipc/dbus/RawDBusConnection.h
memory/build/mozmemory_wrap.h
moz.build
netwerk/dns/nsIDNSService.idl
old-configure.in
testing/mochitest/runtests.py
testing/modules/tests/xpcshell/xpcshell.ini
testing/mozbase/mozrunner/mozrunner/utils.py
testing/xpcshell/example/unit/xpcshell.ini
toolkit/components/captivedetect/captivedetect.js
toolkit/components/osfile/modules/osfile_async_front.jsm
toolkit/components/osfile/tests/xpcshell/test_constants.js
toolkit/components/osfile/tests/xpcshell/test_osfile_async_setDates.js
toolkit/components/osfile/tests/xpcshell/test_path_constants.js
toolkit/crashreporter/crashreporter.mozbuild
toolkit/crashreporter/nsExceptionHandler.cpp
toolkit/mozapps/extensions/extensions.manifest
toolkit/mozapps/installer/packager.mk
toolkit/mozapps/installer/upload-files.mk
toolkit/mozapps/update/nsIUpdateService.idl
uriloader/exthandler/nsExternalHelperAppService.cpp
widget/NativeKeyToDOMCodeName.h
widget/tests/TestAppShellSteadyState.cpp
xpcom/build/nsXULAppAPI.h
deleted file mode 100644
--- a/Android.mk
+++ /dev/null
@@ -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
--- a/accessible/jsat/PointerAdapter.jsm
+++ b/accessible/jsat/PointerAdapter.jsm
@@ -39,27 +39,16 @@ var PointerRelay = { // jshint ignore:li
     switch (Utils.widgetToolkit) {
       case "android":
         this._eventsOfInterest = {
           "touchstart": true,
           "touchmove": true,
           "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 = {
           "mousemove": true,
           "mousedown": true,
           "mouseup": true,
           "click": false
         };
--- a/config/system-headers
+++ b/config/system-headers
@@ -387,19 +387,16 @@ descrip.h
 Devices.h
 Dialogs.h
 direct.h
 dirent.h
 DiskInit.h
 dlfcn.h
 dlgs.h
 dl.h
-#ifdef MOZ_WIDGET_GONK
-dns_sd.h
-#endif
 docobj.h
 dos/dosextens.h
 dos.h
 Drag.h
 DriverServices.h
 DriverSynchronization.h
 DropInPanel.h
 dvidef.h
--- a/devtools/shared/discovery/discovery.js
+++ b/devtools/shared/discovery/discovery.js
@@ -155,28 +155,17 @@ LocalDevice.prototype = {
     this._generate();
   },
 
   /**
    * Generate a new device name from various platform-specific properties.
    * 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");
     } else {
       this.name = Cc["@mozilla.org/network/dns-service;1"].getService(Ci.nsIDNSService)
                                                           .myHostName;
     }
   },
--- a/hal/HalTypes.h
+++ b/hal/HalTypes.h
@@ -58,18 +58,18 @@ enum ProcessPriority {
   PROCESS_PRIORITY_MASTER,
   NUM_PROCESS_PRIORITY
 };
 
 /**
  * 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,
   NUM_THREAD_PRIORITY
 };
 
 /**
  * Convert a ProcessPriority enum value to a string.  The strings returned by
--- a/hal/moz.build
+++ b/hal/moz.build
@@ -90,17 +90,17 @@ elif CONFIG['OS_TARGET'] in ('OpenBSD', 
 else:
     UNIFIED_SOURCES += [
         'fallback/FallbackBattery.cpp',
         'fallback/FallbackScreenConfiguration.cpp',
         'fallback/FallbackSensor.cpp',
         'fallback/FallbackVibration.cpp',
     ]
 
-# Fallbacks for backends implemented on Gonk only.
+# Fallbacks for backends no longer implemented.
 UNIFIED_SOURCES += [
     'fallback/FallbackDiskSpaceWatcher.cpp',
     'fallback/FallbackProcessPriority.cpp',
     'fallback/FallbackSwitch.cpp',
     'fallback/FallbackThreadPriority.cpp',
     'fallback/FallbackTime.cpp',
 ]
 
--- a/ipc/dbus/RawDBusConnection.h
+++ b/ipc/dbus/RawDBusConnection.h
@@ -1,16 +1,16 @@
 /* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
 /* vim: set ts=2 et sw=2 tw=80: */
 /* 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_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"
 
 namespace mozilla {
 namespace ipc {
 
 typedef void (*DBusReplyCallback)(DBusMessage*, void*);
--- a/memory/build/mozmemory_wrap.h
+++ b/memory/build/mozmemory_wrap.h
@@ -53,23 +53,23 @@
  *
  * - On MacOSX, the system libc has a zone allocator, which allows us to
  *   hook custom malloc implementation functions without exporting them.
  *   However, since we want things in Firefox to skip the system zone
  *   allocator, the malloc implementation functions are all exported
  *   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
  * implementation and duplication functions, while MOZ_JEMALLOC_API is
  * dedicated to jemalloc specific functions.
  *
  *
  * All these functions are meant to be called with no prefix from Gecko code.
--- a/moz.build
+++ b/moz.build
@@ -11,19 +11,16 @@ with Files('LICENSE'):
     BUG_COMPONENT = ('mozilla.org', 'Licensing')
 
 with Files('LEGAL'):
     BUG_COMPONENT = ('mozilla.org', 'Licensing')
 
 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')
 
 with Files('CLOBBER'):
     BUG_COMPONENT = ('Core', 'Build Config')
 
 with Files('*configure*'):
     BUG_COMPONENT = ('Core', 'Build Config')
--- a/netwerk/dns/nsIDNSService.idl
+++ b/netwerk/dns/nsIDNSService.idl
@@ -127,18 +127,17 @@ interface nsIDNSService : nsISupports
                            out nsIDNSRecord     aResult);
 
     /**
      * kicks off an asynchronous host lookup.
      *
      * 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,
                                        in unsigned long     aFlags,
                                        in AUTF8String       aNetworkInterface,
                                        in nsIDNSListener    aListener,
                                        in nsIEventTarget    aListenerTarget,
                             [optional] in jsval             aOriginAttributes);
--- a/old-configure.in
+++ b/old-configure.in
@@ -4020,17 +4020,17 @@ MOZ_ARG_DISABLE_BOOL(startupcache,
     MOZ_DISABLE_STARTUPCACHE=)
 
 if test -n "$MOZ_DISABLE_STARTUPCACHE"; then
   AC_DEFINE(MOZ_DISABLE_STARTUPCACHE)
 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 ],
     MOZ_SYNTH_PICO=1,
     MOZ_SYNTH_PICO= )
 if test -n "$MOZ_SYNTH_PICO"; then
     AC_DEFINE(MOZ_SYNTH_PICO)
 fi
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -2157,21 +2157,20 @@ toolbar#nav-bar {
             marionette_args = marionette_args or {}
             port_timeout = marionette_args.pop('port_timeout', 60)
             self.marionette = Marionette(**marionette_args)
             self.marionette.start_session(timeout=port_timeout)
 
             # 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()
 
             # an open marionette session interacts badly with mochitest,
             # delete it until we figure out why.
             self.marionette.delete_session()
             del self.marionette
 
--- a/testing/modules/tests/xpcshell/xpcshell.ini
+++ b/testing/modules/tests/xpcshell/xpcshell.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
 head =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_assert.js]
 [test_mockRegistrar.js]
 [test_structuredlog.js]
--- a/testing/mozbase/mozrunner/mozrunner/utils.py
+++ b/testing/mozbase/mozrunner/mozrunner/utils.py
@@ -97,20 +97,17 @@ def test_environment(xrePath, env=None, 
     if mozinfo.isMac:
         ldLibraryPath = os.path.join(os.path.dirname(xrePath), "MacOS")
     else:
         ldLibraryPath = xrePath
 
     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"
         preloadEnvVar = "LD_PRELOAD"
     elif mozinfo.isMac:
         envVar = "DYLD_LIBRARY_PATH"
         dmdLibrary = "libdmd.dylib"
         preloadEnvVar = "DYLD_INSERT_LIBRARIES"
--- a/testing/xpcshell/example/unit/xpcshell.ini
+++ b/testing/xpcshell/example/unit/xpcshell.ini
@@ -1,15 +1,14 @@
 # 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/.
 
 [DEFAULT]
 head =
-skip-if = toolkit == 'gonk'
 support-files =
   subdir/file.txt
   file.txt
   import_module.jsm
   import_sub_module.jsm
   load_subscript.js
   location_load.js
   check_profile.js
--- a/toolkit/components/captivedetect/captivedetect.js
+++ b/toolkit/components/captivedetect/captivedetect.js
@@ -85,18 +85,16 @@ function LoginObserver(captivePortalDete
 
   let state = LOGIN_OBSERVER_STATE_DETACHED;
 
   let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
   let activityDistributor = Cc["@mozilla.org/network/http-activity-distributor;1"]
                               .getService(Ci.nsIHttpActivityDistributor);
   let urlFetcher = null;
 
-  let waitForNetworkActivity = Services.appinfo.widgetToolkit == "gonk";
-
   let pageCheckingDone = function pageCheckingDone() {
     if (state === LOGIN_OBSERVER_STATE_VERIFYING) {
       urlFetcher = null;
       // Finish polling the canonical site, switch back to idle state and
       // waiting for next burst
       state = LOGIN_OBSERVER_STATE_IDLE;
       timer.initWithCallback(observer,
                              captivePortalDetector._pollingTime,
@@ -175,24 +173,17 @@ function LoginObserver(captivePortalDete
      */
     notify: function notify() {
       switch (state) {
         case LOGIN_OBSERVER_STATE_BURST:
           // Wait while network stays idle for a short period
           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;
           checkPageContent();
           break;
 
         default:
           break;
--- a/toolkit/components/osfile/modules/osfile_async_front.jsm
+++ b/toolkit/components/osfile/modules/osfile_async_front.jsm
@@ -771,17 +771,17 @@ File.prototype = {
    */
   setPermissions: function setPermissions(options = {}) {
     return Scheduler.post("File_prototype_setPermissions",
                           [this._fdmsg, options]);
   }
 };
 
 
-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
    * depending on the platform.
    *
    * WARNING: This method is not implemented on Android/B2G. On Android/B2G,
    * you should use File.setDates instead.
    *
--- a/toolkit/components/osfile/tests/xpcshell/test_constants.js
+++ b/toolkit/components/osfile/tests/xpcshell/test_constants.js
@@ -10,22 +10,17 @@ function run_test() {
 
 // Test that OS.Constants is defined correctly.
 add_task(async function check_definition() {
   do_check_true(OS.Constants!=null);
   do_check_true(!!OS.Constants.Win || !!OS.Constants.libc);
   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) {
     do_check_true(OS.Constants.Sys.DEBUG);
   } else {
     do_check_true(typeof(OS.Constants.Sys.DEBUG) == 'undefined');
   }
 });
--- a/toolkit/components/osfile/tests/xpcshell/test_osfile_async_setDates.js
+++ b/toolkit/components/osfile/tests/xpcshell/test_osfile_async_setDates.js
@@ -90,18 +90,18 @@ add_task(async function test_nonproto() 
   } finally {
     // Remove the temp file again
     await OS.File.remove(path);
   }
 });
 
 // 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;
   }
 
   // First, create a file we can mess with.
   let path = OS.Path.join(OS.Constants.Path.tmpDir,
                               "test_osfile_async_setDates_proto.tmp");
   await OS.File.writeAtomic(path, new Uint8Array(1));
--- a/toolkit/components/osfile/tests/xpcshell/test_path_constants.js
+++ b/toolkit/components/osfile/tests/xpcshell/test_path_constants.js
@@ -53,17 +53,17 @@ add_task(async function test_before_afte
 add_task(async function test_simple_paths() {
   do_check_true(!!OS.Constants.Path.tmpDir);
   compare_paths(OS.Constants.Path.tmpDir, "TmpD");
 
 });
 
 // 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);
   do_check_true(!!OS.Constants.Path.homeDir);
 
   compare_paths(OS.Constants.Path.homeDir, "Home");
   compare_paths(OS.Constants.Path.desktopDir, "Desk");
   compare_paths(OS.Constants.Path.userApplicationDataDir, "UAppData");
--- a/toolkit/crashreporter/crashreporter.mozbuild
+++ b/toolkit/crashreporter/crashreporter.mozbuild
@@ -30,12 +30,9 @@ elif CONFIG['GNU_CXX']:
     ]
 
 if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
     CXXFLAGS += [
         '-Wno-implicit-fallthrough',
         '-Wno-c++11-narrowing',
     ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    DEFINES['ELFSIZE'] = 32
-
 DEFINES['NO_STABS_SUPPORT'] = True
--- a/toolkit/crashreporter/nsExceptionHandler.cpp
+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -1280,17 +1280,17 @@ BuildTempPath(char* aBuf, size_t aBufLen
   return EnsureTrailingSlash(aBuf, aBufLen);
 }
 
 #elif defined(__ANDROID__)
 
 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;
   }
   size_t size = aBufLen;
   Concat(aBuf, tempenv, &size);
   return EnsureTrailingSlash(aBuf, aBufLen);
 }
--- a/toolkit/mozapps/extensions/extensions.manifest
+++ b/toolkit/mozapps/extensions/extensions.manifest
@@ -1,25 +1,23 @@
 component {66354bc9-7ed1-4692-ae1d-8da97d6b205e} nsBlocklistService.js process=main
 contract @mozilla.org/extensions/blocklist;1 {66354bc9-7ed1-4692-ae1d-8da97d6b205e} process=main
 category profile-after-change nsBlocklistService @mozilla.org/extensions/blocklist;1  process=main
 component {e0a106ed-6ad4-47a4-b6af-2f1c8aa4712d} nsBlocklistServiceContent.js process=content
 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
 category update-timer addonManager @mozilla.org/addons/integration;1,getService,addon-background-update-timer,extensions.update.interval,86400
 #endif
 component {7beb3ba8-6ec3-41b4-b67c-da89b8518922} amContentHandler.js
 contract @mozilla.org/uriloader/content-handler;1?type=application/x-xpinstall {7beb3ba8-6ec3-41b4-b67c-da89b8518922}
 component {9df8ef2b-94da-45c9-ab9f-132eb55fddf1} amInstallTrigger.js
 contract @mozilla.org/addons/installtrigger;1 {9df8ef2b-94da-45c9-ab9f-132eb55fddf1}
 category JavaScript-global-property InstallTrigger @mozilla.org/addons/installtrigger;1
 #ifndef MOZ_WIDGET_ANDROID
 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}
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -22,19 +22,16 @@ endif
 	@$(NSINSTALL) -D $(DEPTH)/installer-stage/core
 	@cp -av $(DIST)/$(MOZ_PKG_DIR)$(_BINPATH)/. $(DEPTH)/installer-stage/core
 	@(cd $(DEPTH)/installer-stage/core && $(CREATE_PRECOMPLETE_CMD))
 ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD
 # The && true is necessary to make sure Pymake spins a shell
 	$(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
 # set earlier in this file.
 
 stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_MANIFEST_DEPS)
 	OMNIJAR_NAME=$(OMNIJAR_NAME) \
 	NO_PKG_FILES="$(NO_PKG_FILES)" \
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -330,19 +330,17 @@ ifndef MOZ_PKG_MANIFEST
 endif # MOZ_PKG_MANIFEST
 
 ifndef MOZ_PACKAGER_FORMAT
   MOZ_PACKAGER_FORMAT = $(error MOZ_PACKAGER_FORMAT is not set)
 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.
 # We can only use the built binary when not cross-compiling. Environments
 # (such as release automation) can provide their own js binary to enable
 # verification when cross-compiling.
 ifndef JS_BINARY
   ifndef CROSS_COMPILE
--- a/toolkit/mozapps/update/nsIUpdateService.idl
+++ b/toolkit/mozapps/update/nsIUpdateService.idl
@@ -408,17 +408,17 @@ interface nsIApplicationUpdateService : 
 interface nsIUpdateProcessor : nsISupports
 {
   /**
    * Processes the update which has been downloaded.
    * This happens without restarting the application.
    * 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);
 };
 
 /**
  * An interface describing a global application service that maintains a list
  * of updates previously performed as well as the current active update.
  */
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -1794,17 +1794,17 @@ void nsExternalAppHandler::SendStatusCha
         // Attempt to write to read/only file.
         msgId = "readOnly";
         break;
 
     case NS_ERROR_FILE_ACCESS_DENIED:
         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
           msgId = "accessError";
 #endif
         } else {
           msgId = "launchError";
         }
@@ -1815,17 +1815,17 @@ void nsExternalAppHandler::SendStatusCha
     case NS_ERROR_FILE_UNRECOGNIZED_PATH:
         // Helper app not found, let's verify this happened on launch
         if (type == kLaunchError) {
           msgId = "helperAppNotFound";
           break;
         }
 #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;
         }
 #endif
         MOZ_FALLTHROUGH;
 
     default:
--- a/widget/NativeKeyToDOMCodeName.h
+++ b/widget/NativeKeyToDOMCodeName.h
@@ -16,17 +16,17 @@
  */
 
 // Windows
 #define CODE_MAP_WIN(aCPPCodeName, aNativeKey)
 // Mac OS X
 #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)
 #undef CODE_MAP_WIN
 // aNativeKey is scan code
 #define CODE_MAP_WIN(aCPPCodeName, aNativeKey) \
   NS_NATIVE_KEY_TO_DOM_CODE_NAME_INDEX(aNativeKey, \
                                        CODE_NAME_INDEX_##aCPPCodeName)
--- a/widget/tests/TestAppShellSteadyState.cpp
+++ b/widget/tests/TestAppShellSteadyState.cpp
@@ -305,17 +305,17 @@ nsIDOMWindowUtils* EventListener::sWindo
 nsIAppShell* EventListener::sAppShell = nullptr;
 
 NS_IMPL_ISUPPORTS(EventListener, nsIDOMEventListener)
 
 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/");
   NS_NAMED_LITERAL_CSTRING(contractSuffix, ";1");
 
   for (size_t index = 0; index < ArrayLength(platforms); index++) {
     nsAutoCString contractID(contractPrefix);
     contractID.AppendASCII(platforms[index]);
--- a/xpcom/build/nsXULAppAPI.h
+++ b/xpcom/build/nsXULAppAPI.h
@@ -164,38 +164,21 @@
  *               <relative path to app dir from Program Files>
  *
  *               If app dir isn’t under Program Files:
  *               Documents and Settings\<User>\Local Settings\Application Data\
  *               <MOZ_APP_NAME>
  *
  * 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.
  *
  * @param argc/argv Command-line parameters to pass to the application. On
  *                  Windows, these should be in UTF8. On unix-like platforms
  *                  these are in the "native" character set.
  *
  * @param aConfig  Information about the application to be run.