Commit e65db59c authored by Rahul Chaudhry's avatar Rahul Chaudhry Committed by Ian Lance Taylor

cmd/go: allow buildmode=c-shared for android/arm64.

Also, enable test misc/cgo/testcshared for android/arm64.
c/17245 and c/17246 provide the missing pieces for making
this test work.

"androidtest.bash" now passes on a Nexus 9 (volantis)
device running Android build "LMY48T".

Change-Id: Icb9fd2d17d97e0f04cb18d0cd91640c80fbd3fb4
Reviewed-on: https://go-review.googlesource.com/17333Reviewed-by: 's avatarIan Lance Taylor <iant@golang.org>
parent c091d4cd
...@@ -375,8 +375,8 @@ func (t *tester) registerTests() { ...@@ -375,8 +375,8 @@ func (t *tester) registerTests() {
break break
} }
// Darwin ARM64 fails with internal linking. // Darwin/Android ARM64 fails with internal linking.
if t.goos == "darwin" && t.goarch == "arm64" { if (t.goos == "darwin" || t.goos == "android") && t.goarch == "arm64" {
break break
} }
...@@ -618,7 +618,7 @@ func (t *tester) supportedBuildmode(mode string) bool { ...@@ -618,7 +618,7 @@ func (t *tester) supportedBuildmode(mode string) bool {
switch pair { switch pair {
case "linux-386", "linux-amd64", "linux-arm", "linux-arm64", case "linux-386", "linux-amd64", "linux-arm", "linux-arm64",
"darwin-amd64", "darwin-amd64",
"android-arm", "android-386": "android-arm", "android-arm64", "android-386":
return true return true
} }
return false return false
......
...@@ -351,7 +351,7 @@ func buildModeInit() { ...@@ -351,7 +351,7 @@ func buildModeInit() {
} else { } else {
switch platform { switch platform {
case "linux/amd64", "linux/arm", "linux/arm64", "linux/386", case "linux/amd64", "linux/arm", "linux/arm64", "linux/386",
"android/amd64", "android/arm", "android/386": "android/amd64", "android/arm", "android/arm64", "android/386":
codegenArg = "-shared" codegenArg = "-shared"
case "darwin/amd64": case "darwin/amd64":
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment