diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /toolkit/mozapps/webextensions/moz.build | |
parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
download | UXP-fc61780b35af913801d72086456f493f63197da6.tar UXP-fc61780b35af913801d72086456f493f63197da6.tar.gz UXP-fc61780b35af913801d72086456f493f63197da6.tar.lz UXP-fc61780b35af913801d72086456f493f63197da6.tar.xz UXP-fc61780b35af913801d72086456f493f63197da6.zip |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'toolkit/mozapps/webextensions/moz.build')
-rw-r--r-- | toolkit/mozapps/webextensions/moz.build | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/toolkit/mozapps/webextensions/moz.build b/toolkit/mozapps/webextensions/moz.build index d039ac68c..e703125e6 100644 --- a/toolkit/mozapps/webextensions/moz.build +++ b/toolkit/mozapps/webextensions/moz.build @@ -4,10 +4,7 @@ # 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/. -SPHINX_TREES['addon-manager'] = 'docs' - DIRS += ['internal'] -TEST_DIRS += ['test'] XPIDL_SOURCES += [ '../extensions/amIAddonManager.idl', @@ -19,8 +16,8 @@ XPIDL_SOURCES += [ XPIDL_MODULE = 'extensions' EXTRA_COMPONENTS += [ + '../extensions/amContentHandler.js', 'addonManager.js', - 'amContentHandler.js', 'amInstallTrigger.js', 'amWebAPI.js', 'amWebInstallListener.js', @@ -31,9 +28,9 @@ EXTRA_PP_COMPONENTS += [ ] EXTRA_JS_MODULES += [ + '../extensions/ChromeManifestParser.jsm', + '../extensions/DeferredSave.jsm', 'AddonManager.jsm', - 'ChromeManifestParser.jsm', - 'DeferredSave.jsm', 'LightweightThemeManager.jsm', ] @@ -56,6 +53,3 @@ LOCAL_INCLUDES += [ ] FINAL_LIBRARY = 'xul' - -with Files('**'): - BUG_COMPONENT = ('Toolkit', 'Add-ons Manager') |