Bug 1365089 - DO NOT LAND - Work in progress toward defaulting off in developer builds.
This still needs to default off in !MOZILLA_OFFICIAL and on
MOZILLA_OFFICIAL (all channels). See also
https://bugzilla.mozilla.org/show_bug.cgi?id=1365089#c26.
MozReview-Commit-ID: D4e0R7ZSq5x
deleted file mode 100644
--- a/mobile/android/base/leanplum-sdk-sandbox.token
+++ /dev/null
@@ -1,1 +0,0 @@
-APP_ID TOKEN
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -66,18 +66,16 @@ else
fi
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
ac_add_options --with-leanplum-sdk-keyfile=/builds/leanplum-sdk-nightly.token
-else
- ac_add_options --with-adjust-sdk-keyfile="$topsrcdir/mobile/android/base/leaplum-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
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -609,21 +609,17 @@ include('../build/moz.configure/keyfiles
simple_keyfile('Mozilla API')
simple_keyfile('Google API')
id_and_secret_keyfile('Bing API')
simple_keyfile('Adjust SDK')
-@depends(check_build_environment, '--help')
-def leanplum_sdk_keyfile_default(build_env, help):
- return "%s/mobile/android/base/leanplum-sdk-sandbox.token" % build_env.topsrcdir
-
-id_and_secret_keyfile('Leanplum SDK', default=leanplum_sdk_keyfile_default)
+id_and_secret_keyfile('Leanplum SDK')
# Servo integration
# ==============================================================
option('--enable-stylo', nargs='?', choices=('build',),
help='Include Stylo in the build and/or enable it at runtime')
@depends('--enable-stylo')
def stylo_config(value):