ExportableModule no longer implements OutputFileProducer
multitree.ExportableModule no longer implements android.OutputFileProducer In the context of incremental soong, the output files inter-module-communication will be through OutputFilesProvider. The OutputFileProducer interface will be deprecated. ApiSurface and apexBundle are included in this change. Test: CI Bug: 339477385 Change-Id: I9247bb2dfed270a879f8bc96c6aa06803fde0150
This commit is contained in:
@@ -16,8 +16,6 @@ package multitree
|
||||
|
||||
import (
|
||||
"android/soong/android"
|
||||
"fmt"
|
||||
|
||||
"github.com/google/blueprint"
|
||||
)
|
||||
|
||||
@@ -40,7 +38,6 @@ type ApiSurface struct {
|
||||
ExportableModuleBase
|
||||
properties apiSurfaceProperties
|
||||
|
||||
allOutputs android.Paths
|
||||
taggedOutputs map[string]android.Paths
|
||||
}
|
||||
|
||||
@@ -86,15 +83,9 @@ func (surface *ApiSurface) GenerateAndroidBuildActions(ctx android.ModuleContext
|
||||
Inputs: allOutputs,
|
||||
})
|
||||
|
||||
surface.allOutputs = allOutputs
|
||||
surface.taggedOutputs = contributionFiles
|
||||
}
|
||||
|
||||
func (surface *ApiSurface) OutputFiles(tag string) (android.Paths, error) {
|
||||
if tag != "" {
|
||||
return nil, fmt.Errorf("unknown tag: %q", tag)
|
||||
}
|
||||
return surface.allOutputs, nil
|
||||
ctx.SetOutputFiles(allOutputs, "")
|
||||
}
|
||||
|
||||
func (surface *ApiSurface) TaggedOutputs() map[string]android.Paths {
|
||||
@@ -105,7 +96,6 @@ func (surface *ApiSurface) Exportable() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
var _ android.OutputFileProducer = (*ApiSurface)(nil)
|
||||
var _ Exportable = (*ApiSurface)(nil)
|
||||
|
||||
type ApiContribution interface {
|
||||
|
Reference in New Issue
Block a user