diff options
| author | 2025-02-21 11:44:26 -0800 | |
|---|---|---|
| committer | 2025-02-21 11:44:26 -0800 | |
| commit | 6119cab0e08507caff9d89de3939af70303e8933 (patch) | |
| tree | 1499dcf44ed5769be265288ed2b9bf9622ddaae9 /android/testing.go | |
| parent | 073936ae010c861a5cc0c0dbe4cfc28703e9e349 (diff) | |
| parent | 64371e06725fd63b92d0db830e59674dad1b7e5d (diff) | |
Merge "For modules that provide AndroidMkInfoProvider, only access modules' internal data through providers." into main
Diffstat (limited to 'android/testing.go')
| -rw-r--r-- | android/testing.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/android/testing.go b/android/testing.go index 0cab0abdf..1962fdea5 100644 --- a/android/testing.go +++ b/android/testing.go @@ -1197,10 +1197,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) } } |