Bug 1365089 - Follow-up: Don't require Leanplum SDK secrets for repacks. r=nthomas
authorNick Alexander <nalexander@mozilla.com>
Mon, 29 May 2017 09:48:32 -0700
changeset 361142 cc3616fd254b19ad8c3fa949c96e5a3086a9251b
parent 361141 48aff114c781d59154f8b50e341ae801e4ad37a7
child 361143 07778bb17a4a70341c91b91edcab5bf4f992607e
push id31917
push usercbook@mozilla.com
push dateTue, 30 May 2017 09:14:52 +0000
treeherdermozilla-central@0c712d76d598 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnthomas
bugs1365089
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1365089 - Follow-up: Don't require Leanplum SDK secrets for repacks. r=nthomas The l10n builders don't have the access to secrets that the regular builders do, so don't expect Leanplum SDK secrets in l10n repacks. Since MOZ_ANDROID_MMA requires a Leanplum SDK token file, we'd also need to opt-out of MOZ_ANDROID_MMA in this case. I interpret this to show that the update channel is not the right mechanism with which to enable the Nightly-only MOZ_ANDROID_MMA feature; it's better to just opt-in for Nightly builds. This patch does that. MozReview-Commit-ID: 81WTFjsT7br
mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
mobile/android/config/mozconfigs/android-api-15/l10n-nightly
mobile/android/config/mozconfigs/android-api-15/nightly
mobile/android/config/mozconfigs/android-api-15/nightly-old-id
mobile/android/config/mozconfigs/common
--- a/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
@@ -23,10 +23,11 @@ ac_add_options --disable-stdcxx-compat
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 # Disable Keyfile Loading (and checks) since l10n doesn't need these keys
 # This overrides the settings in the common android mozconfig
 ac_add_options --without-mozilla-api-keyfile
 ac_add_options --without-adjust-sdk-keyfile
+ac_add_options --without-leanplum-sdk-keyfile
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-15/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-api-15/l10n-nightly
@@ -23,10 +23,11 @@ ac_add_options --disable-stdcxx-compat
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 # Disable Keyfile Loading (and checks) since l10n doesn't need these keys
 # This overrides the settings in the common android mozconfig
 ac_add_options --without-mozilla-api-keyfile
 ac_add_options --without-adjust-sdk-keyfile
+ac_add_options --without-leanplum-sdk-keyfile
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-15/nightly
+++ b/mobile/android/config/mozconfigs/android-api-15/nightly
@@ -9,10 +9,11 @@ ac_add_options --target=arm-linux-androi
 ac_add_options --with-branding=mobile/android/branding/nightly
 
 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling with eideticker. See bug 788680
 STRIP_FLAGS="--strip-debug"
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
+export MOZ_ANDROID_MMA=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-15/nightly-old-id
+++ b/mobile/android/config/mozconfigs/android-api-15/nightly-old-id
@@ -9,10 +9,11 @@ ac_add_options --target=arm-linux-androi
 ac_add_options --with-branding=mobile/android/branding/nightly-old-id
 
 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling with eideticker. See bug 788680
 STRIP_FLAGS="--strip-debug"
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
+export MOZ_ANDROID_MMA=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -68,17 +68,16 @@ 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
-    export MOZ_ANDROID_MMA=1
     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
 
 export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
 
 # Package js shell.