commit 42f43d910ba75e5ede550b86c9e6ce235a3a4b93
author Colin Cross <ccross@android.com> Mon Apr 18 12:31:06 2016 -0700
committer Colin Cross <ccross@android.com> Mon Apr 18 12:31:06 2016 -0700
tree f833d8fb8a6b2402902911d5b11b50a11f7af9c3
parent 0ffa5a0b4ab1833967755a5acfdc23fcf61fe15e

Fix GOROOT_FINAL

GOROOT_FINAL should be prebuilts/go/linux-x86, not prebuilts/go/linux.

Change-Id: Id4a22592c5a20313f7b9e252db8476dc82a50a9c

build-prebuilts.sh

diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index a42cb95..26b336b 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -74,7 +74,7 @@
     (
         cd ${GO_OUT}/src
         export GOROOT_BOOTSTRAP=${TOP}/prebuilts/go/${OS}-x86
-        export GOROOT_FINAL=./prebuilts/go/${OS}
+        export GOROOT_FINAL=./prebuilts/go/${OS}-x86
         export GO_TEST_TIMEOUT_SCALE=100
         ./make.bash
         GOROOT=$(pwd)/.. ../bin/go install -race std