Bug 1411608 - Test IS_NIGHTLY rather than MOZ_UPDATE_CHANNEL. r=Build
The manipulations that determine whether we have a Release, Beta, or
Nightly build are incredibly fragile, and this is one place where
testing the narrow MOZ_UPDATE_CHANNEL for just "nightly" is causing
issues. On other project branches, MOZ_UPDATE_CHANNEL will be
"nightly-$PROJECT", like "nightly-oak", causing features to not be
compiled.
MozReview-Commit-ID: 29SxsMFb0EX
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -78,32 +78,32 @@ fi
# MOZ_ANDROID_MMA depends on --with-leanplum-sdk-keyfile, and there's no default
# keyfile set, so if we misconfigure beta or release, the builds will fail (at
# configure time).
if test "$MOZ_UPDATE_CHANNEL" = "release" ; then
ac_add_options --with-leanplum-sdk-keyfile=/builds/leanplum-sdk-release.token
elif test "$MOZ_UPDATE_CHANNEL" = "beta" ; then
ac_add_options --with-leanplum-sdk-keyfile=/builds/leanplum-sdk-beta.token
-elif test "$MOZ_UPDATE_CHANNEL" = "nightly" ; then
+elif [ "x$IS_NIGHTLY" = "xyes" ] ; then
ac_add_options --with-leanplum-sdk-keyfile=/builds/leanplum-sdk-nightly.token
else
ac_add_options --with-leanplum-sdk-keyfile="$topsrcdir/mobile/android/base/leanplum-sdk-sandbox.token"
fi
# MOZ_ANDROID_POCKET depends on --with-pocket-api-keyfile, and will
# fail if MOZ_ANDROID_POCKET is specified but a keyfile is not. There's no default
# keyfile set, so if we misconfigure beta or release or nightly, the builds will
# fail (at configure time).
# Otherwise, Pocket is not a critical component so it can be built with a dummy key.
if test "$MOZ_UPDATE_CHANNEL" = "release" ; then
ac_add_options --with-pocket-api-keyfile=/builds/pocket-api-release.token
elif test "$MOZ_UPDATE_CHANNEL" = "beta" ; then
ac_add_options --with-pocket-api-keyfile=/builds/pocket-api-beta.token
-elif test "$MOZ_UPDATE_CHANNEL" = "nightly" ; then
+elif [ "x$IS_NIGHTLY" = "xyes" ] ; then
ac_add_options --with-pocket-api-keyfile=/builds/pocket-api-nightly.token
else
ac_add_options --with-pocket-api-keyfile="$topsrcdir/mobile/android/base/pocket-api-sandbox.token"
fi
export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
# Package js shell.