Bug 1374824 - Build stylo on Linux64 in automation; r?froydnj draft
authorGregory Szorc <gps@mozilla.com>
Tue, 20 Jun 2017 14:57:22 -0700
changeset 597742 af53044918140e61438f31a42ad8c867b38d8351
parent 597455 464b2a3c25aa1065760d9ecbb0870bca4a66c62e
child 634303 4fb16d191c60d3861eef377a5da2a7f6ff527bec
push id65011
push userbmo:gps@mozilla.com
push dateTue, 20 Jun 2017 21:57:34 +0000
reviewersfroydnj
bugs1374824
milestone56.0a1
Bug 1374824 - Build stylo on Linux64 in automation; r?froydnj The in-tree mozconfigs for Linux64 have been updated to build Stylo by default. Stylo is still disabled in builds. The existing Stylo Linux64 platform still exists. It still uses its own mozconfigs. These mozconfigs source the mozconfigs changed in this commit. This results in both --enable-stylo=build and --enable-stylo being passed to configure. The latter takes precedence. This commit stops short of implying --enable-stylo=build as the configure default for Linux64. I'm not sure if we're ready to make that leap just yet. MozReview-Commit-ID: K8rafDMlAGu
browser/config/mozconfigs/linux64/common-opt
browser/config/mozconfigs/linux64/debug
--- a/browser/config/mozconfigs/linux64/common-opt
+++ b/browser/config/mozconfigs/linux64/common-opt
@@ -1,10 +1,14 @@
 # This file is sourced by the nightly, beta, and release mozconfigs.
 
+# TODO remove once configure defaults to stylo once stylo enabled
+# on all platforms.
+ac_add_options --enable-stylo=build
+
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-google-api-keyfile=/builds/gapi.data
 ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
 
 . $topsrcdir/build/unix/mozconfig.linux
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/browser/config/mozconfigs/linux64/debug
+++ b/browser/config/mozconfigs/linux64/debug
@@ -1,12 +1,15 @@
 ac_add_options --enable-debug
 ac_add_options --enable-dmd
 ac_add_options --enable-verify-mar
 
+# TODO remove once configure defaults to stylo once stylo enabled
+ac_add_options --enable-stylo=build
+
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . $topsrcdir/build/unix/mozconfig.linux
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry