commit c05b034e95636ab9692d41b45f9c8cca67950c0c
author Paul Duffin <paulduffin@google.com> Sat Mar 06 13:28:13 2021 +0000
committer Paul Duffin <paulduffin@google.com> Sun Mar 07 12:33:07 2021 +0000
tree 9c22b32c77ee9bd301ec17ffffeb9dc6907d9c1a
parent 1d2d42f8e929b9aa4af90f4f70be516f1f734c1b

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

android/mutator.go

diff --git a/android/mutator.go b/android/mutator.go
index 8bfb24e..9552aa1 100644
--- a/android/mutator.go
+++ b/android/mutator.go
@@ -69,7 +69,14 @@
 	mctx.mutators.registerAll(ctx)
 }
 
-func registerMutators(ctx *Context, preArch, preDeps, postDeps, finalDeps []RegisterMutatorFunc) {
+// collateGloballyRegisteredMutators constructs the list of mutators that have been registered
+// with the InitRegistrationContext and will be used at runtime.
+func collateGloballyRegisteredMutators() sortableComponents {
+	return collateRegisteredMutators(preArch, preDeps, postDeps, finalDeps)
+}
+
+// collateRegisteredMutators constructs a single list of mutators from the separate lists.
+func collateRegisteredMutators(preArch, preDeps, postDeps, finalDeps []RegisterMutatorFunc) sortableComponents {
 	mctx := &registerMutatorsContext{}
 
 	register := func(funcs []RegisterMutatorFunc) {
@@ -89,7 +96,7 @@
 	mctx.finalPhase = true
 	register(finalDeps)
 
-	mctx.mutators.registerAll(ctx)
+	return mctx.mutators
 }
 
 type registerMutatorsContext struct {