Fix the flaky build breakage for droiddoc target.
ExpandSourcesSubDir was calling SourceFileProducer.Srcs(), and then doing: moduleSrcs = append(moduleSrcs[:j], moduleSrcs[j+1:]...) This modifies the backing store of the slice, which may affect the original data stored in the SourceFileProducer. Make all Srcs implementations return slice that points to a copy of the backing array. Test: m out/target/common/obj/PACKAGING/checkpublicapi-current-timestamp Bug: b/76179848 b/76397326 Change-Id: I2432ce196984814daafc5aa9a2746e81de74494c
This commit is contained in:
@@ -183,7 +183,7 @@ type CompiledInterface interface {
|
||||
}
|
||||
|
||||
func (compiler *baseCompiler) Srcs() android.Paths {
|
||||
return compiler.srcs
|
||||
return append(android.Paths{}, compiler.srcs...)
|
||||
}
|
||||
|
||||
func (compiler *baseCompiler) appendCflags(flags []string) {
|
||||
|
@@ -70,7 +70,7 @@ func (fg *fileGroup) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
}
|
||||
|
||||
func (fg *fileGroup) Srcs() android.Paths {
|
||||
return fg.srcs
|
||||
return append(android.Paths{}, fg.srcs...)
|
||||
}
|
||||
|
||||
var androidMkTemplate = template.Must(template.New("filegroup").Parse(`
|
||||
|
@@ -125,7 +125,7 @@ func (g *Module) GeneratedSourceFiles() android.Paths {
|
||||
}
|
||||
|
||||
func (g *Module) Srcs() android.Paths {
|
||||
return g.outputFiles
|
||||
return append(android.Paths{}, g.outputFiles...)
|
||||
}
|
||||
|
||||
func (g *Module) GeneratedHeaderDirs() android.Paths {
|
||||
|
Reference in New Issue
Block a user