Merge "Check that the DeapexerInfo was actually set" into main am: 47a91c9f4f

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216739

Change-Id: I9d23271205f555da55c0f4a2022927f6eaf88fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2024-08-15 18:18:36 +00:00
committed by Automerger Merge Worker

View File

@@ -181,7 +181,11 @@ func FindDeapexerProviderForModule(ctx ModuleContext) (*DeapexerInfo, error) {
// An err has been found. Do not visit further. // An err has been found. Do not visit further.
return return
} }
c, _ := OtherModuleProvider(ctx, m, DeapexerProvider) c, ok := OtherModuleProvider(ctx, m, DeapexerProvider)
if !ok {
ctx.ModuleErrorf("Expected all deps with DeapexerTag to have a DeapexerProvider, but module %q did not", m.Name())
return
}
p := &c p := &c
if di != nil { if di != nil {
// If two DeapexerInfo providers have been found then check if they are // If two DeapexerInfo providers have been found then check if they are