net/http/cgi: propagate LD_LIBRARY_PATH on Android

Android is functionally a variant on linux, and should be
treated as such.

Change-Id: I08056f00bf98c1935c8cc3c859a6c72fe1a48efa
Reviewed-on: https://go-review.googlesource.com/c/go/+/489395
Run-TryBot: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>

diff --git a/src/net/http/cgi/host.go b/src/net/http/cgi/host.go
index 349dda15acfb30c70079e3146879afd547b5b9ee..073952a7bd40f15bb75cba793c26537f55391923 100644 (file)
--- a/src/net/http/cgi/host.go
+++ b/src/net/http/cgi/host.go
@@ -39,7 +39,7 @@ var osDefaultInheritEnv = func() []string {
        switch runtime.GOOS {
        case "darwin", "ios":
                return []string{"DYLD_LIBRARY_PATH"}
-       case "linux", "freebsd", "netbsd", "openbsd":
+       case "android", "linux", "freebsd", "netbsd", "openbsd":
                return []string{"LD_LIBRARY_PATH"}
        case "hpux":
                return []string{"LD_LIBRARY_PATH", "SHLIB_PATH"}