From eb28b1f32bbef71d05402b2e263d7291b8248367 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 7 Apr 2020 22:41:34 -0400
Subject: Take files out of preprocessing that no longer require it

---
 toolkit/components/passwordmgr/moz.build | 7 ++-----
 toolkit/components/satchel/moz.build     | 6 ++----
 toolkit/content/jar.mn                   | 4 ++--
 toolkit/modules/moz.build                | 2 +-
 toolkit/mozapps/extensions/moz.build     | 3 ---
 5 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'toolkit')

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',
 ]
 
-- 
cgit v1.2.3