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

Add OutputFilesProvider support for singleton

Browse Source 
This CL also changes to use OutputFilesProvider on rust module, which
has singleton involved.

Test: CI
Bug: 339477385
Bug: 348494466
Change-Id: Idc5c0fb9f8425f09184d5b73531ee3052e5a076c
This commit is contained in:
mrziwang
2024-06-20 16:39:25 -07:00
parent fe658ac53a
commit 0cbd3b0e79
3 changed files with 45 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
rust/rust.go
View File

@@ -206,27 +206,6 @@ func (mod *Module) IsPrebuilt() bool {
return false
}
func (mod *Module) OutputFiles(tag string) (android.Paths, error) {
switch tag {
case "":
if mod.sourceProvider != nil && (mod.compiler == nil || mod.compiler.Disabled()) {
return mod.sourceProvider.Srcs(), nil
} else {
if mod.OutputFile().Valid() {
return android.Paths{mod.OutputFile().Path()}, nil
}
return android.Paths{}, nil
}
case "unstripped":
if mod.compiler != nil {
return android.PathsIfNonNil(mod.compiler.unstrippedOutputFilePath()), nil
}
return nil, nil
default:
return nil, fmt.Errorf("unsupported module reference tag %q", tag)
}
}
func (mod *Module) SelectedStl() string {
return ""
}
@@ -986,6 +965,20 @@ func (mod *Module) GenerateAndroidBuildActions(actx android.ModuleContext) {
if mod.testModule {
android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{})
}
mod.setOutputFiles(ctx)
}
func (mod *Module) setOutputFiles(ctx ModuleContext) {
if mod.sourceProvider != nil && (mod.compiler == nil || mod.compiler.Disabled()) {
ctx.SetOutputFiles(mod.sourceProvider.Srcs(), "")
} else if mod.OutputFile().Valid() {
ctx.SetOutputFiles(android.Paths{mod.OutputFile().Path()}, "")
} else {
ctx.SetOutputFiles(android.Paths{}, "")
}
if mod.compiler != nil {
ctx.SetOutputFiles(android.PathsIfNonNil(mod.compiler.unstrippedOutputFilePath()), "unstripped")
}
}
func (mod *Module) deps(ctx DepsContext) Deps {
@@ -1469,7 +1462,7 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
var srcProviderDepFiles android.Paths
for _, dep := range directSrcProvidersDeps {
srcs, _ := dep.OutputFiles("")
srcs := android.OutputFilesForModule(ctx, dep, "")
srcProviderDepFiles = append(srcProviderDepFiles, srcs...)
}
for _, dep := range directSrcDeps {
@@ -1856,5 +1849,3 @@ var Bool = proptools.Bool
var BoolDefault = proptools.BoolDefault
var String = proptools.String
var StringPtr = proptools.StringPtr
var _ android.OutputFileProducer = (*Module)(nil)