From: David Crawshaw <david.crawshaw@zentus.com>
Date: Tue, 8 Jul 2014 17:42:14 +0000 (-0400)
Subject: net: no AI_ALL on android
X-Git-Tag: go1.4beta1~1155
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9416fb8c81e25c0900d06f3f04a7508671ad4c09;p=gostls13.git

net: no AI_ALL on android

LGTM=bradfitz
R=golang-codereviews, bradfitz
CC=golang-codereviews
https://golang.org/cl/112800043
---

diff --git a/src/pkg/net/cgo_android.go b/src/pkg/net/cgo_android.go
new file mode 100644
index 0000000000..3819ce56a4
--- /dev/null
+++ b/src/pkg/net/cgo_android.go
@@ -0,0 +1,14 @@
+// Copyright 2014 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build cgo,!netgo
+
+package net
+
+//#include <netdb.h>
+import "C"
+
+func cgoAddrInfoFlags() C.int {
+	return C.AI_CANONNAME
+}
diff --git a/src/pkg/net/cgo_linux.go b/src/pkg/net/cgo_linux.go
index 693aef03d2..4ef2d0cd12 100644
--- a/src/pkg/net/cgo_linux.go
+++ b/src/pkg/net/cgo_linux.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build cgo,!netgo
+// +build !android,cgo,!netgo
 
 package net