Commit fb404582 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 41635: Disable the Normandy component

Do not include Normandy at all whenever MOZ_NORMANDY is False.
parent a1de43f9
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -2173,7 +2173,11 @@ BrowserGlue.prototype = {
      () => lazy.PageDataService.uninit(),
      () => lazy.PageThumbs.uninit(),
      () => lazy.NewTabUtils.uninit(),
      () => lazy.Normandy.uninit(),
      () => {
        if (AppConstants.MOZ_NORMANDY) {
          lazy.Normandy.uninit();
        }
      },
      () => lazy.RFPHelper.uninit(),
      () => lazy.ASRouterNewTabHook.destroy(),
      () => {
+3 −1
Original line number Diff line number Diff line
@@ -130,7 +130,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] not in ("android", "windows"):
    DIRS += ["aboutwebauthn"]

if CONFIG["MOZ_BUILD_APP"] == "browser":
    DIRS += ["featuregates", "messaging-system", "normandy"]
    if CONFIG["MOZ_NORMANDY"]:
        DIRS += ["normandy"]
    DIRS += ["featuregates", "messaging-system"]

DIRS += ["nimbus"]