summaryrefslogtreecommitdiff
path: root/android/testing.go
diff options
context:
space:
mode:
author Yu Liu <yudiliu@google.com> 2025-02-19 23:44:48 +0000
committer Yu Liu <yudiliu@google.com> 2025-02-20 19:41:43 +0000
commit64371e06725fd63b92d0db830e59674dad1b7e5d (patch)
tree291f5d52e58a9083eff64d49a5ecc60ba087bf9c /android/testing.go
parentebc3d69b42a6bf6efb7571afb9d0991531db13cf (diff)
For modules that provide AndroidMkInfoProvider, only access modules'
internal data through providers. Eventually all module should be converted to provide this provider, and then we can change it to use VisitAllModuleProxies instead of VisitAllModules. Bug: 377723687 Test: Unit tests and compare the ninja and mk files generated. Change-Id: I83b55c20f971c619fa39613c1fb1cb525f56d20e
Diffstat (limited to 'android/testing.go')
-rw-r--r--android/testing.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/android/testing.go b/android/testing.go
index fe9bcec26..d0ede210a 100644
--- a/android/testing.go
+++ b/android/testing.go
@@ -1191,10 +1191,11 @@ func AndroidMkInfoForTest(t *testing.T, ctx *TestContext, mod Module) *AndroidMk
info := OtherModuleProviderOrDefault(ctx, mod, AndroidMkInfoProvider)
aconfigUpdateAndroidMkInfos(ctx, mod, info)
- info.PrimaryInfo.fillInEntries(ctx, mod)
+ commonInfo, _ := OtherModuleProvider(ctx, mod, CommonModuleInfoKey)
+ info.PrimaryInfo.fillInEntries(ctx, mod, &commonInfo)
if len(info.ExtraInfo) > 0 {
for _, ei := range info.ExtraInfo {
- ei.fillInEntries(ctx, mod)
+ ei.fillInEntries(ctx, mod, &commonInfo)
}
}