Commit d814648c authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by Richard Pospesel
Browse files

Bug 41635: Disable the Normandy component 

Do not include Normandy at all whenever MOZ_NORMANDY is False.
parent 85b5aa49

browser/components/BrowserGlue.jsm

+7 −1
Changes for browser/components/BrowserGlue.jsm: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2011,7 +2011,13 @@ BrowserGlue.prototype = { 
      () => PageDataService.uninit(),

      () => PageThumbs.uninit(),

      () => NewTabUtils.uninit(),

      () => Normandy.uninit(),



      () => {

        if (AppConstants.MOZ_NORMANDY) {

          Normandy.uninit();

        }

      },



      () => RFPHelper.uninit(),

      () => UpdateListener.reset(),

      () => OnionAliasStore.uninit(),

toolkit/components/moz.build

+3 −1
Changes for toolkit/components/moz.build: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -124,7 +124,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"]