From 74e3be8f38ffd376996946ca7d6736b1e0036cfb Mon Sep 17 00:00:00 2001 From: David Chase Date: Mon, 20 Mar 2017 14:24:00 -0400 Subject: [PATCH] cmd/dist: ensure android-implies-linux for file names in dist This is one hurdle to building Go on Android; the runtime does not build properly because *_linux.go files are excluded from the "Building go_bootstrap" step when GOOS=android. There are other hurdles; this is the first one. Change-Id: I766e4bbf6ffc0d273888913f2516cf3e995a1786 Reviewed-on: https://go-review.googlesource.com/38308 Run-TryBot: David Chase TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- src/cmd/dist/build.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go index 66e3f0fc07..76e42a4b6a 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -791,7 +791,7 @@ func shouldbuild(file, dir string) bool { name := filepath.Base(file) excluded := func(list []string, ok string) bool { for _, x := range list { - if x == ok { + if x == ok || ok == "android" && x == "linux" { continue } i := strings.Index(name, x) -- 2.50.0