targets: Use OS=linux when GOOS=android

This avoids the issue of "android" not having any registered configurations
or syscalls / ioctls / etc, when built with GOOS=android.

This occurs when building in Google3, since --config=android_arm64 selects
the Android toolchain.

2 files changed, 8 insertions, 1 deletions

diff --git a/prog/target.go b/prog/target.go
index 631b756e8..bff59ea4f 100644
--- a/prog/target.go
+++ b/prog/target.go
@@ -72,6 +72,9 @@ func RegisterTarget(target *Target, initArch func(target *Target)) {
 }
 
 func GetTarget(OS, arch string) (*Target, error) {
+	if OS == "android" {
+		OS = "linux"
+	}
 	key := OS + "/" + arch
 	target := targets[key]
 	if target == nil {
diff --git a/sys/targets/targets.go b/sys/targets/targets.go
index 98a2fa9d0..24fcd5392 100644
--- a/sys/targets/targets.go
+++ b/sys/targets/targets.go
@@ -302,8 +302,12 @@ func init() {
 			initTarget(target, OS, arch)
 		}
 	}
+	goos := runtime.GOOS
+	if goos == "android" {
+		goos = "linux"
+	}
 	for _, target := range List["test"] {
-		target.CCompiler = List[runtime.GOOS][runtime.GOARCH].CCompiler
+		target.CCompiler = List[goos][runtime.GOARCH].CCompiler
 	}
 }