diff options
| author | David Crawshaw <david.crawshaw@zentus.com> | 2014-07-01 17:21:50 -0400 |
|---|---|---|
| committer | David Crawshaw <david.crawshaw@zentus.com> | 2014-07-01 17:21:50 -0400 |
| commit | 94d7afd4f44377cfae7228912838d872a0320f80 (patch) | |
| tree | 3294583c73329a1ce13bd6f9a3ecfd2a21623bd8 /src/cmd/dist | |
| parent | 5eaf85b5c544abce362326270a8af5d4f6245b55 (diff) | |
| download | go-94d7afd4f44377cfae7228912838d872a0320f80.tar.gz | |
all: add GOOS=android
As android and linux have significant overlap, and
because build tags are a poor way to represent an
OS target, this CL introduces an exception into
go/build: linux is treated as a synonym for android
when matching files.
http://golang.org/s/go14android
https://groups.google.com/forum/#!topic/golang-dev/P1ATVp1mun0
LGTM=rsc, minux
R=golang-codereviews, mikioh.mikioh, dave, aram, minux, gobot, rsc, aram.h, elias.naur, iant
CC=golang-codereviews, rsc
https://codereview.appspot.com/105270043
Diffstat (limited to 'src/cmd/dist')
| -rw-r--r-- | src/cmd/dist/build.c | 3 | ||||
| -rw-r--r-- | src/cmd/dist/buildruntime.c | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c index 6884e0aae..a99436735 100644 --- a/src/cmd/dist/build.c +++ b/src/cmd/dist/build.c @@ -56,6 +56,7 @@ static char *okgoos[] = { "darwin", "dragonfly", "linux", + "android", "solaris", "freebsd", "nacl", @@ -1149,7 +1150,7 @@ matchfield(char *f) p = xstrrchr(f, ','); if(p == nil) - return streq(f, goos) || streq(f, goarch) || streq(f, "cmd_go_bootstrap") || streq(f, "go1.1"); + return streq(f, goos) || streq(f, goarch) || streq(f, "cmd_go_bootstrap") || streq(f, "go1.1") || (streq(goos, "android") && streq(f, "linux")); *p = 0; res = matchfield(f) && matchfield(p+1); *p = ','; diff --git a/src/cmd/dist/buildruntime.c b/src/cmd/dist/buildruntime.c index 008554d54..b36454f80 100644 --- a/src/cmd/dist/buildruntime.c +++ b/src/cmd/dist/buildruntime.c @@ -108,10 +108,14 @@ mkzgoos(char *dir, char *file) binit(&b); binit(&out); + + bwritestr(&out, "// auto generated by go tool dist\n\n"); + + if (streq(goos, "linux")) { + bwritestr(&out, "// +build !android\n\n"); + } bwritestr(&out, bprintf(&b, - "// auto generated by go tool dist\n" - "\n" "package runtime\n" "\n" "const theGoos = `%s`\n", goos)); |