From e577defb37929c134a40be0141c5fbca11c6d0c1 Mon Sep 17 00:00:00 2001
From: Fedor <fedor@mail.ru>
Date: Sat, 9 May 2020 00:34:24 +0300
Subject: [PATCH] Fix wrong remove files from the preprocessing.

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

diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build
index a1b57876b..c7b5b78a7 100644
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -99,9 +99,10 @@ IPDL_SOURCES += [
     'PHttpChannel.ipdl',
 ]
 
-EXTRA_JS_MODULES += ['UserAgentUpdates.jsm']
-
-EXTRA_PP_JS_MODULES += ['UserAgentOverrides.jsm']
+EXTRA_PP_JS_MODULES += [
+    'UserAgentOverrides.jsm',
+    'UserAgentUpdates.jsm',
+]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
diff --git a/toolkit/components/passwordmgr/moz.build b/toolkit/components/passwordmgr/moz.build
index 82f849e53..f28368acf 100644
--- a/toolkit/components/passwordmgr/moz.build
+++ b/toolkit/components/passwordmgr/moz.build
@@ -21,8 +21,11 @@ XPIDL_MODULE = 'loginmgr'
 EXTRA_COMPONENTS += [
     'crypto-SDR.js',
     'nsLoginInfo.js',
-    'nsLoginManager.js',
     'nsLoginManagerPrompter.js',
+]
+
+EXTRA_PP_COMPONENTS += [
+    'nsLoginManager.js',
     'passwordmgr.manifest'
 ]
 
diff --git a/toolkit/components/satchel/moz.build b/toolkit/components/satchel/moz.build
index f9f727da0..920f4afff 100644
--- a/toolkit/components/satchel/moz.build
+++ b/toolkit/components/satchel/moz.build
@@ -20,17 +20,19 @@ 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 f10d8058f..b84d1b2a4 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -32,7 +32,7 @@ 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
diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build
index d0d41e17c..46c163fe9 100644
--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@@ -20,6 +20,9 @@ EXTRA_COMPONENTS += [
     'amContentHandler.js',
     'amInstallTrigger.js',
     'amWebInstallListener.js',
+]
+
+EXTRA_PP_COMPONENTS += [
     'extensions.manifest',
 ]