Bug 1277553 - Specify adjust sandbox token if not beta or release build. r=sebastian, a=lizzard
authorMichael Comella <michael.l.comella@gmail.com>
Fri, 03 Jun 2016 17:10:40 -0700
changeset 339630 e2171321a10a8d63c1b55826dabc7119c58d873d
parent 339629 2ce49ca619922a2f3b5a58788d5f5c64a58eda28
child 339631 839310c1fc4f83fd3a6bac496b074ebb0b47ff59
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssebastian, lizzard
bugs1277553
milestone49.0a2
Bug 1277553 - Specify adjust sandbox token if not beta or release build. r=sebastian, a=lizzard I didn't include nalexander's MOZ_INSTALL_TRACKING suggestion because my make skills are too shaky to make this worthwhile. Specifying a keyfile when MOZ_INSTALL_TRACKING is disabled isn't harmful afaik (though it's a little spammy). Also, added code comment duplicated for emphasis: # (bug 1277553) In Aurora -> Beta simulation builds, no update channel is # specified, causing an assertion to throw that MOZ_INSTALL_TRACKING is # specified but the keyfile is not. In this case, we add a default keyfile. # This has the disadvantage that if our beta/release checks above ever # fail, we'll come to this default case and the compile-time check to # specify a valid keyfile will be broken. I don't have any better # alternatives. MozReview-Commit-ID: 7tmemvpDaW8
mobile/android/config/mozconfigs/common
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -51,16 +51,25 @@ ac_add_options --enable-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
 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
+else
+    # (bug 1277553) In Aurora -> Beta simulation builds, no update channel is
+    # specified, causing an assertion to throw that MOZ_INSTALL_TRACKING is
+    # specified but the keyfile is not. In this case, we add a default keyfile.
+    # This has the disadvantage that if our beta/release checks above ever
+    # fail, we'll come to this default case and the compile-time check to
+    # specify a valid keyfile will be broken. I don't have any better
+    # alternatives.
+    ac_add_options --with-adjust-sdk-keyfile="$topsrcdir/mobile/android/base/adjust-sdk-sandbox.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"