diff -r 000000000000 -r 6474c204b198 browser/config/mozconfigs/macosx-universal/common-opt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/config/mozconfigs/macosx-universal/common-opt	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,21 @@
+# This file is sourced by the nightly, beta, and release mozconfigs.
+
+. $topsrcdir/build/macosx/universal/mozconfig
+
+# Universal builds override the default of browser (bug 575283 comment 29)
+ac_add_options --enable-application=browser
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --with-google-api-keyfile=/builds/gapi.data
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+export MOZ_TELEMETRY_REPORTING=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1