Make ninja file deterministic even with dup module names
Bug: 65683273
Test: ./build/soong/scripts/diff_build_graphs.sh \
--products=aosp_arm '' ''
Change-Id: Ie01ff579d69e94b12363f53aec5d25810211c451
diff --git a/android/testing.go b/android/testing.go
index 4f2a2da..1c0fac1 100644
--- a/android/testing.go
+++ b/android/testing.go
@@ -23,14 +23,17 @@
)
func NewTestContext() *TestContext {
- ctx := &TestContext{
- Context: blueprint.NewContext(),
- }
-
namespaceExportFilter := func(namespace *Namespace) bool {
return true
}
- ctx.SetNameInterface(NewNameResolver(namespaceExportFilter))
+
+ nameResolver := NewNameResolver(namespaceExportFilter)
+ ctx := &TestContext{
+ Context: blueprint.NewContext(),
+ NameResolver: nameResolver,
+ }
+
+ ctx.SetNameInterface(nameResolver)
return ctx
}
@@ -44,6 +47,7 @@
type TestContext struct {
*blueprint.Context
preArch, preDeps, postDeps []RegisterMutatorFunc
+ NameResolver *NameResolver
}
func (ctx *TestContext) PreArchMutators(f RegisterMutatorFunc) {