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/internal/moz.build | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-2018.07.18.tar UXP-2018.07.18.tar.gz UXP-2018.07.18.tar.lz UXP-2018.07.18.tar.xz UXP-2018.07.18.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/internal/moz.build')
| -rw-r--r-- | toolkit/mozapps/webextensions/internal/moz.build | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/toolkit/mozapps/webextensions/internal/moz.build b/toolkit/mozapps/webextensions/internal/moz.build index e3b54ed3b..8f1e4fea6 100644 --- a/toolkit/mozapps/webextensions/internal/moz.build +++ b/toolkit/mozapps/webextensions/internal/moz.build @@ -5,14 +5,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. EXTRA_JS_MODULES.addons += [ + '../../extensions/internal/AddonLogging.jsm', + '../../extensions/internal/Content.js', '../../extensions/internal/ProductAddonChecker.jsm', '../../extensions/internal/SpellCheckDictionaryBootstrap.js', - 'AddonLogging.jsm', 'AddonRepository.jsm', 'AddonRepository_SQLiteMigrator.jsm', 'APIExtensionBootstrap.js', - 'Content.js', - 'E10SAddonsRollout.jsm', 'GMPProvider.jsm', 'LightweightThemeImageOptimizer.jsm', 'WebExtensionBootstrap.js', @@ -20,10 +19,6 @@ EXTRA_JS_MODULES.addons += [ 'XPIProviderUtils.js', ] -TESTING_JS_MODULES += [ - 'AddonTestUtils.jsm', -] - # Don't ship unused providers on Android if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': EXTRA_JS_MODULES.addons += [ @@ -31,6 +26,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': ] EXTRA_PP_JS_MODULES.addons += [ + '../../extensions/internal/AddonUpdateChecker.jsm', 'AddonConstants.jsm', - 'AddonUpdateChecker.jsm', ] |