Merge remote-tracking branch 'aosp/upstream'
* aosp/upstream: Fix compiling binaries with go 1.13 Test: treehugger Change-Id: Ib600e4a950ed5a0c163946a023f70a611eaad696
This commit is contained in:
commit
18efe1bc65
2 changed files with 2 additions and 1 deletions
|
@ -4,6 +4,7 @@ go:
|
|||
- "1.10"
|
||||
- "1.11"
|
||||
- "1.12"
|
||||
- "1.13"
|
||||
|
||||
cache:
|
||||
directories:
|
||||
|
|
|
@ -437,7 +437,7 @@ func (g *goBinary) GenerateBuildActions(ctx blueprint.ModuleContext) {
|
|||
name, srcs, genSrcs, testSrcs)
|
||||
}
|
||||
|
||||
buildGoPackage(ctx, objDir, name, archiveFile, srcs, genSrcs)
|
||||
buildGoPackage(ctx, objDir, "main", archiveFile, srcs, genSrcs)
|
||||
|
||||
var linkDeps []string
|
||||
var libDirFlags []string
|
||||
|
|
Loading…
Reference in a new issue