Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 1 insertions, 16 deletions

diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build
index 718120cf78..6da23fa372 100644
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -30,9 +30,7 @@ with Files("docs/**"):
     SCHEDULES.exclusive = ["docs"]
 
 if CONFIG["ENABLE_TESTS"]:
-    # We used to need GeckoView tests as a separate directory. This
-    # is no longer true and we could probably move it to tests/gtest.
-    DIRS += ["geckoview/gtest", "tests/gtest"]
+    DIRS += ["tests/gtest"]
 
 TEST_DIRS += ["tests", "dap/ffi-gtest"]
 
@@ -78,7 +76,6 @@ SOURCES += [
     "core/TelemetryScalar.cpp",
     "core/TelemetryUserInteraction.cpp",
     "dap/DAPTelemetry.cpp",
-    "geckoview/streaming/GeckoViewStreamingTelemetry.cpp",
     "other/CombinedStacks.cpp",
     "other/ProcessedStack.cpp",
     "other/TelemetryIOInterposeObserver.cpp",
@@ -244,18 +241,6 @@ GeneratedFile(
     inputs=processes_files,
 )
 
-# Ensure that the GeckoView metrics file parses correctly prior to it
-# being released in Android components. This triggers glean_parser by
-# pretending to generate a file named 'glean_checks'.
-# While this currently only applies to Android, in the medium-term it
-# is going to generate code for Firefox as well (project FOG).
-# Prior art for this was in bug 1063728, within SpiderMonkey tests.
-GeneratedFile(
-    "glean_checks",
-    script="build_scripts/run_glean_parser.py",
-    inputs=["geckoview/streaming/metrics.yaml"],
-)
-
 # Generate UserInteraction file
 userinteraction_files = [
     "UserInteractions.yaml",