From: David Chase <drchase@google.com>
Date: Mon, 20 Mar 2017 18:24:00 +0000 (-0400)
Subject: cmd/dist: ensure android-implies-linux for file names in dist
X-Git-Tag: go1.9beta1~172
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=74e3be8f38ffd376996946ca7d6736b1e0036cfb;p=gostls13.git

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 <drchase@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

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)