Use OutputFilesProvider on sdk
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: I786661d2ef882fe5dc7a0f67fa28f5df78f1f259
This commit is contained in:
16
sdk/sdk.go
16
sdk/sdk.go
@@ -193,6 +193,10 @@ func (s *sdk) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
// Generate the snapshot from the member info.
|
||||
s.buildSnapshot(ctx, sdkVariants)
|
||||
}
|
||||
|
||||
if s.snapshotFile.Valid() {
|
||||
ctx.SetOutputFiles([]android.Path{s.snapshotFile.Path()}, "")
|
||||
}
|
||||
}
|
||||
|
||||
func (s *sdk) AndroidMkEntries() []android.AndroidMkEntries {
|
||||
@@ -222,18 +226,6 @@ func (s *sdk) AndroidMkEntries() []android.AndroidMkEntries {
|
||||
}}
|
||||
}
|
||||
|
||||
func (s *sdk) OutputFiles(tag string) (android.Paths, error) {
|
||||
switch tag {
|
||||
case "":
|
||||
if s.snapshotFile.Valid() {
|
||||
return []android.Path{s.snapshotFile.Path()}, nil
|
||||
}
|
||||
return nil, fmt.Errorf("snapshot file not defined. This is most likely because this isn't the common_os variant of this module")
|
||||
default:
|
||||
return nil, fmt.Errorf("unknown tag %q", tag)
|
||||
}
|
||||
}
|
||||
|
||||
// gatherTraits gathers the traits from the dynamically generated trait specific properties.
|
||||
//
|
||||
// Returns a map from member name to the set of required traits.
|
||||
|
Reference in New Issue
Block a user