Merge remote-tracking branch 'aosp/upstream' am: 18efe1bc65

am: 47653a7b0b

Change-Id: If34913f1303370cebbd4c7c43744edc48f99bedd
This commit is contained in:
Colin Cross 2019-09-06 19:52:31 -07:00 committed by android-build-merger
commit 24a6418475
2 changed files with 2 additions and 1 deletions

View file

@ -4,6 +4,7 @@ go:
- "1.10"
- "1.11"
- "1.12"
- "1.13"
cache:
directories:

View file

@ -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