diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-03-29 00:00:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-29 00:00:35 +0000 |
| commit | 601ab89103e438cb957276d34775341eeaa0af08 (patch) | |
| tree | 61124359cc30d816f038471d8c12898643a8b8c3 | |
| parent | 2497d5f9cef5b46cbaa3509c6d34721998278fda (diff) | |
| parent | 2e9f9a2220cd8f8e4096e6ac373436d5ba3f644e (diff) | |
| download | build_soong-601ab89103e438cb957276d34775341eeaa0af08.tar.gz build_soong-601ab89103e438cb957276d34775341eeaa0af08.tar.bz2 build_soong-601ab89103e438cb957276d34775341eeaa0af08.zip | |
Merge "Fix the flaky build breakage for droiddoc target." into pi-dev
| -rw-r--r-- | cc/compiler.go | 2 | ||||
| -rw-r--r-- | genrule/filegroup.go | 2 | ||||
| -rw-r--r-- | genrule/genrule.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cc/compiler.go b/cc/compiler.go index 8f187583..6154758f 100644 --- a/cc/compiler.go +++ b/cc/compiler.go @@ -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) { diff --git a/genrule/filegroup.go b/genrule/filegroup.go index 9f4aa10d..2cff5fee 100644 --- a/genrule/filegroup.go +++ b/genrule/filegroup.go @@ -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(` diff --git a/genrule/genrule.go b/genrule/genrule.go index 0cd110ce..42be88fe 100644 --- a/genrule/genrule.go +++ b/genrule/genrule.go @@ -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 { |