Separate the collation of mutators from registration
This separates the collation of mutators from the registration of them
to allow the test infrastructure to sort the mutator order to match
that used at runtime.
Bug: 181953909
Test: m nothing
Change-Id: I01a073289d44417f327b0815c09eb1c033d464f2
diff --git a/android/testing.go b/android/testing.go
index 556db78..b134eae 100644
--- a/android/testing.go
+++ b/android/testing.go
@@ -141,7 +141,8 @@
}
func (ctx *TestContext) Register() {
- registerMutators(ctx.Context, ctx.preArch, ctx.preDeps, ctx.postDeps, ctx.finalDeps)
+ mutators := collateRegisteredMutators(ctx.preArch, ctx.preDeps, ctx.postDeps, ctx.finalDeps)
+ mutators.registerAll(ctx.Context)
ctx.RegisterSingletonType("env", EnvSingleton)
}