11 files changed, 30 insertions, 37 deletions
diff --git a/go/android/adb_shamu b/go/android/adb_marlin
index 1c53ecc1..476e6603 100755
--- a/go/android/adb_shamu
+++ b/go/android/adb_marlin
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# This wrapper runs adb with the serial number of the shamu device.
+# This wrapper runs adb with the serial number of the marlin device.
 # Replace XXXXXXXX with the actual serial number of the device.
 # This is just an example. Create one such wrapper for each Android
 # device used for running Go tests.
diff --git a/go/android/adb_marlin32 b/go/android/adb_marlin32
new file mode 120000
index 00000000..9cdd321b
--- /dev/null
+++ b/go/android/adb_marlin32
@@ -0,0 +1 @@
+adb_marlin
+\ No newline at end of file
diff --git a/go/android/adb_volantis b/go/android/adb_volantis
deleted file mode 100755
index 4712eec2..00000000
--- a/go/android/adb_volantis
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# This wrapper runs adb with the serial number of the volantis device.
-# Replace YYYYYYYY with the actual serial number of the device.
-# This is just an example. Create one such wrapper for each Android
-# device used for running Go tests.
-
-exec adb -s YYYYYYYY "$@"
diff --git a/go/android/build_go b/go/android/build_go
index 65b7ec2b..ecb3bee0 100755
--- a/go/android/build_go
+++ b/go/android/build_go
@@ -15,12 +15,12 @@ fi
 
 # Build the Go toolchain for arm devices.
 GOOS="android" GOARCH="arm" CGO_ENABLED="1" \
-	CC_FOR_TARGET="arm-linux-androideabi-gcc" \
-	CXX_FOR_TARGET="arm-linux-androideabi-g++" \
+	CC_FOR_TARGET="arm-linux-androideabi-clang" \
+	CXX_FOR_TARGET="arm-linux-androideabi-clang++" \
 	./make.bash --no-clean
 
 # Build the Go toolchain for arm64 devices.
 GOOS="android" GOARCH="arm64" CGO_ENABLED="1" \
-	CC_FOR_TARGET="aarch64-linux-android-gcc" \
-	CXX_FOR_TARGET="aarch64-linux-android-g++" \
+	CC_FOR_TARGET="aarch64-linux-android-clang" \
+	CXX_FOR_TARGET="aarch64-linux-android-clang++" \
 	./make.bash --no-clean
diff --git a/go/android/go_volantis b/go/android/go_marlin
index bfeab196..bfb564f9 100755
--- a/go/android/go_volantis
+++ b/go/android/go_marlin
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-# Invoke the Go cross compiler for volantis.
+# Invoke the Go cross compiler for marlin.
 # Uses ../go_target to add PIE flags.
 #
 # This is just an example for an arm64 device.
 
 GOOS="android" GOARCH="arm64" CGO_ENABLED="1" \
-	CC="aarch64-linux-android-gcc" \
-	CXX="aarch64-linux-android-g++" \
+	CC="aarch64-linux-android-clang" \
+	CXX="aarch64-linux-android-clang++" \
 	exec go_target "$@"
diff --git a/go/android/go_shamu b/go/android/go_marlin32
index 7e1ffbea..d02dadc9 100755
--- a/go/android/go_shamu
+++ b/go/android/go_marlin32
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-# Invoke the Go cross compiler for shamu.
+# Invoke the Go cross compiler for marlin32.
 # Uses ../go_target to add PIE flags.
 #
 # This is just an example for an arm device.
 
 GOOS="android" GOARCH="arm" CGO_ENABLED="1" \
-	CC="arm-linux-androideabi-gcc" \
-	CXX="arm-linux-androideabi-g++" \
+	CC="arm-linux-androideabi-clang" \
+	CXX="arm-linux-androideabi-clang++" \
 	exec go_target "$@"
diff --git a/go/android/go_marlin32_exec b/go/android/go_marlin32_exec
new file mode 100755
index 00000000..ed3fdf42
--- /dev/null
+++ b/go/android/go_marlin32_exec
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Copy and remotely execute a binary on the marlin32 device.
+#
+# For this to work, the corresponding adb_marlin32 wrapper
+# must exist to tell adb the serial number of the device.
+
+GOOS="android" GOARCH="arm" exec go_target_exec marlin32 "$@"
diff --git a/go/android/go_marlin_exec b/go/android/go_marlin_exec
new file mode 100755
index 00000000..9f4c06d4
--- /dev/null
+++ b/go/android/go_marlin_exec
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Copy and remotely execute a binary on the marlin device.
+#
+# For this to work, the corresponding adb_marlin wrapper
+# must exist to tell adb the serial number of the device.
+
+GOOS="android" GOARCH="arm64" exec go_target_exec marlin "$@"
diff --git a/go/android/go_shamu_exec b/go/android/go_shamu_exec
deleted file mode 100755
index 2c169026..00000000
--- a/go/android/go_shamu_exec
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Copy and remotely execute a binary on the shamu device.
-#
-# For this to work, the corresponding adb_shamu wrapper
-# must exist to tell adb the serial number of the device.
-
-GOOS="android" GOARCH="arm" exec go_target_exec shamu "$@"
diff --git a/go/android/go_volantis_exec b/go/android/go_volantis_exec
deleted file mode 100755
index 86cb2cfb..00000000
--- a/go/android/go_volantis_exec
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Copy and remotely execute a binary on the volantis device.
-#
-# For this to work, the corresponding adb_volantis wrapper
-# must exist to tell adb the serial number of the device.
-
-GOOS="android" GOARCH="arm64" exec go_target_exec volantis "$@"
diff --git a/go/android/target_cp b/go/android/target_cp
index 8a311534..f6cd5cbe 100755
--- a/go/android/target_cp
+++ b/go/android/target_cp
@@ -22,7 +22,7 @@ fi
 
 if [[ -d ${src} ]]
 then
-	adb_${target} push ${src} ${dest}/${src##*/} 2>/dev/null
+	adb_${target} push ${src} ${dest}/${src##*/} >/dev/null
 else
-	adb_${target} push ${src} ${dest} 2>/dev/null
+	adb_${target} push ${src} ${dest} >/dev/null
 fi