Use OutputFilesProvider on buildinfo_prop
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: I0875ed4be72954187722276b10949a2ad4e66dcf
This commit is contained in:
@@ -15,8 +15,6 @@
|
||||
package android
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/google/blueprint/proptools"
|
||||
)
|
||||
|
||||
@@ -41,20 +39,10 @@ type buildinfoPropModule struct {
|
||||
installPath InstallPath
|
||||
}
|
||||
|
||||
var _ OutputFileProducer = (*buildinfoPropModule)(nil)
|
||||
|
||||
func (p *buildinfoPropModule) installable() bool {
|
||||
return proptools.BoolDefault(p.properties.Installable, true)
|
||||
}
|
||||
|
||||
// OutputFileProducer
|
||||
func (p *buildinfoPropModule) OutputFiles(tag string) (Paths, error) {
|
||||
if tag != "" {
|
||||
return nil, fmt.Errorf("unsupported tag %q", tag)
|
||||
}
|
||||
return Paths{p.outputFilePath}, nil
|
||||
}
|
||||
|
||||
func shouldAddBuildThumbprint(config Config) bool {
|
||||
knownOemProperties := []string{
|
||||
"ro.product.brand",
|
||||
@@ -76,6 +64,8 @@ func (p *buildinfoPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
|
||||
return
|
||||
}
|
||||
p.outputFilePath = PathForModuleOut(ctx, p.Name()).OutputPath
|
||||
ctx.SetOutputFiles(Paths{p.outputFilePath}, "")
|
||||
|
||||
if !ctx.Config().KatiEnabled() {
|
||||
WriteFileRule(ctx, p.outputFilePath, "# no buildinfo.prop if kati is disabled")
|
||||
return
|
||||
|
Reference in New Issue
Block a user