Merge "Return error for unsupported context in outputFilesForModuleFromProvider" into main am: c7dc585ff2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3180583 Change-Id: I67d1b70393d1680874f668312be1269b9c4874e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -2504,8 +2504,9 @@ func outputFilesForModuleFromProvider(ctx PathContext, module blueprint.Module,
|
|||||||
} else if cta, isCta := ctx.(*singletonContextAdaptor); isCta {
|
} else if cta, isCta := ctx.(*singletonContextAdaptor); isCta {
|
||||||
providerData, _ := cta.moduleProvider(module, OutputFilesProvider)
|
providerData, _ := cta.moduleProvider(module, OutputFilesProvider)
|
||||||
outputFiles, _ = providerData.(OutputFilesInfo)
|
outputFiles, _ = providerData.(OutputFilesInfo)
|
||||||
|
} else {
|
||||||
|
return nil, fmt.Errorf("unsupported context %q in method outputFilesForModuleFromProvider", reflect.TypeOf(ctx))
|
||||||
}
|
}
|
||||||
// TODO: Add a check for skipped context
|
|
||||||
|
|
||||||
if outputFiles.isEmpty() {
|
if outputFiles.isEmpty() {
|
||||||
return nil, OutputFilesProviderNotSet
|
return nil, OutputFilesProviderNotSet
|
||||||
|
Reference in New Issue
Block a user