Bug 1572793 - Move webextension-fallback.html from devtools/client/jar.mn to devtools/shared/jar.mn. r=jdescottes, a=RyanVM
authorLuca Greco <lgreco@mozilla.com>
Mon, 19 Aug 2019 06:30:56 +0000
changeset 545231 79ab9ee7d7e9714c21874dd237660ac8ee7872c7
parent 545230 3749ea604ad9274259291efdc86eddd4a8b8192b
child 545232 b438d15fb66f211c6916db846b05b3860918ecc4
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdescottes, RyanVM
bugs1572793
milestone69.0
Bug 1572793 - Move webextension-fallback.html from devtools/client/jar.mn to devtools/shared/jar.mn. r=jdescottes, a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D41937
devtools/client/jar.mn
devtools/client/shared/webextension-fallback.html
devtools/shared/jar.mn
devtools/shared/webextension-fallback.html
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -3,17 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 devtools.jar:
 %   content devtools %content/
     content/shared/vendor/d3.js (shared/vendor/d3.js)
     content/shared/vendor/dagre-d3.js (shared/vendor/dagre-d3.js)
     content/shared/widgets/widgets.css (shared/widgets/widgets.css)
     content/shared/widgets/VariablesView.xul (shared/widgets/VariablesView.xul)
-    content/shared/webextension-fallback.html (shared/webextension-fallback.html)
     content/webconsole/index.html (webconsole/index.html)
 *   content/scratchpad/index.xul (scratchpad/index.xul)
     content/shared/splitview.css (shared/splitview.css)
     content/shared/theme-switching.js (shared/theme-switching.js)
     content/styleeditor/index.xul (styleeditor/index.xul)
     content/storage/index.xul (storage/index.xul)
     content/inspector/markup/markup.xhtml (inspector/markup/markup.xhtml)
     content/shared/sourceeditor/codemirror/addon/dialog/dialog.css (shared/sourceeditor/codemirror/addon/dialog/dialog.css)
--- a/devtools/shared/jar.mn
+++ b/devtools/shared/jar.mn
@@ -1,12 +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/.
 
 devtools.jar:
+%   content devtools %content/
+    content/shared/webextension-fallback.html (webextension-fallback.html)
 %   resource devtools %modules/devtools/
 %   resource devtools-client-jsonview resource://devtools/client/jsonview/ contentaccessible=yes
 %   resource devtools-client-shared resource://devtools/client/shared/ contentaccessible=yes
 # The typical approach would be to list all the resource files in this manifest
 # for installation.  Instead of doing this, use the DevToolsModules syntax via
 # moz.build files to do the installation so that we can enforce correct paths
 # based on source tree location.
rename from devtools/client/shared/webextension-fallback.html
rename to devtools/shared/webextension-fallback.html