status-im
/
mobile
mirror of
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/gobind: fix init_test. 

$GOROOT instead of $HOME/go.

Change-Id: I6dd22057b58b0ad93ecbc6900a2fec09c41fe019
Reviewed-on: https://go-review.googlesource.com/6160
Reviewed-by: David Crawshaw <crawshaw@golang.org>
This commit is contained in:
Hyang-Ah (Hana) Kim 2015-02-26 16:28:36 -05:00 committed by Hyang-Ah Hana Kim
parent cd61880423
commit d6c8d03959
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/gomobile/build.go
View File

@ -252,6 +252,9 @@ func printcmd(format string, args ...interface{}) {
if ndkccpath != "" {
cmd = strings.Replace(cmd, ndkccpath, "$NDKCCPATH", -1)
}
if goroot := goEnv("GOROOT"); goroot != "" {
cmd = strings.Replace(cmd, goroot, "$GOROOT", -1)
}
if env := os.Getenv("HOME"); env != "" {
cmd = strings.Replace(cmd, env, "$HOME", -1)
}

12
cmd/gomobile/init_test.go
View File

@ -66,10 +66,10 @@ rm -r -f "$NDKCCPATH"
mkdir -p $NDKCCPATH
WORK=GOPATH1/pkg/gomobile/android-{{.NDK}}/work
mkdir -p $WORK/go/pkg
cp -a $HOME/go/include $WORK/go/include
cp -a $HOME/go/lib $WORK/go/lib
cp -a $HOME/go/src $WORK/go/src
ln -s $HOME/go/.git $WORK/go/.git
cp -a $GOROOT/include $WORK/go/include
cp -a $GOROOT/lib $WORK/go/lib
cp -a $GOROOT/src $WORK/go/src
ln -s $GOROOT/.git $WORK/go/.git
curl -o$WORK/gomobile-{{.NDK}}-{{.GOOS}}-{{.NDKARCH}}.tar.gz https://dl.google.com/go/mobile/gomobile-{{.NDK}}-{{.GOOS}}-{{.NDKARCH}}.tar.gz
tar xfz gomobile-{{.NDK}}-{{.GOOS}}-{{.NDKARCH}}.tar.gz
mkdir -p $NDKCCPATH/arm/sysroot/usr
@ -92,8 +92,8 @@ mv $WORK/go/pkg/tool/{{.GOOS}}_{{.GOARCH}}/nm $NDKCCPATH/arm/bin/nm
mv $WORK/go/pkg/tool/{{.GOOS}}_{{.GOARCH}}/pack $NDKCCPATH/arm/bin/pack
mv $WORK/go/pkg/tool/{{.GOOS}}_{{.GOARCH}}/link $NDKCCPATH/arm/bin/link
go build -o $NDKCCPATH/arm/bin/toolexec $WORK/toolexec.go
rm -r -f "$HOME/go/pkg/android_arm"
mv $WORK/go/pkg/android_arm $HOME/go/pkg/android_arm
rm -r -f "$GOROOT/pkg/android_arm"
mv $WORK/go/pkg/android_arm $GOROOT/pkg/android_arm
go version > GOPATH1/pkg/gomobile/version
rm -r -f "$WORK"
`))