misc/android: rename to misc/go_android_exec, make go build work

This makes it reasonable to "go build" from this directory by changing
the name of the directory to a more reasonable name for the binary and
dropping the unnecessary "ignore" build tag. The resulting binary
doesn't *quite* have the necessary name for a Go exec wrapper because
that needs to have the form, go_android_$GOARCH_exec, but it's close.

Change-Id: I036cb1af9c034462a952b176a794526fa3ffd1ab
Reviewed-on: https://go-review.googlesource.com/c/go/+/490495
Reviewed-by: Bryan Mills <bcmills@google.com>
Run-TryBot: Austin Clements <austin@google.com>
Auto-Submit: Austin Clements <austin@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>

diff --git a/misc/android/README b/misc/go_android_exec/README
similarity index 100%
rename from misc/android/README
rename to misc/go_android_exec/README

diff --git a/misc/android/go_android_exec.go b/misc/go_android_exec/main.go
similarity index 99%
rename from misc/android/go_android_exec.go
rename to misc/go_android_exec/main.go
index 445ac284be43801495e0ae55e85e9439badb4a63..639b7446109f37859f95b6624134b1105b60fad2 100644 (file)
--- a/misc/android/go_android_exec.go
+++ b/misc/go_android_exec/main.go
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build ignore
-// +build ignore
-
 // This program can be used as go_android_GOARCH_exec by the Go tool.
 // It executes binaries on an android device using adb.
 package main

diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index 1d329ab9f14828a9bf3b329e093ca2e8e9158af4..11fb5f0753efd73f86d6f54dccc31f51208fc780 100644 (file)
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -1661,7 +1661,7 @@ func wrapperPathFor(goos, goarch string) string {
        switch {
        case goos == "android":
                if gohostos != "android" {
-                       return pathf("%s/misc/android/go_android_exec.go", goroot)
+                       return pathf("%s/misc/go_android_exec/main.go", goroot)
                }
        case goos == "ios":
                if gohostos != "ios" {