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

Merge "Use OutputFilesProvider on prebuilt_stubs_sources" into main

Browse Source
This commit is contained in:
Zi Wang
2024-07-01 23:19:21 +00:00
committed by Gerrit Code Review
parent 61f267504c aa2a2b6119
commit 381ee0f77a
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/droidstubs.go
View File

@@ -1453,17 +1453,6 @@ type PrebuiltStubsSources struct {
stubsSrcJar android.Path stubsSrcJar android.Path
} }
func (p *PrebuiltStubsSources) OutputFiles(tag string) (android.Paths, error) {
switch tag {
// prebuilt droidstubs does not output "exportable" stubs.
// Output the "everything" stubs srcjar file if the tag is ".exportable".
case "", ".exportable":
return android.Paths{p.stubsSrcJar}, nil
default:
return nil, fmt.Errorf("unsupported module reference tag %q", tag)
}
}
func (d *PrebuiltStubsSources) StubsSrcJar(_ StubsType) (android.Path, error) { func (d *PrebuiltStubsSources) StubsSrcJar(_ StubsType) (android.Path, error) {
return d.stubsSrcJar, nil return d.stubsSrcJar, nil
} }
@@ -1502,6 +1491,11 @@ func (p *PrebuiltStubsSources) GenerateAndroidBuildActions(ctx android.ModuleCon
rule.Build("zip src", "Create srcjar from prebuilt source") rule.Build("zip src", "Create srcjar from prebuilt source")
p.stubsSrcJar = outPath p.stubsSrcJar = outPath
} }
ctx.SetOutputFiles(android.Paths{p.stubsSrcJar}, "")
// prebuilt droidstubs does not output "exportable" stubs.
// Output the "everything" stubs srcjar file if the tag is ".exportable".
ctx.SetOutputFiles(android.Paths{p.stubsSrcJar}, ".exportable")
} }
func (p *PrebuiltStubsSources) Prebuilt() *android.Prebuilt { func (p *PrebuiltStubsSources) Prebuilt() *android.Prebuilt {