diff --git a/devtools/client/shims/moz.build b/devtools/client/shims/moz.build index 21b689af88f3..5f56ffbaac49 100644 --- a/devtools/client/shims/moz.build +++ b/devtools/client/shims/moz.build @@ -11,8 +11,3 @@ EXTRA_JS_MODULES.devtools += [ 'gDevTools.jsm', ] - -# Extra compatibility layer for transitional URLs used for part of 44 cycle -EXTRA_JS_MODULES.devtools.client.framework += [ - 'gDevTools.jsm', -] diff --git a/devtools/shared/apps/moz.build b/devtools/shared/apps/moz.build index 8ab1a9eb9765..f5bba00fd4d1 100644 --- a/devtools/shared/apps/moz.build +++ b/devtools/shared/apps/moz.build @@ -5,6 +5,5 @@ DevToolsModules( 'app-actor-front.js', - 'Devices.jsm', - 'Simulator.jsm' + 'Devices.jsm' ) diff --git a/devtools/shared/shims/Simulator.jsm b/devtools/shared/shims/Simulator.jsm deleted file mode 100644 index 7fd4fef53d2f..000000000000 --- a/devtools/shared/shims/Simulator.jsm +++ /dev/null @@ -1,34 +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/. */ - -"use strict"; - -/** - * This file only exists to support add-ons which import this module at a - * specific path. - */ - -const Cu = Components.utils; - -const { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); - -const WARNING_PREF = "devtools.migration.warnings"; -if (Services.prefs.getBoolPref(WARNING_PREF)) { - const { Deprecated } = Cu.import("resource://gre/modules/Deprecated.jsm", {}); - Deprecated.warning("This path to Simulator.jsm is deprecated. Please use " + - "Cu.import(\"resource://devtools/shared/" + - "apps/Simulator.jsm\") to load this module.", - "https://bugzil.la/912121"); -} - -this.EXPORTED_SYMBOLS = [ - "Simulator", -]; - -const module = - Cu.import("resource://devtools/shared/apps/Simulator.jsm", {}); - -for (let symbol of this.EXPORTED_SYMBOLS) { - this[symbol] = module[symbol]; -} diff --git a/devtools/shared/shims/moz.build b/devtools/shared/shims/moz.build index bee1c82ac6ef..e865e0158346 100644 --- a/devtools/shared/shims/moz.build +++ b/devtools/shared/shims/moz.build @@ -17,15 +17,9 @@ EXTRA_JS_MODULES.devtools += [ 'dbg-client.jsm', 'event-emitter.js', 'Loader.jsm', - 'Simulator.jsm', ] # Extra compatibility layer for transitional URLs used for part of 44 cycle EXTRA_JS_MODULES.devtools.shared += [ - 'Console.jsm', 'Loader.jsm', ] - -EXTRA_JS_MODULES.devtools.shared.apps += [ - 'Simulator.jsm', -]