Bug 1248066 - Use separate Adjust token for Firefox for Android release and beta builds. r=nalexander a=ritu
authorNick Alexander <nalexander@mozilla.com>
Fri, 12 Feb 2016 14:34:18 -0800
changeset 332890 54854c4cb6fbc60ba81f3dff7b455868c0f90cb4
parent 332889 5d6b894490f27d7e8ee098fd8279f2954e89a712
child 332891 ce6407e7b5761adad379ec020d6e9298eebf2271
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander, ritu
bugs1248066
milestone48.0a2
Bug 1248066 - Use separate Adjust token for Firefox for Android release and beta builds. r=nalexander a=ritu The token is only used for release and beta builds, so it's better not to define it inadvertently for all builds. MozReview-Commit-ID: 3DLem4PhXD7
mobile/android/config/mozconfigs/common
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -47,17 +47,21 @@ fi
 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 (modulo ALLOW_COMPILER_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
+if test "$MOZ_UPDATE_CHANNEL" = "release" ; then
+    ac_add_options --with-adjust-sdk-keyfile=/builds/adjust-sdk.token
+elif test "$MOZ_UPDATE_CHANNEL" = "beta" ; then
+    ac_add_options --with-adjust-sdk-keyfile=/builds/adjust-sdk-beta.token
+fi
 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"