diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index 285627288a..966603ec08 100644
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -361,7 +361,7 @@ func buildModeInit() {
 		ldBuildmode = "c-shared"
 	case "default":
 		switch platform {
-		case "android/arm":
+		case "android/arm", "android/amd64":
 			codegenArg = "-shared"
 			ldBuildmode = "pie"
 		default:
@@ -375,7 +375,7 @@ func buildModeInit() {
 			fatalf("-buildmode=pie not supported by gccgo")
 		} else {
 			switch platform {
-			case "android/arm", "linux/amd64":
+			case "android/arm", "linux/amd64", "android/amd64":
 				codegenArg = "-shared"
 			default:
 				fatalf("-buildmode=pie not supported on %s\n", platform)