Bug 1435458 - Preprocess the official firefox-branding.js. r=glandium

MozReview-Commit-ID: 6tVd9Xcyija

--HG--
extra : rebase_source : 0a97494b77d8ec020810e88be10889f98b8e6e50

browser/branding/branding-common.mozbuild

@@ -6,9 +6,14 @@
 
 @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['..'] += [