Bug 1093401 - Only set MOZ_DATA_REPORTING in configure. r=rnewman
authorNick Alexander <nalexander@mozilla.com>
Fri, 14 Nov 2014 15:51:50 -0800
changeset 240227 474d4e4f656749b6a63d721e2213711e1d023c23
parent 240226 46db8dc8ce2c0173da8d80c7d759b10489fd1463
child 240228 9a9e972fad121952b827c647572dea2707638340
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman
bugs1093401
milestone36.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 1093401 - Only set MOZ_DATA_REPORTING in configure. r=rnewman For all applications, MOZ_DATA_REPORTING is set in configure if any of MOZ_TELEMETRY_REPORTING, MOZ_SERVICES_HEALTHREPORT, or MOZ_CRASHREPORTER is set. For mobile/android, we *also* set MOZ_DATA_REPORTING when we're not in a release (Beta/Release) build. Geo/stumbler data is build-time enabled by MOZ_ANDROID_MLS_STUMBLER but does not automatically upload data: the user must manually enable uploading geo/stumbler data. That is, this is an explicit opt-in rather than an explicit opt-out; and geo/stumbler data should not be covered by the data reporting notification at this time. In the past, I believe that geo/stumbler data was uploaded based on the feature being build time enabled, which corresponded to !RELEASE_BUILD, so the logic being removed was reasonable.
mobile/android/confvars.sh
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -50,21 +50,16 @@ MOZ_APP_STATIC_INI=1
 MOZ_ENABLE_SZIP=1
 
 # Enable navigator.mozPay
 MOZ_PAY=1
 
 # Enable UI for healthreporter
 MOZ_SERVICES_HEALTHREPORT=1
 
-# Wifi-AP/cell tower data reporting is enabled on non-release builds.
-if test ! "$RELEASE_BUILD"; then
-MOZ_DATA_REPORTING=1
-fi
-
 # Enable runtime locale switching.
 MOZ_LOCALE_SWITCHER=1
 
 # Enable second screen and casting support for external devices.
 MOZ_DEVICES=1
 
 # Enable second screen using native Android libraries, provided we're
 # not resource constrained.