tor-browser

commit 481726ddcecaec27bd424e697f3b20d72ca0f2b1
parent e31fd57a38eb083798853ae02fb1a2b819da1511
Author: Pier Angelo Vendrame <pierov@torproject.org>
Date:   Thu, 16 Feb 2023 16:59:41 +0100

BB 41635: Disable the Normandy component

Do not include Normandy at all whenever MOZ_NORMANDY is False.

Diffstat:
M
browser/components/BrowserComponents.manifest
 | 
2
++
M
toolkit/components/moz.build
 | 
4
+++-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest
@@ -95,7 +95,9 @@ category browser-quit-application-granted moz-src:///browser/components/places/I
 category browser-quit-application-granted moz-src:///browser/components/pagedata/PageDataService.sys.mjs PageDataService.uninit
 category browser-quit-application-granted resource://gre/modules/PageThumbs.sys.mjs PageThumbs.uninit
 category browser-quit-application-granted resource://gre/modules/NewTabUtils.sys.mjs NewTabUtils.uninit
+#ifdef MOZ_NORMANDY
 category browser-quit-application-granted resource://normandy/Normandy.sys.mjs Normandy.uninit
+#endif
 category browser-quit-application-granted resource://gre/modules/RFPHelper.sys.mjs RFPHelper.uninit
 category browser-quit-application-granted resource:///modules/asrouter/ASRouterNewTabHook.sys.mjs ASRouterNewTabHook.destroy
 category browser-quit-application-granted moz-src:///browser/components/search/SERPCategorization.sys.mjs SERPCategorization.uninit
diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
@@ -138,7 +138,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] not in ("android", "windows"):
     DIRS += ["aboutwebauthn"]
 
 if CONFIG["MOZ_BUILD_APP"] == "browser":
-    DIRS += ["messaging-system", "normandy"]
+    if CONFIG["MOZ_NORMANDY"]:
+        DIRS += ["normandy"]
+    DIRS += ["messaging-system"]
 
 DIRS += ["nimbus"]