aboutsummaryrefslogtreecommitdiff
path: root/misc/android
diff options
context:
space:
mode:
authorElias Naur <mail@eliasnaur.com>2019-03-19 06:59:51 +0100
committerElias Naur <mail@eliasnaur.com>2019-03-21 16:15:47 +0000
commit409c97c5f017037e3a47aff64e3e65ce22eee5ba (patch)
tree7dd46e6c3fb5bdb31c321877563a396b2fd3f5f9 /misc/android
parent6249ea2f39958764b88ab1b03cd55cf99dae6bbd (diff)
downloadgo-409c97c5f017037e3a47aff64e3e65ce22eee5ba.tar.gz
go-409c97c5f017037e3a47aff64e3e65ce22eee5ba.zip
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>
Diffstat (limited to 'misc/android')
-rw-r--r--misc/android/go_android_exec.go1
1 files changed, 1 insertions, 0 deletions
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 + `"` +