diff --git a/patches/disable-data-reporting-at-compile-time.patch b/patches/disable-data-reporting-at-compile-time.patch index 3702402..7dbdb81 100644 --- a/patches/disable-data-reporting-at-compile-time.patch +++ b/patches/disable-data-reporting-at-compile-time.patch @@ -1,5 +1,4 @@ diff --git a/browser/moz.configure b/browser/moz.configure -index 8653bcb..935af40 100644 --- a/browser/moz.configure +++ b/browser/moz.configure @@ -5,11 +5,11 @@ @@ -14,5 +13,20 @@ index 8653bcb..935af40 100644 -imply_option("MOZ_NORMANDY", True) +imply_option("MOZ_NORMANDY", False) - with only_when(target_is_linux & compile_environment): + with only_when(target_has_linux_kernel & compile_environment): option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper") +diff --git a/python/mach/mach/telemetry.py b/python/mach/mach/telemetry.py +--- a/python/mach/mach/telemetry.py ++++ b/python/mach/mach/telemetry.py +@@ -98,10 +98,7 @@ def is_applicable_telemetry_environment( + + + def is_telemetry_enabled(settings): +- if os.environ.get("DISABLE_TELEMETRY") == "1": +- return False +- +- return settings.mach_telemetry.is_enabled ++ return False + + + def arcrc_path():