misc/cgo/testcshared: use adb instead of ./adb on android

Hopefully fixes build.

Change-Id: If0629b95b923a65e4507073cf7aa44a5e178fc0f
Reviewed-on: https://go-review.googlesource.com/56711
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>

diff --git a/misc/cgo/testcshared/cshared_test.go b/misc/cgo/testcshared/cshared_test.go
index c7317a43eb63e4ee7cc96302f3109ae5eae13283..b8fd4f3fbce9a435e8abd9f21a2a92dc79a36ae8 100644 (file)
--- a/misc/cgo/testcshared/cshared_test.go
+++ b/misc/cgo/testcshared/cshared_test.go
@@ -139,7 +139,7 @@ func adbPush(t *testing.T, filename string) {
        if GOOS != "android" {
                return
        }
-       args := append(cmdToRun("adb"), "push", filename, fmt.Sprintf("%s/%s", androiddir, filename))
+       args := append("adb", "push", filename, fmt.Sprintf("%s/%s", androiddir, filename))
        cmd := exec.Command(args[0], args[1:]...)
        if out, err := cmd.CombinedOutput(); err != nil {
                t.Fatalf("adb command failed: %v\n%s\n", err, out)
@@ -150,7 +150,7 @@ func adbRun(t *testing.T, adbargs ...string) string {
        if GOOS != "android" {
                t.Fatalf("trying to run adb command when operating system is not android.")
        }
-       args := append(cmdToRun("adb"), "shell")
+       args := append("adb", "shell")
        args = append(args, adbargs...)
        cmd := exec.Command(args[0], args[1:]...)
        out, err := cmd.CombinedOutput()