From: Elias Naur <mail@eliasnaur.com>
Date: Tue, 19 Mar 2019 05:59:51 +0000 (+0100)
Subject: misc/android: pass on GOPROXY to device environment
X-Git-Tag: go1.13beta1~952
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=409c97c5f017037e3a47aff64e3e65ce22eee5ba;p=gostls13.git

misc/android: pass on GOPROXY to device environment

Android devices don't have git available, so many go tool commands
that fetch dependencies fail. Builders already have a GOPROXY
available, so pass that along to the device environment.

Updates #30885

Change-Id: Id0d2338932f0cd7de4d95d9e0ca9b79d29336ffe
Reviewed-on: https://go-review.googlesource.com/c/go/+/168118
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/misc/android/go_android_exec.go b/misc/android/go_android_exec.go
index 2be0b07502..e20b99a4e8 100644
--- a/misc/android/go_android_exec.go
+++ b/misc/android/go_android_exec.go
@@ -158,6 +158,7 @@ func runMain() (int, error) {
 		`; export GOROOT="` + deviceGoroot + `"` +
 		`; export GOPATH="` + deviceGopath + `"` +
 		`; export CGO_ENABLED=0` +
+		`; export GOPROXY=` + os.Getenv("GOPROXY") +
 		`; export GOCACHE="` + deviceRoot + `/gocache"` +
 		`; export PATH=$PATH:"` + deviceGoroot + `/bin"` +
 		`; cd "` + deviceCwd + `"` +