Bug 1372091 - Turn off Leanplum on Beta and release. r=nalexander, a=ritu
authorNevin Chen <cnevinchen@gmail.com>
Mon, 12 Jun 2017 15:38:30 +0800
changeset 413935 ddde9a8077529ebeacc1f3abb0f8bc6096b05b3e
parent 413934 a5658a3fd394183d08992e38035ae2bf47e85426
child 413936 72a0956cd5c116eeaa30a859792f8212c6fa5c75
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander, ritu
bugs1372091
milestone55.0
Bug 1372091 - Turn off Leanplum on Beta and release. r=nalexander, a=ritu This disables the compiled (Java) and interpreted (JavaScript) code for mozilla-beta. I cannot at this time determine a /nightly mozconfig that enables the compiled (Java) code in Nightly and developer builds while disabling it in Release and Beta. MozReview-Commit-ID: J6iyXAPht5l
mobile/android/app/mobile.js
mobile/android/config/mozconfigs/android-api-15/nightly
mobile/android/config/mozconfigs/android-api-15/nightly-old-id
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -409,25 +409,27 @@ pref("browser.ui.zoom.force-user-scalabl
 // When removing this Nightly flag, also remember to remove the flags surrounding this feature
 // in GeckoPreferences and BrowserApp (see bug 1245930).
 #ifdef NIGHTLY_BUILD
 pref("ui.bookmark.mobilefolder.enabled", true);
 #else
 pref("ui.bookmark.mobilefolder.enabled", false);
 #endif
 
-#if MOZ_UPDATE_CHANNEL == nightly
-pref("mma.enabled", true);
-#elif MOZ_UPDATE_CHANNEL == beta
+#ifdef RELEASE_OR_BETA
+// MMA is disabled in shipping Beta and Release builds.
+pref("mma.enabled", false);
+#elif MOZ_UPDATE_CHANNEL == nightly
+// Enabled in shipping Nightly builds.
 pref("mma.enabled", true);
 #else
+// And enabled in local developer builds.
 pref("mma.enabled", true);
 #endif
 
-
 pref("ui.touch.radius.enabled", false);
 pref("ui.touch.radius.leftmm", 3);
 pref("ui.touch.radius.topmm", 5);
 pref("ui.touch.radius.rightmm", 3);
 pref("ui.touch.radius.bottommm", 2);
 pref("ui.touch.radius.visitedWeight", 120);
 
 pref("ui.mouse.radius.enabled", false);
--- a/mobile/android/config/mozconfigs/android-api-15/nightly
+++ b/mobile/android/config/mozconfigs/android-api-15/nightly
@@ -9,11 +9,10 @@ ac_add_options --target=arm-linux-androi
 ac_add_options --with-branding=mobile/android/branding/beta
 
 # 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,11 +9,10 @@ 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"