Use OutputFilesProvider on aconfig_declarations_group
In the context of incremental soong, the output files inter-module-communication will be through OutputFilesProvider. The OutputFileProducer interface will be deprecated. This CL also removes the unused field "intermediatePath" from build_flag_declarations and aconfig_declarations Test: CI Bug: 339477385 Change-Id: I8417db7ca6ece50b3ecd807fc3b6356aa52b18e0
This commit is contained in:
@@ -15,7 +15,6 @@
|
||||
package codegen
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"maps"
|
||||
|
||||
"android/soong/android"
|
||||
@@ -115,19 +114,9 @@ func (adg *AconfigDeclarationsGroup) GenerateAndroidBuildActions(ctx android.Mod
|
||||
Srcjars: adg.javaSrcjars,
|
||||
ModeInfos: adg.modeInfos,
|
||||
})
|
||||
}
|
||||
|
||||
var _ android.OutputFileProducer = (*AconfigDeclarationsGroup)(nil)
|
||||
|
||||
func (adg *AconfigDeclarationsGroup) OutputFiles(tag string) (android.Paths, error) {
|
||||
switch tag {
|
||||
case "":
|
||||
return adg.intermediateCacheOutputPaths, nil
|
||||
case ".srcjars":
|
||||
return adg.javaSrcjars, nil
|
||||
default:
|
||||
return nil, fmt.Errorf("unsupported module reference tag %s", tag)
|
||||
}
|
||||
ctx.SetOutputFiles(adg.intermediateCacheOutputPaths, "")
|
||||
ctx.SetOutputFiles(adg.javaSrcjars, ".srcjars")
|
||||
}
|
||||
|
||||
func (adg *AconfigDeclarationsGroup) Srcjars() android.Paths {
|
||||
|
Reference in New Issue
Block a user