Commit 1363a0fa authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by clairehurst
Browse files

BB 41635: Disable the Normandy component 

Do not include Normandy at all whenever MOZ_NORMANDY is False.
parent 4f30b6c1

browser/components/BrowserComponents.manifest

+2 −0
Original line number Diff line number Diff line
@@ -86,7 +86,9 @@ category browser-quit-application-granted resource:///modules/Interactions.sys.m 
category browser-quit-application-granted resource:///modules/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

toolkit/components/moz.build

+3 −1
Original line number Diff line number Diff line
@@ -135,7 +135,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"]