Verified Commit e5bc5b12 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by ma1
Browse files

Bug 41635: Disable the Normandy component 

Do not include Normandy at all whenever MOZ_NORMANDY is False.
parent 727a1d8b

browser/components/BrowserGlue.jsm

+7 −1
Original line number Diff line number Diff line
@@ -2004,7 +2004,13 @@ BrowserGlue.prototype = { 
      () => PageDataService.uninit(),

      () => PageThumbs.uninit(),

      () => NewTabUtils.uninit(),

      () => Normandy.uninit(),



      () => {

        if (AppConstants.MOZ_NORMANDY) {

          Normandy.uninit();

        }

      },



      () => RFPHelper.uninit(),

      () => ASRouterNewTabHook.destroy(),

      () => UpdateListener.reset(),

toolkit/components/moz.build

+3 −1
Original line number Diff line number Diff line
@@ -122,7 +122,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android": 
    ]



if CONFIG["MOZ_BUILD_APP"] == "browser":

    DIRS += ["normandy", "messaging-system"]

    if CONFIG["MOZ_NORMANDY"]:

        DIRS += ["normandy"]

    DIRS += ["messaging-system"]



DIRS += ["nimbus"]