Merging upstream version 126.0.

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

1 files changed, 11 insertions, 0 deletions

diff --git a/taskcluster/gecko_taskgraph/__init__.py b/taskcluster/gecko_taskgraph/__init__.py
index f1de1e9120..c169eae023 100644
--- a/taskcluster/gecko_taskgraph/__init__.py
+++ b/taskcluster/gecko_taskgraph/__init__.py
@@ -51,12 +51,23 @@ def register(graph_config):
     Args:
         graph_config: The graph configuration object.
     """
+    import android_taskgraph
     from taskgraph import generator
 
+    # TODO: Remove along with
+    # `gecko_taskgraph.optimize.strategies.SkipUnlessChanged`
+    # (see comment over there)
+    from taskgraph.optimize.base import registry
+
+    del registry["skip-unless-changed"]
+
     from gecko_taskgraph import (  # noqa: trigger target task method registration
         morph,  # noqa: trigger morph registration
         target_tasks,
     )
+
+    android_taskgraph.register(graph_config)
+
     from gecko_taskgraph.parameters import register_parameters
     from gecko_taskgraph.util import dependencies  # noqa: trigger group_by registration
     from gecko_taskgraph.util.verify import verifications