StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add OutputFilesProvider support for singleton" into main

Browse Source
This commit is contained in:
Zi Wang
2024-06-24 22:13:42 +00:00
committed by Gerrit Code Review
parent 79035fa842 0cbd3b0e79
commit b651aaaf9e
3 changed files with 45 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
android/module.go
View File

@@ -2540,34 +2540,44 @@ func outputFilesForModule(ctx PathContext, module blueprint.Module, tag string)
// reading OutputFilesProvider before GenerateBuildActions is finished.
// If a module doesn't have the OutputFilesProvider, nil is returned.
func outputFilesForModuleFromProvider(ctx PathContext, module blueprint.Module, tag string) (Paths, error) {
// TODO: support OutputFilesProvider for singletons
mctx, ok := ctx.(ModuleContext)
if !ok {
return nil, nil
}
if mctx.Module() != module {
if outputFilesProvider, ok := OtherModuleProvider(mctx, module, OutputFilesProvider); ok {
var outputFilesProvider OutputFilesInfo
if mctx, isMctx := ctx.(ModuleContext); isMctx {
if mctx.Module() != module {
outputFilesProvider, _ = OtherModuleProvider(mctx, module, OutputFilesProvider)
} else {
if tag == "" {
return outputFilesProvider.DefaultOutputFiles, nil
} else if taggedOutputFiles, hasTag := outputFilesProvider.TaggedOutputFiles[tag]; hasTag {
return mctx.Module().base().outputFiles.DefaultOutputFiles, nil
} else if taggedOutputFiles, hasTag := mctx.Module().base().outputFiles.TaggedOutputFiles[tag]; hasTag {
return taggedOutputFiles, nil
} else {
return nil, fmt.Errorf("unsupported module reference tag %q", tag)
return nil, fmt.Errorf("unsupported tag %q for module getting its own output files", tag)
}
}
} else {
} else if cta, isCta := ctx.(*singletonContextAdaptor); isCta {
providerData, _ := cta.moduleProvider(module, OutputFilesProvider)
outputFilesProvider, _ = providerData.(OutputFilesInfo)
}
// TODO: Add a check for skipped context
if !outputFilesProvider.isEmpty() {
if tag == "" {
return mctx.Module().base().outputFiles.DefaultOutputFiles, nil
} else if taggedOutputFiles, hasTag := mctx.Module().base().outputFiles.TaggedOutputFiles[tag]; hasTag {
return outputFilesProvider.DefaultOutputFiles, nil
} else if taggedOutputFiles, hasTag := outputFilesProvider.TaggedOutputFiles[tag]; hasTag {
return taggedOutputFiles, nil
} else {
return nil, fmt.Errorf("unsupported tag %q for module getting its own output files", tag)
return nil, fmt.Errorf("unsupported module reference tag %q", tag)
}
}
// TODO: Add a check for param module not having OutputFilesProvider set
return nil, nil
}
func (o OutputFilesInfo) isEmpty() bool {
return o.DefaultOutputFiles == nil && o.TaggedOutputFiles == nil
}
type OutputFilesInfo struct {
// default output files when tag is an empty string ""
DefaultOutputFiles Paths