diff options
| author | 2025-03-14 15:56:03 -0700 | |
|---|---|---|
| committer | 2025-03-14 15:56:03 -0700 | |
| commit | f2aacebb28cf16f9c3fa4c59a9a9a931ab6b0846 (patch) | |
| tree | da660a6da02da57b771ebc1f7ea1bf3189a90c47 /android/testing.go | |
| parent | 5fe9b839b0b67218bcdfdbeec06b6813f040939e (diff) | |
| parent | f22120fb1da7f75a571966124bb0da6a57fd4f07 (diff) | |
Merge "Change CommonModuleInfoProvider to a pointer." into main
Diffstat (limited to 'android/testing.go')
| -rw-r--r-- | android/testing.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/android/testing.go b/android/testing.go index 08c8083a6..d2949ec8e 100644 --- a/android/testing.go +++ b/android/testing.go @@ -1197,11 +1197,11 @@ func AndroidMkInfoForTest(t *testing.T, ctx *TestContext, mod Module) *AndroidMk info := OtherModuleProviderOrDefault(ctx, mod, AndroidMkInfoProvider) aconfigUpdateAndroidMkInfos(ctx, mod, info) - commonInfo, _ := OtherModuleProvider(ctx, mod, CommonModuleInfoProvider) - info.PrimaryInfo.fillInEntries(ctx, mod, &commonInfo) + commonInfo := OtherModulePointerProviderOrDefault(ctx, mod, CommonModuleInfoProvider) + info.PrimaryInfo.fillInEntries(ctx, mod, commonInfo) if len(info.ExtraInfo) > 0 { for _, ei := range info.ExtraInfo { - ei.fillInEntries(ctx, mod, &commonInfo) + ei.fillInEntries(ctx, mod, commonInfo) } } |