diff options
| -rw-r--r-- | dom/inputmethod/moz.build | 5 | ||||
| -rw-r--r-- | services/sync/moz.build | 5 | ||||
| -rw-r--r-- | toolkit/components/passwordmgr/moz.build | 7 | ||||
| -rw-r--r-- | toolkit/components/satchel/moz.build | 6 | ||||
| -rw-r--r-- | toolkit/content/jar.mn | 4 | ||||
| -rw-r--r-- | toolkit/modules/moz.build | 2 | ||||
| -rw-r--r-- | toolkit/mozapps/extensions/moz.build | 3 |
7 files changed, 9 insertions, 23 deletions
diff --git a/dom/inputmethod/moz.build b/dom/inputmethod/moz.build index 84b3cb8ab..e6d994565 100644 --- a/dom/inputmethod/moz.build +++ b/dom/inputmethod/moz.build @@ -6,11 +6,8 @@ EXTRA_COMPONENTS += [ 'InputMethod.manifest', - 'MozKeyboard.js', -] - -EXTRA_PP_JS_MODULES += [ 'Keyboard.jsm', + 'MozKeyboard.js', ] JAR_MANIFESTS += ['jar.mn'] diff --git a/services/sync/moz.build b/services/sync/moz.build index 56421a03e..3c19a007d 100644 --- a/services/sync/moz.build +++ b/services/sync/moz.build @@ -9,11 +9,8 @@ DIRS += ['locales'] XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] EXTRA_COMPONENTS += [ - 'Weave.js', -] - -EXTRA_PP_COMPONENTS += [ 'SyncComponents.manifest', + 'Weave.js', ] EXTRA_JS_MODULES['services-sync'] += [ diff --git a/toolkit/components/passwordmgr/moz.build b/toolkit/components/passwordmgr/moz.build index 145e2fca4..79777a981 100644 --- a/toolkit/components/passwordmgr/moz.build +++ b/toolkit/components/passwordmgr/moz.build @@ -21,12 +21,9 @@ XPIDL_MODULE = 'loginmgr' EXTRA_COMPONENTS += [ 'crypto-SDR.js', 'nsLoginInfo.js', - 'nsLoginManagerPrompter.js', -] - -EXTRA_PP_COMPONENTS += [ 'nsLoginManager.js', - 'passwordmgr.manifest', + 'nsLoginManagerPrompter.js', + 'passwordmgr.manifest' ] EXTRA_JS_MODULES += [ diff --git a/toolkit/components/satchel/moz.build b/toolkit/components/satchel/moz.build index 920f4afff..f9f727da0 100644 --- a/toolkit/components/satchel/moz.build +++ b/toolkit/components/satchel/moz.build @@ -20,19 +20,17 @@ LOCAL_INCLUDES += ['../build'] EXTRA_COMPONENTS += [ 'FormHistoryStartup.js', 'nsFormAutoComplete.js', + 'nsFormHistory.js', 'nsInputListAutoComplete.js', 'satchel.manifest', ] -EXTRA_PP_COMPONENTS += ['nsFormHistory.js'] - EXTRA_JS_MODULES += [ 'AutoCompletePopup.jsm', + 'FormHistory.jsm', 'nsFormAutoCompleteResult.jsm', ] -EXTRA_PP_JS_MODULES += ['FormHistory.jsm'] - FINAL_LIBRARY = 'xul' JAR_MANIFESTS += ['jar.mn'] diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index c73427a31..8b7b35b61 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -30,13 +30,13 @@ toolkit.jar: #endif * content/global/aboutSupport.js * content/global/aboutSupport.xhtml -* content/global/aboutTelemetry.js + content/global/aboutTelemetry.js content/global/aboutTelemetry.xhtml content/global/aboutTelemetry.css content/global/directionDetector.html content/global/plugins.html content/global/plugins.css -* content/global/browser-child.js + content/global/browser-child.js content/global/browser-content.js * content/global/buildconfig.html * content/global/contentAreaUtils.js diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index edcaea9c0..8a364df8c 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -44,6 +44,7 @@ EXTRA_JS_MODULES += [ 'Locale.jsm', 'Log.jsm', 'Memory.jsm', + 'NewTabUtils.jsm', 'NLP.jsm', 'ObjectUtils.jsm', 'PageMenu.jsm', @@ -85,7 +86,6 @@ EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm'] EXTRA_PP_JS_MODULES += [ 'addons/WebRequest.jsm', - 'NewTabUtils.jsm', 'ResetProfile.jsm', 'Troubleshoot.jsm', 'UpdateUtils.jsm', diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build index b65ce4c68..cb1e83063 100644 --- a/toolkit/mozapps/extensions/moz.build +++ b/toolkit/mozapps/extensions/moz.build @@ -20,9 +20,6 @@ EXTRA_COMPONENTS += [ 'amContentHandler.js', 'amInstallTrigger.js', 'amWebInstallListener.js', -] - -EXTRA_PP_COMPONENTS += [ 'extensions.manifest', ] |