Bug 1549886 - Enable MOZ_TELEMETRY_REPORTING by default when MOZILLA_OFFICIAL is set. r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D30336 --HG-- extra : moz-landing-system : lando
2019-05-08 14:33:56 +00:00 · 2019-05-08 14:33:56 +00:00 · 0e4063bd7b
--- a/browser/config/mozconfigs/linux32/common-opt
+++ b/browser/config/mozconfigs/linux32/common-opt
@ -12,7 +12,5 @@ ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
--- a/browser/config/mozconfigs/linux32/debug
+++ b/browser/config/mozconfigs/linux32/debug
@ -9,9 +9,6 @@ MOZ_AUTOMATION_L10N_CHECK=0
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 #Use ccache

 # Package js shell.
--- a/browser/config/mozconfigs/linux32/debug-asan
+++ b/browser/config/mozconfigs/linux32/debug-asan
@ -11,9 +11,6 @@ ac_add_options --enable-valgrind
 . $topsrcdir/build/unix/mozconfig.asan
 ac_add_options --disable-elf-hack

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

--- a/browser/config/mozconfigs/linux32/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig
@ -12,9 +12,6 @@ fi

 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
@ -12,9 +12,6 @@ fi

 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/linux32/nightly-asan
+++ b/browser/config/mozconfigs/linux32/nightly-asan
@ -13,9 +13,6 @@ ac_add_options --disable-elf-hack
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL=asan

--- a/browser/config/mozconfigs/linux64-aarch64/common-opt
+++ b/browser/config/mozconfigs/linux64-aarch64/common-opt
@ -15,8 +15,6 @@ ac_add_options --target=aarch64
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

--- a/browser/config/mozconfigs/linux64/common-opt
+++ b/browser/config/mozconfigs/linux64/common-opt
@ -12,7 +12,5 @@ ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
--- a/browser/config/mozconfigs/linux64/debug
+++ b/browser/config/mozconfigs/linux64/debug
@ -9,9 +9,6 @@ MOZ_AUTOMATION_L10N_CHECK=0
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

--- a/browser/config/mozconfigs/linux64/debug-asan
+++ b/browser/config/mozconfigs/linux64/debug-asan
@ -11,9 +11,6 @@ ac_add_options --enable-valgrind
 . $topsrcdir/build/unix/mozconfig.asan
 ac_add_options --disable-elf-hack

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

--- a/browser/config/mozconfigs/linux64/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux64/l10n-mozconfig
@ -7,9 +7,6 @@ ac_add_options --disable-nodejs

 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
@ -7,9 +7,6 @@ ac_add_options --disable-nodejs

 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/linux64/nightly-asan
+++ b/browser/config/mozconfigs/linux64/nightly-asan
@ -20,4 +20,7 @@ export MOZ_PACKAGE_JSSHELL=1
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL=asan

+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
+
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/nightly-asan-reporter
+++ b/browser/config/mozconfigs/linux64/nightly-asan-reporter
@ -22,10 +22,4 @@ export MOZ_PKG_SPECIAL=asan-reporter
 # Need this to add source information into platform.ini
 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-# The channel reported by Telemetry here will be "nightly-asan" as specified
-# in the respective override pref (toolkit.telemetry.overrideUpdateChannel),
-# while the build otherwise identifies as "nightly" to receive its updates.
-export MOZ_TELEMETRY_REPORTING=1
-
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/macosx64/common-opt
+++ b/browser/config/mozconfigs/macosx64/common-opt
@ -10,7 +10,5 @@ ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
--- a/browser/config/mozconfigs/macosx64/debug
+++ b/browser/config/mozconfigs/macosx64/debug
@ -5,9 +5,6 @@ ac_add_options --enable-debug
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

--- a/browser/config/mozconfigs/macosx64/debug-asan
+++ b/browser/config/mozconfigs/macosx64/debug-asan
@ -6,9 +6,6 @@ ac_add_options --enable-optimize="-O1"

 . $topsrcdir/build/unix/mozconfig.asan

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@ -18,9 +18,6 @@ unset NODEJS

 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
@ -22,9 +22,6 @@ fi

 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/macosx64/nightly-asan
+++ b/browser/config/mozconfigs/macosx64/nightly-asan
@ -5,9 +5,6 @@ ac_add_options --enable-optimize="-O2"

 . $topsrcdir/build/unix/mozconfig.asan

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

--- a/browser/config/mozconfigs/whitelist
+++ b/browser/config/mozconfigs/whitelist
@ -35,12 +35,10 @@ whitelist['release']['win64'] += ['export MOZ_PGO=1']

 whitelist['release']['linux32'] += [
    'export MOZILLA_OFFICIAL=1',
-    'export MOZ_TELEMETRY_REPORTING=1',
    'export MOZ_PGO=1',
 ]
 whitelist['release']['linux64'] += [
    'export MOZILLA_OFFICIAL=1',
-    'export MOZ_TELEMETRY_REPORTING=1',
    '. "$topsrcdir/build/mozconfig.pgo"',
 ]

--- a/browser/config/mozconfigs/win32/common-opt
+++ b/browser/config/mozconfigs/win32/common-opt
@ -14,8 +14,6 @@ ac_add_options --with-mozilla-api-keyfile=${WORKSPACE}/mozilla-desktop-geoloc-ap
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

-export MOZ_TELEMETRY_REPORTING=1
-
 . $topsrcdir/build/win32/mozconfig.vs-latest

 # Package js shell.
--- a/browser/config/mozconfigs/win32/debug
+++ b/browser/config/mozconfigs/win32/debug
@ -9,9 +9,6 @@ ac_add_options --enable-debug
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 . $topsrcdir/build/win32/mozconfig.vs-latest

 # Package js shell.
--- a/browser/config/mozconfigs/win32/l10n-mozconfig
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig
@ -12,9 +12,6 @@ unset NODEJS

 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/win32/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig-devedition
@ -12,9 +12,6 @@ unset NODEJS

 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/win64-aarch64/common-opt
+++ b/browser/config/mozconfigs/win64-aarch64/common-opt
@ -14,8 +14,6 @@ ac_add_options --with-mozilla-api-keyfile=${WORKSPACE}/mozilla-desktop-geoloc-ap
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

-export MOZ_TELEMETRY_REPORTING=1
-
 . $topsrcdir/build/win64-aarch64/mozconfig.vs-latest

 # Package js shell.
--- a/browser/config/mozconfigs/win64-aarch64/debug
+++ b/browser/config/mozconfigs/win64-aarch64/debug
@ -11,9 +11,6 @@ ac_add_options --enable-debug
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

--- a/browser/config/mozconfigs/win64-aarch64/l10n-mozconfig
+++ b/browser/config/mozconfigs/win64-aarch64/l10n-mozconfig
@ -11,9 +11,6 @@ unset NODEJS

 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/win64-aarch64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/win64-aarch64/l10n-mozconfig-devedition
@ -11,9 +11,6 @@ unset NODEJS

 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/win64/code-coverage
+++ b/browser/config/mozconfigs/win64/code-coverage
@ -13,9 +13,6 @@ ac_add_options --enable-rust-tests
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 . $topsrcdir/build/win64/mozconfig.vs-latest

 # Package js shell.
--- a/browser/config/mozconfigs/win64/common-opt
+++ b/browser/config/mozconfigs/win64/common-opt
@ -14,8 +14,6 @@ ac_add_options --with-mozilla-api-keyfile=${WORKSPACE}/mozilla-desktop-geoloc-ap
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

-export MOZ_TELEMETRY_REPORTING=1
-
 . $topsrcdir/build/win64/mozconfig.vs-latest

 # Package js shell.
--- a/browser/config/mozconfigs/win64/debug
+++ b/browser/config/mozconfigs/win64/debug
@ -10,9 +10,6 @@ ac_add_options --enable-debug
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

--- a/browser/config/mozconfigs/win64/debug-asan
+++ b/browser/config/mozconfigs/win64/debug-asan
@ -13,4 +13,7 @@ ac_add_options --enable-optimize="-O1"
 export MOZ_PACKAGE_JSSHELL=1
 export MOZ_PKG_SPECIAL=asan

+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
+
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/debug-fuzzing
+++ b/browser/config/mozconfigs/win64/debug-fuzzing
@ -1,7 +1,7 @@
 . "$topsrcdir/browser/config/mozconfigs/win64/debug"

 # Disable telemetry. All network activity is undesirable in fuzzing.
-unset MOZ_TELEMETRY_REPORTING
+ac_add_options MOZ_TELEMETRY_REPORTING=

 ac_add_options --enable-fuzzing

--- a/browser/config/mozconfigs/win64/l10n-mozconfig
+++ b/browser/config/mozconfigs/win64/l10n-mozconfig
@ -11,9 +11,6 @@ unset NODEJS

 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/win64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/win64/l10n-mozconfig-devedition
@ -11,9 +11,6 @@ unset NODEJS

 export MOZILLA_OFFICIAL=1

-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/win64/nightly-asan
+++ b/browser/config/mozconfigs/win64/nightly-asan
@ -13,4 +13,7 @@ ac_add_options --enable-optimize="-O2 -gline-tables-only"
 export MOZ_PACKAGE_JSSHELL=1
 export MOZ_PKG_SPECIAL=asan

+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
+
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/nightly-asan-reporter
+++ b/browser/config/mozconfigs/win64/nightly-asan-reporter
@ -24,10 +24,4 @@ export MOZILLA_OFFICIAL=1
 # Sandboxing is currently not compatible with the way the ASan reporter works
 ac_add_options --disable-sandbox

-# Enable Telemetry
-# The channel reported by Telemetry here will be "nightly-asan" as specified
-# in the respective override pref (toolkit.telemetry.overrideUpdateChannel),
-# while the build otherwise identifies as "nightly" to receive its updates.
-export MOZ_TELEMETRY_REPORTING=1
-
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/nightly-fuzzing-asan
+++ b/browser/config/mozconfigs/win64/nightly-fuzzing-asan
@ -1,7 +1,7 @@
 . "$topsrcdir/browser/config/mozconfigs/win64/nightly-asan"

 # Disable telemetry
-unset MOZ_TELEMETRY_REPORTING
+ac_add_options MOZ_TELEMETRY_REPORTING=

 ac_add_options --disable-crashreporter

--- a/mobile/android/config/mozconfigs/android-aarch64/beta
+++ b/mobile/android/config/mozconfigs/android-aarch64/beta
@ -13,7 +13,6 @@ export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 export MOZ_LTO=1

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1

 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-aarch64/debug
+++ b/mobile/android/config/mozconfigs/android-aarch64/debug
@ -10,7 +10,6 @@ ac_add_options --target=aarch64-linux-android
 export FENNEC_NIGHTLY=1

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET

 ac_add_options --with-branding=mobile/android/branding/nightly
--- a/mobile/android/config/mozconfigs/android-aarch64/debug-beta
+++ b/mobile/android/config/mozconfigs/android-aarch64/debug-beta
@ -8,7 +8,6 @@ ac_add_options --with-android-min-sdk=21
 ac_add_options --target=aarch64-linux-android

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET

 ac_add_options --with-branding=mobile/android/branding/beta
--- a/mobile/android/config/mozconfigs/android-aarch64/nightly
+++ b/mobile/android/config/mozconfigs/android-aarch64/nightly
@ -15,7 +15,6 @@ export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 export MOZ_LTO=1

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1

 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-16-frontend/nightly
+++ b/mobile/android/config/mozconfigs/android-api-16-frontend/nightly
@ -31,7 +31,6 @@ export FENNEC_NIGHTLY=1
 ac_add_options --with-branding=mobile/android/branding/nightly

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_MMA=1
 export MOZ_ANDROID_POCKET=1

--- a/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly
+++ b/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly
@ -36,7 +36,6 @@ export FENNEC_NIGHTLY=1
 ac_add_options --with-branding=mobile/android/branding/nightly

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_MMA=1
 export MOZ_ANDROID_POCKET=1

--- a/mobile/android/config/mozconfigs/android-api-16/beta
+++ b/mobile/android/config/mozconfigs/android-api-16/beta
@ -12,7 +12,6 @@ ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-branding=mobile/android/branding/beta

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_MMA=1
 export MOZ_ANDROID_POCKET=1

--- a/mobile/android/config/mozconfigs/android-api-16/debug
+++ b/mobile/android/config/mozconfigs/android-api-16/debug
@ -15,7 +15,6 @@ ac_add_options --target=arm-linux-androideabi
 export FENNEC_NIGHTLY=1

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1

 ac_add_options --with-branding=mobile/android/branding/nightly

--- a/mobile/android/config/mozconfigs/android-api-16/debug-beta
+++ b/mobile/android/config/mozconfigs/android-api-16/debug-beta
@ -13,7 +13,6 @@ ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1

 ac_add_options --with-branding=mobile/android/branding/beta

--- a/mobile/android/config/mozconfigs/android-api-16/debug-searchfox
+++ b/mobile/android/config/mozconfigs/android-api-16/debug-searchfox
@ -15,7 +15,6 @@ ac_add_options --target=arm-linux-androideabi
 export FENNEC_NIGHTLY=1

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1

 ac_add_options --with-branding=mobile/android/branding/nightly

--- a/mobile/android/config/mozconfigs/android-api-16/nightly
+++ b/mobile/android/config/mozconfigs/android-api-16/nightly
@ -14,7 +14,6 @@ ac_add_options --with-branding=mobile/android/branding/nightly
 export FENNEC_NIGHTLY=1

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_MMA=1
 export MOZ_ANDROID_POCKET=1

--- a/mobile/android/config/mozconfigs/android-x86/beta
+++ b/mobile/android/config/mozconfigs/android-x86/beta
@ -11,7 +11,6 @@ ac_add_options --with-android-min-sdk=16
 ac_add_options --with-branding=mobile/android/branding/beta

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1

 export AR="$topsrcdir/clang/bin/llvm-ar"
--- a/mobile/android/config/mozconfigs/android-x86/debug
+++ b/mobile/android/config/mozconfigs/android-x86/debug
@ -15,7 +15,6 @@ ac_add_options --with-android-min-sdk=16
 export FENNEC_NIGHTLY=1

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1

 ac_add_options --with-branding=mobile/android/branding/nightly
--- a/mobile/android/config/mozconfigs/android-x86/debug-beta
+++ b/mobile/android/config/mozconfigs/android-x86/debug-beta
@ -13,7 +13,6 @@ ac_add_options --target=i686-linux-android
 ac_add_options --with-android-min-sdk=16

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1

 ac_add_options --with-branding=mobile/android/branding/beta
--- a/mobile/android/config/mozconfigs/android-x86/debug-fuzzing
+++ b/mobile/android/config/mozconfigs/android-x86/debug-fuzzing
@ -1,9 +1,11 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/android-x86/debug"

 # Remove unwanted environment variables from the 'debug' mozconfig.
-unset MOZ_TELEMETRY_REPORTING
 unset MOZ_ANDROID_POCKET

+# Disable Telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
+
 ac_add_options --enable-fuzzing

 # This adds '-fuzzing' to the APK filename for local builds.
--- a/mobile/android/config/mozconfigs/android-x86/nightly
+++ b/mobile/android/config/mozconfigs/android-x86/nightly
@ -13,7 +13,6 @@ ac_add_options --with-branding=mobile/android/branding/nightly
 export FENNEC_NIGHTLY=1

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1

 export AR="$topsrcdir/clang/bin/llvm-ar"
--- a/mobile/android/config/mozconfigs/android-x86_64/beta
+++ b/mobile/android/config/mozconfigs/android-x86_64/beta
@ -13,7 +13,6 @@ export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 export MOZ_LTO=1

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1

 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86_64/debug
+++ b/mobile/android/config/mozconfigs/android-x86_64/debug
@ -10,7 +10,6 @@ ac_add_options --target=x86_64-linux-android
 export FENNEC_NIGHTLY=1

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET

 ac_add_options --with-branding=mobile/android/branding/nightly
--- a/mobile/android/config/mozconfigs/android-x86_64/debug-beta
+++ b/mobile/android/config/mozconfigs/android-x86_64/debug-beta
@ -8,7 +8,6 @@ ac_add_options --with-android-min-sdk=21
 ac_add_options --target=x86_64-linux-android

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET

 ac_add_options --with-branding=mobile/android/branding/beta
--- a/mobile/android/config/mozconfigs/android-x86_64/nightly
+++ b/mobile/android/config/mozconfigs/android-x86_64/nightly
@ -15,7 +15,6 @@ export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 export MOZ_LTO=1

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1

 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/public-partner/distribution_sample/mozconfig1
+++ b/mobile/android/config/mozconfigs/public-partner/distribution_sample/mozconfig1
@ -17,6 +17,5 @@ ac_add_options --with-branding=mobile/android/branding/nightly
 ac_add_options --with-android-distribution-directory=/builds/worker/workspace/build/partner

 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1

 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@ -641,7 +641,7 @@ def check_places_and_android_history(places, android_history):
        die('Cannot use MOZ_ANDROID_HISTORY alongside MOZ_PLACES.')


-option(env='MOZ_TELEMETRY_REPORTING',
+option(env='MOZ_TELEMETRY_REPORTING', default=mozilla_official,
       help='Enable telemetry reporting')

 set_define('MOZ_TELEMETRY_REPORTING', True, when='MOZ_TELEMETRY_REPORTING')