1 files changed, 18 insertions, 14 deletions
diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/extensions/internal/moz.build
index 28c34f8c9..efcd2af21 100644
--- a/toolkit/mozapps/extensions/internal/moz.build
+++ b/toolkit/mozapps/extensions/internal/moz.build
@@ -1,28 +1,17 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 EXTRA_JS_MODULES.addons += [
+    '../../webextensions/internal/ProductAddonChecker.jsm',
     'AddonLogging.jsm',
-    'AddonRepository.jsm',
     'AddonRepository_SQLiteMigrator.jsm',
-    'AddonUpdateChecker.jsm',
-    'APIExtensionBootstrap.js',
     'Content.js',
-    'E10SAddonsRollout.jsm',
     'GMPProvider.jsm',
     'LightweightThemeImageOptimizer.jsm',
-    'ProductAddonChecker.jsm',
     'SpellCheckDictionaryBootstrap.js',
-    'WebExtensionBootstrap.js',
-    'XPIProvider.jsm',
-    'XPIProviderUtils.js',
-]
-
-TESTING_JS_MODULES += [
-    'AddonTestUtils.jsm',
 ]
 
 # Don't ship unused providers on Android
@@ -32,5 +21,20 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     ]
 
 EXTRA_PP_JS_MODULES.addons += [
-    'AddonConstants.jsm',
+    'AddonRepository.jsm',
+    'AddonUpdateChecker.jsm',
+    'XPIProvider.jsm',
+    'XPIProviderUtils.js',
 ]
+
+# This is used in multiple places, so is defined here to avoid it getting
+# out of sync.
+DEFINES['MOZ_EXTENSIONS_DB_SCHEMA'] = 16
+
+# Additional debugging info is exposed in debug builds
+if CONFIG['MOZ_EM_DEBUG']:
+    DEFINES['MOZ_EM_DEBUG'] = 1
+
+# Apperently this needs to be defined because it isn't picked up automagically any more
+if CONFIG['MOZ_PHOENIX_EXTENSIONS']:
+    DEFINES['MOZ_PHOENIX_EXTENSIONS'] = 1
+\ No newline at end of file