diff options
Diffstat (limited to 'toolkit/modules/moz.build')
| -rw-r--r-- | toolkit/modules/moz.build | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 4e647bd7f..8a364df8c 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -4,17 +4,6 @@ # 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/. -XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini'] -BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini'] -MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini'] -MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini'] - -TESTING_JS_MODULES += [ - 'tests/MockDocument.jsm', - 'tests/PromiseTestUtils.jsm', - 'tests/xpcshell/TestIntegration.jsm', -] - SPHINX_TREES['toolkit_modules'] = 'docs' EXTRA_JS_MODULES += [ @@ -22,7 +11,6 @@ EXTRA_JS_MODULES += [ 'addons/WebNavigation.jsm', 'addons/WebNavigationContent.js', 'addons/WebNavigationFrames.jsm', - 'addons/WebRequest.jsm', 'addons/WebRequestCommon.jsm', 'addons/WebRequestContent.js', 'addons/WebRequestUpload.jsm', @@ -40,6 +28,7 @@ EXTRA_JS_MODULES += [ 'debug.js', 'DeferredTask.jsm', 'Deprecated.jsm', + 'ExtensionStorage.jsm', 'FileUtils.jsm', 'Finder.jsm', 'FinderHighlighter.jsm', @@ -55,6 +44,7 @@ EXTRA_JS_MODULES += [ 'Locale.jsm', 'Log.jsm', 'Memory.jsm', + 'NewTabUtils.jsm', 'NLP.jsm', 'ObjectUtils.jsm', 'PageMenu.jsm', @@ -74,11 +64,7 @@ EXTRA_JS_MODULES += [ 'RemotePageManager.jsm', 'RemoteSecurityUI.jsm', 'RemoteWebProgress.jsm', - 'ResetProfile.jsm', 'ResponsivenessMonitor.jsm', - 'secondscreen/PresentationApp.jsm', - 'secondscreen/RokuApp.jsm', - 'secondscreen/SimpleServiceDiscovery.jsm', 'SelectContentHelper.jsm', 'SelectParentHelper.jsm', 'ServiceRequest.jsm', @@ -93,16 +79,17 @@ EXTRA_JS_MODULES += [ 'Task.jsm', 'Timer.jsm', 'WebChannel.jsm', - 'WindowDraggingUtils.jsm', 'ZipUtils.jsm', ] EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js'] EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm'] EXTRA_PP_JS_MODULES += [ - 'NewTabUtils.jsm', + 'addons/WebRequest.jsm', + 'ResetProfile.jsm', 'Troubleshoot.jsm', 'UpdateUtils.jsm', + 'WindowDraggingUtils.jsm', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'): @@ -119,16 +106,14 @@ EXTRA_PP_JS_MODULES += [ 'Services.jsm', ] -if 'Android' != CONFIG['OS_TARGET']: - EXTRA_JS_MODULES += [ - 'LightweightThemeConsumer.jsm', - ] - DIRS += [ - 'subprocess', - ] -else: - DEFINES['ANDROID'] = True +EXTRA_PP_JS_MODULES += [ + 'LightweightThemeConsumer.jsm', +] + +DIRS += [ + 'subprocess', +] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': @@ -142,13 +127,13 @@ for var in ('ANDROID_PACKAGE_NAME', 'MOZ_APP_VERSION_DISPLAY', 'MOZ_MACBUNDLE_NAME', 'MOZ_WIDGET_TOOLKIT', + 'MOZ_PKG_SPECIAL', 'DLL_PREFIX', 'DLL_SUFFIX', 'DEBUG_JS_MODULES'): DEFINES[var] = CONFIG[var] for var in ('MOZ_TOOLKIT_SEARCH', - 'MOZ_SYSTEM_NSS', 'MOZ_UPDATER', 'MOZ_SWITCHBOARD'): if CONFIG[var]: |