commit 601ab89103e438cb957276d34775341eeaa0af08
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 29 00:00:35 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 29 00:00:35 2018 +0000
tree 61124359cc30d816f038471d8c12898643a8b8c3
parent 2497d5f9cef5b46cbaa3509c6d34721998278fda
parent 2e9f9a2220cd8f8e4096e6ac373436d5ba3f644e

Merge "Fix the flaky build breakage for droiddoc target." into pi-dev

cc/compiler.go

diff --git a/cc/compiler.go b/cc/compiler.go
index 8f18758..6154758 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -183,7 +183,7 @@
 }
 
 func (compiler *baseCompiler) Srcs() android.Paths {
-	return compiler.srcs
+	return append(android.Paths{}, compiler.srcs...)
 }
 
 func (compiler *baseCompiler) appendCflags(flags []string) {

genrule/filegroup.go

diff --git a/genrule/filegroup.go b/genrule/filegroup.go
index 9f4aa10..2cff5fe 100644
--- a/genrule/filegroup.go
+++ b/genrule/filegroup.go
@@ -70,7 +70,7 @@
 }
 
 func (fg *fileGroup) Srcs() android.Paths {
-	return fg.srcs
+	return append(android.Paths{}, fg.srcs...)
 }
 
 var androidMkTemplate = template.Must(template.New("filegroup").Parse(`

genrule/genrule.go

diff --git a/genrule/genrule.go b/genrule/genrule.go
index 0cd110c..42be88f 100644
--- a/genrule/genrule.go
+++ b/genrule/genrule.go
@@ -125,7 +125,7 @@
 }
 
 func (g *Module) Srcs() android.Paths {
-	return g.outputFiles
+	return append(android.Paths{}, g.outputFiles...)
 }
 
 func (g *Module) GeneratedHeaderDirs() android.Paths {