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

Use OutputFilesProvider on prebuilt_etc

Browse Source 
In the context of incremental soong, the output files
inter-module-communication will be through OutputFilesProvider.
The OutputFileProducer interface will be deprecated.

Test: CI
Bug: 339477385
Change-Id: Ibd64f7e526f39a067ce395b32b87d3fdb117a573
This commit is contained in:
mrziwang
2024-06-11 12:42:24 -07:00
parent 3125b75d5d
commit 8937176646
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
etc/prebuilt_etc.go
View File

@@ -268,17 +268,6 @@ func (p *PrebuiltEtc) OutputFile() android.OutputPath {
return p.outputFilePaths[0] return p.outputFilePaths[0]
} }
var _ android.OutputFileProducer = (*PrebuiltEtc)(nil)
func (p *PrebuiltEtc) OutputFiles(tag string) (android.Paths, error) {
switch tag {
case "":
return p.outputFilePaths.Paths(), nil
default:
return nil, fmt.Errorf("unsupported module reference tag %q", tag)
}
}
func (p *PrebuiltEtc) SubDir() string { func (p *PrebuiltEtc) SubDir() string {
if subDir := proptools.String(p.subdirProperties.Sub_dir); subDir != "" { if subDir := proptools.String(p.subdirProperties.Sub_dir); subDir != "" {
return subDir return subDir
@@ -420,6 +409,8 @@ func (p *PrebuiltEtc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
for _, ip := range installs { for _, ip := range installs {
ip.addInstallRules(ctx) ip.addInstallRules(ctx)
} }
ctx.SetOutputFiles(p.outputFilePaths.Paths(), "")
} }
type installProperties struct { type installProperties struct {