tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use OutputFilesProvider on prebuilt_etc" into main

Browse source
This commit is contained in:
Zi Wang 2024-06-13 20:56:57 +00:00 committed by Gerrit Code Review
commit afc28427cf
1 changed files with 2 additions and 11 deletions
Show stats 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]
}
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 {
if subDir := proptools.String(p.subdirProperties.Sub_dir); subDir != "" {
return subDir
@ -420,6 +409,8 @@ func (p *PrebuiltEtc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
for _, ip := range installs {
ip.addInstallRules(ctx)
}
ctx.SetOutputFiles(p.outputFilePaths.Paths(), "")
}
type installProperties struct {