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

39
rust/rust.go
View File

@@ -208,27 +208,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 ""
}
@@ -988,6 +967,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 {
@@ -1471,7 +1464,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 {
@@ -1858,5 +1851,3 @@ var Bool = proptools.Bool
var BoolDefault = proptools.BoolDefault
var String = proptools.String
var StringPtr = proptools.StringPtr
var _ android.OutputFileProducer = (*Module)(nil)

17
rust/test_test.go
View File

@@ -106,12 +106,9 @@ func TestDataLibs(t *testing.T) {
ctx := testRust(t, bp)
module := ctx.ModuleForTests("main_test", "android_arm64_armv8-a").Module()
testBinary := module.(*Module).compiler.(*testDecorator)
outputFiles, err := module.(android.OutputFileProducer).OutputFiles("")
if err != nil {
t.Fatalf("Expected rust_test to produce output files, error: %s", err)
}
testingModule := ctx.ModuleForTests("main_test", "android_arm64_armv8-a")
testBinary := testingModule.Module().(*Module).compiler.(*testDecorator)
outputFiles := testingModule.OutputFiles(t, "")
if len(outputFiles) != 1 {
t.Fatalf("expected exactly one output file. output files: [%s]", outputFiles)
}
@@ -168,12 +165,10 @@ func TestDataLibsRelativeInstallPath(t *testing.T) {
`
ctx := testRust(t, bp)
module := ctx.ModuleForTests("main_test", "android_arm64_armv8-a").Module()
testingModule := ctx.ModuleForTests("main_test", "android_arm64_armv8-a")
module := testingModule.Module()
testBinary := module.(*Module).compiler.(*testDecorator)
outputFiles, err := module.(android.OutputFileProducer).OutputFiles("")
if err != nil {
t.Fatalf("Expected rust_test to produce output files, error: %s", err)
}
outputFiles := testingModule.OutputFiles(t, "")
if len(outputFiles) != 1 {
t.Fatalf("expected exactly one output file. output files: [%s]", outputFiles)
}