Bug 1277553 - Specify adjust sandbox token if not beta or release build. r=sebastian
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
--- 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"