summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/mozconfigs/linux32/debug3
-rw-r--r--config/mozconfigs/linux32/debug-asan3
-rw-r--r--config/mozconfigs/linux32/l10n-mozconfig3
-rw-r--r--config/mozconfigs/linux32/nightly-asan3
-rw-r--r--config/mozconfigs/linux64/debug3
-rw-r--r--config/mozconfigs/linux64/debug-asan3
-rw-r--r--config/mozconfigs/linux64/l10n-mozconfig3
-rw-r--r--config/mozconfigs/macosx-universal/l10n-mozconfig3
-rw-r--r--config/mozconfigs/macosx64/debug3
-rw-r--r--config/mozconfigs/macosx64/nightly3
-rw-r--r--config/mozconfigs/win32/debug3
-rw-r--r--config/mozconfigs/win32/l10n-mozconfig3
-rw-r--r--config/mozconfigs/win64/debug3
-rw-r--r--config/mozconfigs/win64/l10n-mozconfig3
14 files changed, 0 insertions, 42 deletions
diff --git a/config/mozconfigs/linux32/debug b/config/mozconfigs/linux32/debug
index de97087..0c34334 100644
--- a/config/mozconfigs/linux32/debug
+++ b/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.
diff --git a/config/mozconfigs/linux32/debug-asan b/config/mozconfigs/linux32/debug-asan
index 9fc7b9b..5919e00 100644
--- a/config/mozconfigs/linux32/debug-asan
+++ b/config/mozconfigs/linux32/debug-asan
@@ -11,9 +11,6 @@ ac_add_options --enable-valgrind
export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1
diff --git a/config/mozconfigs/linux32/l10n-mozconfig b/config/mozconfigs/linux32/l10n-mozconfig
index ae7cc93..21b088d 100644
--- a/config/mozconfigs/linux32/l10n-mozconfig
+++ b/config/mozconfigs/linux32/l10n-mozconfig
@@ -8,9 +8,6 @@ ac_add_options --enable-official-branding
export MOZILLA_OFFICIAL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
ac_add_options --disable-stdcxx-compat
# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
diff --git a/config/mozconfigs/linux32/nightly-asan b/config/mozconfigs/linux32/nightly-asan
index 0930c18..735616e 100644
--- a/config/mozconfigs/linux32/nightly-asan
+++ b/config/mozconfigs/linux32/nightly-asan
@@ -13,9 +13,6 @@ export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
# 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
diff --git a/config/mozconfigs/linux64/debug b/config/mozconfigs/linux64/debug
index a879da7..2583163 100644
--- a/config/mozconfigs/linux64/debug
+++ b/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
diff --git a/config/mozconfigs/linux64/debug-asan b/config/mozconfigs/linux64/debug-asan
index a772dbb..7a3aa0d 100644
--- a/config/mozconfigs/linux64/debug-asan
+++ b/config/mozconfigs/linux64/debug-asan
@@ -11,9 +11,6 @@ ac_add_options --enable-valgrind
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1
diff --git a/config/mozconfigs/linux64/l10n-mozconfig b/config/mozconfigs/linux64/l10n-mozconfig
index 4df482d..0fbb87f 100644
--- a/config/mozconfigs/linux64/l10n-mozconfig
+++ b/config/mozconfigs/linux64/l10n-mozconfig
@@ -8,9 +8,6 @@ ac_add_options --enable-official-branding
export MOZILLA_OFFICIAL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
ac_add_options --disable-stdcxx-compat
# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
diff --git a/config/mozconfigs/macosx-universal/l10n-mozconfig b/config/mozconfigs/macosx-universal/l10n-mozconfig
index 80a06ed..5e45bdd 100644
--- a/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ b/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -11,9 +11,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=
diff --git a/config/mozconfigs/macosx64/debug b/config/mozconfigs/macosx64/debug
index 4b052aa..dc9206e 100644
--- a/config/mozconfigs/macosx64/debug
+++ b/config/mozconfigs/macosx64/debug
@@ -7,9 +7,6 @@ ac_add_options --enable-verify-mar
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
ac_add_options --with-macbundlename-prefix=Firefox
fi
diff --git a/config/mozconfigs/macosx64/nightly b/config/mozconfigs/macosx64/nightly
index 12fec04..5a95a13 100644
--- a/config/mozconfigs/macosx64/nightly
+++ b/config/mozconfigs/macosx64/nightly
@@ -5,9 +5,6 @@ ac_add_options --enable-verify-mar
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
ac_add_options --with-macbundlename-prefix=Firefox
fi
diff --git a/config/mozconfigs/win32/debug b/config/mozconfigs/win32/debug
index 815276d..21de7fb 100644
--- a/config/mozconfigs/win32/debug
+++ b/config/mozconfigs/win32/debug
@@ -10,9 +10,6 @@ ac_add_options --enable-verify-mar
# 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.
diff --git a/config/mozconfigs/win32/l10n-mozconfig b/config/mozconfigs/win32/l10n-mozconfig
index d05067e..ec5dd80 100644
--- a/config/mozconfigs/win32/l10n-mozconfig
+++ b/config/mozconfigs/win32/l10n-mozconfig
@@ -7,9 +7,6 @@ ac_add_options --enable-official-branding
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=
diff --git a/config/mozconfigs/win64/debug b/config/mozconfigs/win64/debug
index db4eb59..f5997d7 100644
--- a/config/mozconfigs/win64/debug
+++ b/config/mozconfigs/win64/debug
@@ -13,9 +13,6 @@ ac_add_options --enable-verify-mar
# 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
diff --git a/config/mozconfigs/win64/l10n-mozconfig b/config/mozconfigs/win64/l10n-mozconfig
index 3b9b4af..e8f32fb 100644
--- a/config/mozconfigs/win64/l10n-mozconfig
+++ b/config/mozconfigs/win64/l10n-mozconfig
@@ -8,9 +8,6 @@ ac_add_options --enable-official-branding
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=