[dev.cc] all: merge default (8d42099cdc23) into dev.ccdev.cc

TBR=austin
CC=golang-codereviews
https://codereview.appspot.com/178700044

2 files changed, 6 insertions, 3 deletions

diff --git a/src/go/build/build.go b/src/go/build/build.go
index ed79df293..ab2976756 100644
--- a/src/go/build/build.go
+++ b/src/go/build/build.go
@@ -1310,11 +1310,13 @@ func (ctxt *Context) goodOSArchFile(name string, allTags map[string]bool) bool {
 	// auto-tagging to apply only to files with a non-empty prefix, so
 	// "foo_linux.go" is tagged but "linux.go" is not. This allows new operating
 	// sytems, such as android, to arrive without breaking existing code with
-	// innocuous source code in "android.go". The easiest fix: files without
-	// underscores are always included.
-	if !strings.ContainsRune(name, '_') {
+	// innocuous source code in "android.go". The easiest fix: cut everything
+	// in the name before the initial _.
+	i := strings.Index(name, "_")
+	if i < 0 {
 		return true
 	}
+	name = name[i:] // ignore everything before first _
 
 	l := strings.Split(name, "_")
 	if n := len(l); n > 0 && l[n-1] == "test" {
diff --git a/src/go/build/build_test.go b/src/go/build/build_test.go
index 43d09cbd1..a40def0fa 100644
--- a/src/go/build/build_test.go
+++ b/src/go/build/build_test.go
@@ -189,6 +189,7 @@ var matchFileTests = []struct {
 	{ctxtAndroid, "foo_plan9.go", "", false},
 	{ctxtAndroid, "android.go", "", true},
 	{ctxtAndroid, "plan9.go", "", true},
+	{ctxtAndroid, "plan9_test.go", "", true},
 	{ctxtAndroid, "arm.s", "", true},
 	{ctxtAndroid, "amd64.s", "", true},
 }