diff options
| author | Elias Naur <mail@eliasnaur.com> | 2019-02-24 15:18:02 +0100 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2019-02-26 18:00:48 +0000 |
| commit | e3d99a3f8608e308eedc201b83eeb2f0e0d9dc81 (patch) | |
| tree | 17530050f0fcf0b10a80ec80199ffea97cde4404 /src/cmd/dist | |
| parent | 3ef7e3d44f3dfaceab83b779c8bcd1cebe834de2 (diff) | |
| download | go-e3d99a3f8608e308eedc201b83eeb2f0e0d9dc81.tar.xz | |
misc/android,cmd/dist: move $GOROOT copying to the exec wrapper
To run the standard library tests on Android, the androidtest.bash
script copies GOROOT to the device. Move that logic to the android
exec wrapper, thereby making androidtest.bash obsolete.
Apart from making Android less special, the sharded builder
infrastructure should now be able to run (emulated) Android builders
and trybots without special treatment.
Updates #23824
Change-Id: I41591fea9a15b38c6dcf84046ea57f1e9165eaa5
Reviewed-on: https://go-review.googlesource.com/c/163619
Run-TryBot: Elias Naur <mail@eliasnaur.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/cmd/dist')
| -rw-r--r-- | src/cmd/dist/build.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go index 6388e3e863..43e1fe66f3 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -1366,7 +1366,11 @@ func cmdbootstrap() { // Remove go_bootstrap now that we're done. xremove(pathf("%s/go_bootstrap", tooldir)) - // Build the exec wrapper if necessary. + if goos == "android" { + // Make sure the exec wrapper will sync a fresh $GOROOT to the device. + xremove(pathf("%s/go_android_exec-adb-sync-status", os.TempDir())) + } + if wrapperPath := wrapperPathFor(goos, goarch); wrapperPath != "" { oldcc := os.Getenv("CC") os.Setenv("GOOS", gohostos) |