Bug 1385797 - Build activity-stream everywhere but keep preffed on only in Nightly. r=mossop
authorEd Lee <edilee@mozilla.com>
Tue, 25 Jul 2017 13:31:22 -0700
changeset 423205 213199e73ebfe35fd21f7ae1c1d2404dba48a892
parent 423204 527790e669cf9c28f4cf5fbb893b9fc70f449938
child 423206 14ca55749ce4f71c56c9b2214d582cc5b3e16542
push id1517
push userjlorenzo@mozilla.com
push dateThu, 14 Sep 2017 16:50:54 +0000
treeherdermozilla-release@3b41fd564418 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmossop
bugs1385797
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1385797 - Build activity-stream everywhere but keep preffed on only in Nightly. r=mossop
browser/extensions/moz.build
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -1,15 +1,16 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
+    'activity-stream',
     'aushelper',
     'clicktoplay-rollout',
     'e10srollout',
     'followonsearch',
     'onboarding',
     'pdfjs',
     'pocket',
     'screenshots',
@@ -31,14 +32,8 @@ if CONFIG['MOZ_DEV_EDITION'] or CONFIG['
         'webcompat-reporter',
     ]
 
 # Only include mortar system add-ons if we locally enable it
 if CONFIG['MOZ_MORTAR']:
     DIRS += [
         'mortar',
     ]
-
-# Nightly-only system add-ons
-if CONFIG['NIGHTLY_BUILD']:
-    DIRS += [
-        'activity-stream',
-    ]