Skip to content

Commit cde3d95

Browse files
committed
cmd/gomobile: explicitly disable modules
Gomobile doesn't support modules. Updates golang/go#27234 Change-Id: I426db1600eafd4a9ddc7eb239f5f264756f1ba35 Reviewed-on: https://go-review.googlesource.com/c/mobile/+/167659 Reviewed-by: Brad Fitzpatrick <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
1 parent f2ef6f4 commit cde3d95

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

cmd/gomobile/bind_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ func TestBindIOS(t *testing.T) {
180180
var bindAndroidTmpl = template.Must(template.New("output").Parse(`GOMOBILE={{.GOPATH}}/pkg/gomobile
181181
WORK=$WORK
182182
GOOS=android CGO_ENABLED=1 gobind -lang=go,java -outdir=$WORK{{if .JavaPkg}} -javapkg={{.JavaPkg}}{{end}} golang.org/x/mobile/asset
183-
GOOS=android GOARCH=arm CC=$NDK_PATH/toolchains/llvm/prebuilt/{{.NDKARCH}}/bin/armv7a-linux-androideabi16-clang CXX=$NDK_PATH/toolchains/llvm/prebuilt/{{.NDKARCH}}/bin/armv7a-linux-androideabi16-clang++ CGO_ENABLED=1 GOARM=7 GOPATH=$WORK:$GOPATH go build -x -buildmode=c-shared -o=$WORK/android/src/main/jniLibs/armeabi-v7a/libgojni.so gobind
183+
GOOS=android GOARCH=arm CC=$NDK_PATH/toolchains/llvm/prebuilt/{{.NDKARCH}}/bin/armv7a-linux-androideabi16-clang CXX=$NDK_PATH/toolchains/llvm/prebuilt/{{.NDKARCH}}/bin/armv7a-linux-androideabi16-clang++ CGO_ENABLED=1 GOARM=7 GOPATH=$WORK:$GOPATH GO111MODULE=off go build -x -buildmode=c-shared -o=$WORK/android/src/main/jniLibs/armeabi-v7a/libgojni.so gobind
184184
PWD=$WORK/java javac -d $WORK/javac-output -source 1.7 -target 1.7 -bootclasspath {{.AndroidPlatform}}/android.jar *.java
185185
jar c -C $WORK/javac-output .
186186
`))

cmd/gomobile/build.go

+2
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,8 @@ func goCmd(subcmd string, srcs []string, env []string, args ...string) error {
309309
cmd.Args = append(cmd.Args, args...)
310310
cmd.Args = append(cmd.Args, srcs...)
311311
cmd.Env = append([]string{}, env...)
312+
// gomobile does not support modules yet.
313+
cmd.Env = append(cmd.Env, "GO111MODULE=off")
312314
return runCmd(cmd)
313315
}
314316

cmd/gomobile/build_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func TestAndroidBuild(t *testing.T) {
109109
var androidBuildTmpl = template.Must(template.New("output").Parse(`GOMOBILE={{.GOPATH}}/pkg/gomobile
110110
WORK=$WORK
111111
mkdir -p $WORK/lib/armeabi-v7a
112-
GOOS=android GOARCH=arm CC=$NDK_PATH/toolchains/llvm/prebuilt/{{.NDKARCH}}/bin/armv7a-linux-androideabi16-clang CXX=$NDK_PATH/toolchains/llvm/prebuilt/{{.NDKARCH}}/bin/armv7a-linux-androideabi16-clang++ CGO_ENABLED=1 GOARM=7 go build -tags tag1 -x -buildmode=c-shared -o $WORK/lib/armeabi-v7a/libbasic.so golang.org/x/mobile/example/basic
112+
GOOS=android GOARCH=arm CC=$NDK_PATH/toolchains/llvm/prebuilt/{{.NDKARCH}}/bin/armv7a-linux-androideabi16-clang CXX=$NDK_PATH/toolchains/llvm/prebuilt/{{.NDKARCH}}/bin/armv7a-linux-androideabi16-clang++ CGO_ENABLED=1 GOARM=7 GO111MODULE=off go build -tags tag1 -x -buildmode=c-shared -o $WORK/lib/armeabi-v7a/libbasic.so golang.org/x/mobile/example/basic
113113
`))
114114

115115
func TestParseBuildTargetFlag(t *testing.T) {

cmd/gomobile/init_test.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package main
77
import (
88
"bytes"
99
"os"
10+
"os/exec"
1011
"path/filepath"
1112
"strings"
1213
"testing"
@@ -16,6 +17,9 @@ import (
1617
var gopath string
1718

1819
func TestInit(t *testing.T) {
20+
if _, err := exec.LookPath("diff"); err != nil {
21+
t.Skip("command diff not found, skipping")
22+
}
1923
buf := new(bytes.Buffer)
2024
gopathorig := os.Getenv("GOPATH")
2125
defer func() {
@@ -102,7 +106,7 @@ var initTmpl = template.Must(template.New("output").Parse(`GOMOBILE={{.GOPATH}}/
102106
rm -r -f "$GOMOBILE"
103107
mkdir -p $GOMOBILE
104108
WORK={{.GOPATH}}/pkg/gomobile/work
105-
go install -x golang.org/x/mobile/cmd/gobind
109+
GO111MODULE=off go install -x golang.org/x/mobile/cmd/gobind
106110
cp $OPENAL_PATH/include/AL/al.h $GOMOBILE/include/AL/al.h
107111
mkdir -p $GOMOBILE/include/AL
108112
cp $OPENAL_PATH/include/AL/alc.h $GOMOBILE/include/AL/alc.h

0 commit comments

Comments
 (0)