diff --git a/devtools/client/shims/moz.build b/devtools/client/shims/moz.build index 556365913739..3639be145c6e 100644 --- a/devtools/client/shims/moz.build +++ b/devtools/client/shims/moz.build @@ -11,3 +11,8 @@ 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/server/shims/moz.build b/devtools/server/shims/moz.build index 51403f09e5d7..eea935e5cb0e 100644 --- a/devtools/server/shims/moz.build +++ b/devtools/server/shims/moz.build @@ -8,6 +8,10 @@ # because these files are here for add-on compatibility, and so they must be # installed to previously defined locations. +# These shims for legacy paths expect to be installed as if they were part of +# /toolkit modules. Disable any DIST_SUBDIR from parent files here. +DIST_SUBDIR = '' + EXTRA_JS_MODULES.devtools += [ 'dbg-server.jsm', ] diff --git a/devtools/shared/shims/moz.build b/devtools/shared/shims/moz.build index afc71f36541b..6d63e96d896f 100644 --- a/devtools/shared/shims/moz.build +++ b/devtools/shared/shims/moz.build @@ -8,6 +8,10 @@ # because these files are here for add-on compatibility, and so they must be # installed to previously defined locations. +# These shims for legacy paths expect to be installed as if they were part of +# /toolkit modules. Disable any DIST_SUBDIR from parent files here. +DIST_SUBDIR = '' + EXTRA_JS_MODULES.devtools += [ 'Console.jsm', 'dbg-client.jsm', @@ -16,7 +20,12 @@ EXTRA_JS_MODULES.devtools += [ 'Simulator.jsm', ] -# Extra compatibility layer for transitional URL used in middle of fx44 cycle +# 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', ]