Bug 1162060 - Add Socorro auth token to Android and B2G mozconfigs. r=mshal, a=NPOTB
authorTed Mielczarek <ted@mielczarek.org>
Thu, 28 May 2015 07:14:49 -0400
changeset 266170 adbf7c8af745
parent 266169 6d8c0c9dc553
child 266171 683cbf33c92a
push id4774
push userryanvm@gmail.com
push date2015-06-03 18:00 +0000
treeherdermozilla-beta@05122c19b3d7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal, NPOTB
bugs1162060
milestone39.0
Bug 1162060 - Add Socorro auth token to Android and B2G mozconfigs. r=mshal, a=NPOTB
b2g/config/mozconfigs/common
mobile/android/config/mozconfigs/common
--- a/b2g/config/mozconfigs/common
+++ b/b2g/config/mozconfigs/common
@@ -9,8 +9,16 @@
 # Normally, we'd set this unconditionally, but this file is also used
 # for local builds and there is no other mozconfig in this tree that
 # is included on device builds.
 if test -d $topsrcdir/../gcc/bin; then
     HOST_CC="$topsrcdir/../gcc/bin/gcc"
     HOST_CXX="$topsrcdir/../gcc/bin/g++"
     ac_add_options --enable-stdcxx-compat
 fi
+
+# Allow overriding this from the environment, and don't
+# try to set it if it doesn't exist. As per above, this file is also
+# used for local builds, and we may need to override this for builds in
+# other environments.
+if test -z "$SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE" -a -f /builds/crash-stats-api.token; then
+  export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
+fi
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -33,16 +33,17 @@ ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
 ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-fennec-geoloc-api.key
 ac_add_options --with-adjust-sdk-keyfile=/builds/adjust-sdk.token
+export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 # Use ccache
 . "$topsrcdir/build/mozconfig.cache"
 
 HOST_CC="$topsrcdir/gcc/bin/gcc"