Bug 1435458 - Preprocess the official firefox-branding.js. r?glandium draft
authorPanos Astithas <past@mozilla.com>
Fri, 09 Feb 2018 17:48:05 -0800
changeset 755902 92765693b7296a131d754ab9f8939d0de89943c9
parent 754399 38b3c1d03a594664c6b32c35533734283c258f43
push id99315
push userbmo:past@mozilla.com
push dateThu, 15 Feb 2018 22:31:04 +0000
reviewersglandium
bugs1435458
milestone60.0a1
Bug 1435458 - Preprocess the official firefox-branding.js. r?glandium MozReview-Commit-ID: 6tVd9Xcyija
browser/branding/branding-common.mozbuild
--- a/browser/branding/branding-common.mozbuild
+++ b/browser/branding/branding-common.mozbuild
@@ -1,19 +1,24 @@
 # -*- 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/.
 
 @template
 def FirefoxBranding():
-    JS_PREFERENCE_FILES += [
-        'pref/firefox-branding.js',
-    ]
+    if CONFIG['MOZ_BRANDING_DIRECTORY'] == 'browser/branding/official':
+        JS_PREFERENCE_PP_FILES += [
+            'pref/firefox-branding.js',
+        ]
+    else:
+        JS_PREFERENCE_FILES += [
+            'pref/firefox-branding.js',
+        ]
 
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         FINAL_TARGET_FILES['..'] += [
             'firefox.VisualElementsManifest.xml',
         ]
         FINAL_TARGET_FILES.VisualElements += [
             'VisualElements_150.png',
             'VisualElements_70.png',