Store order of the components used by the tests
Previously, the TestContext.Register() method stored all the components
that were available, rather than just the ones that were used by the
tests. That was practically useless for debugging. This change just
stores the ones used by the test.
Bug: 181953909
Test: m nothing
Change-Id: I8589b9b4423133709ab0cfd763bd284a7f47a24a
diff --git a/android/testing.go b/android/testing.go
index 042fa2b..2c24372 100644
--- a/android/testing.go
+++ b/android/testing.go
@@ -378,9 +378,9 @@
ctx.singletons.registerAll(ctx.Context)
// Save the sorted components order away to make them easy to access while debugging.
- ctx.preSingletonOrder = globalOrder.preSingletonOrder.namesInOrder
- ctx.mutatorOrder = globalOrder.mutatorOrder.namesInOrder
- ctx.singletonOrder = globalOrder.singletonOrder.namesInOrder
+ ctx.preSingletonOrder = componentsToNames(preSingletons)
+ ctx.mutatorOrder = componentsToNames(mutators)
+ ctx.singletonOrder = componentsToNames(singletons)
}
// RegisterForBazelConversion prepares a test context for bp2build conversion.