From ad87a67cdf24c2ac7bfb0958c506e148e7390d0c Mon Sep 17 00:00:00 2001
From: Elias Naur <elias.naur@gmail.com>
Date: Tue, 6 Mar 2018 16:11:59 +0100
Subject: cmd/dist: default to GOARM=7 on android

Auto-detecting GOARM on Android makes as little sense as for nacl/arm
and darwin/arm.

Also update androidtest.sh to not require GOARM set.

Change-Id: Id409ce1573d3c668d00fa4b7e3562ad7ece6fef5
Reviewed-on: https://go-review.googlesource.com/98875
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
Run-TryBot: Elias Naur <elias.naur@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---
 src/androidtest.bash | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/androidtest.bash')

diff --git a/src/androidtest.bash b/src/androidtest.bash
index a790f95920..773509f547 100755
--- a/src/androidtest.bash
+++ b/src/androidtest.bash
@@ -23,10 +23,7 @@ if [ "$GOOS" != "android" ]; then
 	exit 1
 fi
 
-if [ -z $GOARM ]; then
-	export GOARM=7
-fi
-if [ "$GOARM" != "7" ]; then
+if [ -n "$GOARM" ] && [ "$GOARM" != "7" ]; then
 	echo "android only supports GOARM=7, got GOARM=$GOARM" 1>&2
 	exit 1
 fi
-- 
cgit v1.3