[tor-commits] [tor-browser-build/master] Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING

[gk at torproject.org]

commit 44d7ffc62c3df306a5e85d80d7607586f9c4d677
Author: Alex Catarineu <acat at torproject.org>
Date:   Thu Oct 3 16:15:40 2019 +0200

    Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING
---
 projects/firefox/mozconfig-android-aarch64 | 3 +++
 projects/firefox/mozconfig-android-armv7   | 3 +++
 projects/firefox/mozconfig-android-x86     | 3 +++
 projects/firefox/mozconfig-android-x86_64  | 3 +++
 projects/firefox/mozconfig-linux-i686      | 3 +++
 projects/firefox/mozconfig-linux-x86_64    | 3 +++
 projects/firefox/mozconfig-osx-x86_64      | 3 +++
 projects/firefox/mozconfig-windows-i686    | 3 +++
 projects/firefox/mozconfig-windows-x86_64  | 3 +++
 9 files changed, 27 insertions(+)

diff --git a/projects/firefox/mozconfig-android-aarch64 b/projects/firefox/mozconfig-android-aarch64
index ddc0fe1..9e4173f 100644
--- a/projects/firefox/mozconfig-android-aarch64
+++ b/projects/firefox/mozconfig-android-aarch64
@@ -44,3 +44,6 @@ ac_add_options --disable-webrtc
 
 ac_add_options --without-google-play-services
 ac_add_options --enable-proxy-bypass-protection
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7
index e5d2dc3..d13f870 100644
--- a/projects/firefox/mozconfig-android-armv7
+++ b/projects/firefox/mozconfig-android-armv7
@@ -44,3 +44,6 @@ ac_add_options --disable-webrtc
 
 ac_add_options --without-google-play-services
 ac_add_options --enable-proxy-bypass-protection
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86
index cdaa87c..019094c 100644
--- a/projects/firefox/mozconfig-android-x86
+++ b/projects/firefox/mozconfig-android-x86
@@ -44,3 +44,6 @@ ac_add_options --disable-webrtc
 
 ac_add_options --without-google-play-services
 ac_add_options --enable-proxy-bypass-protection
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-android-x86_64 b/projects/firefox/mozconfig-android-x86_64
index 17c3906..999f51f 100644
--- a/projects/firefox/mozconfig-android-x86_64
+++ b/projects/firefox/mozconfig-android-x86_64
@@ -45,3 +45,6 @@ ac_add_options --disable-webrtc
 ac_add_options --without-google-play-services
 
 ac_add_options --enable-proxy-bypass-protection
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686
index 95d14c1..87b64d7 100755
--- a/projects/firefox/mozconfig-linux-i686
+++ b/projects/firefox/mozconfig-linux-i686
@@ -36,3 +36,6 @@ ac_add_options --enable-proxy-bypass-protection
 
 # Bug 31448: ld.gold fails if we don't disable debug-symbols
 ac_add_options --disable-debug-symbols
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64
index e0a764f..19d2885 100755
--- a/projects/firefox/mozconfig-linux-x86_64
+++ b/projects/firefox/mozconfig-linux-x86_64
@@ -33,3 +33,6 @@ ac_add_options --disable-webrtc
 # Let's make sure no preference is enabling either Adobe's or Google's CDM.
 ac_add_options --disable-eme
 ac_add_options --enable-proxy-bypass-protection
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64
index 29e6617..8fa7885 100644
--- a/projects/firefox/mozconfig-osx-x86_64
+++ b/projects/firefox/mozconfig-osx-x86_64
@@ -46,3 +46,6 @@ ac_add_options --disable-tests
 # Let's make sure no preference is enabling either Adobe's or Google's CDM.
 ac_add_options --disable-eme
 ac_add_options --enable-proxy-bypass-protection
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686
index 60cf1c1..685b294 100644
--- a/projects/firefox/mozconfig-windows-i686
+++ b/projects/firefox/mozconfig-windows-i686
@@ -40,3 +40,6 @@ ac_add_options --disable-webrtc # Bug 1393901
 ac_add_options --disable-tests
 ac_add_options --disable-jemalloc # Bug 154751
 ac_add_options --disable-geckodriver # Bug 1489320
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64
index 2a128ae..92c774c 100644
--- a/projects/firefox/mozconfig-windows-x86_64
+++ b/projects/firefox/mozconfig-windows-x86_64
@@ -40,3 +40,6 @@ ac_add_options --disable-webrtc # Bug 1393901
 ac_add_options --disable-tests
 ac_add_options --disable-jemalloc # Bug 1547519
 ac_add_options --disable-geckodriver # Bug 1489320
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file