Skip to content

Commit 68de546

Browse files
committed
cmd/gomobile: fix the test for Go 1.15
This is a remaining task for golang/go#39575. Updates golang/go#39575 Change-Id: I10c021a9349461a7a773d4e93e80601b906741b2 Reviewed-on: https://go-review.googlesource.com/c/mobile/+/243837 Run-TryBot: Dmitri Shuralyov <[email protected]> Reviewed-by: Hyang-Ah Hana Kim <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 1a48f80 commit 68de546

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

cmd/gomobile/bind_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func TestBindIOS(t *testing.T) {
113113
buildN = true
114114
buildX = true
115115
buildO = "Asset.framework"
116-
buildTarget = "ios/arm"
116+
buildTarget = "ios/arm64"
117117

118118
tests := []struct {
119119
prefix string
@@ -195,13 +195,13 @@ var bindIOSTmpl = template.Must(template.New("output").Parse(`GOMOBILE={{.GOPATH
195195
WORK=$WORK
196196
GOOS=darwin CGO_ENABLED=1 gobind -lang=go,objc -outdir=$WORK -tags=ios{{if .Prefix}} -prefix={{.Prefix}}{{end}} golang.org/x/mobile/asset
197197
mkdir -p $WORK/src
198-
PWD=$WORK/src GOARM=7 GOOS=darwin GOARCH=arm CC=iphoneos-clang CXX=iphoneos-clang++ CGO_CFLAGS=-isysroot=iphoneos -miphoneos-version-min=7.0 {{if .BitcodeEnabled}}-fembed-bitcode {{end}}-arch armv7 CGO_CXXFLAGS=-isysroot=iphoneos -miphoneos-version-min=7.0 {{if .BitcodeEnabled}}-fembed-bitcode {{end}}-arch armv7 CGO_LDFLAGS=-isysroot=iphoneos -miphoneos-version-min=7.0 {{if .BitcodeEnabled}}-fembed-bitcode {{end}}-arch armv7 CGO_ENABLED=1 GOPATH=$WORK:$GOPATH go build -tags ios -x -buildmode=c-archive -o $WORK/{{.Output}}-arm.a ./gobind
198+
PWD=$WORK/src GOOS=darwin GOARCH=arm64 CC=iphoneos-clang CXX=iphoneos-clang++ CGO_CFLAGS=-isysroot=iphoneos -miphoneos-version-min=7.0 {{if .BitcodeEnabled}}-fembed-bitcode {{end}}-arch arm64 CGO_CXXFLAGS=-isysroot=iphoneos -miphoneos-version-min=7.0 {{if .BitcodeEnabled}}-fembed-bitcode {{end}}-arch arm64 CGO_LDFLAGS=-isysroot=iphoneos -miphoneos-version-min=7.0 {{if .BitcodeEnabled}}-fembed-bitcode {{end}}-arch arm64 CGO_ENABLED=1 GOPATH=$WORK:$GOPATH go build -tags ios -x -buildmode=c-archive -o $WORK/{{.Output}}-arm64.a ./gobind
199199
rm -r -f "{{.Output}}.framework"
200200
mkdir -p {{.Output}}.framework/Versions/A/Headers
201201
ln -s A {{.Output}}.framework/Versions/Current
202202
ln -s Versions/Current/Headers {{.Output}}.framework/Headers
203203
ln -s Versions/Current/{{.Output}} {{.Output}}.framework/{{.Output}}
204-
xcrun lipo -create -arch armv7 $WORK/{{.Output}}-arm.a -o {{.Output}}.framework/Versions/A/{{.Output}}
204+
xcrun lipo -create -arch arm64 $WORK/{{.Output}}-arm64.a -o {{.Output}}.framework/Versions/A/{{.Output}}
205205
cp $WORK/src/gobind/{{.Prefix}}Asset.objc.h {{.Output}}.framework/Versions/A/Headers/{{.Prefix}}Asset.objc.h
206206
mkdir -p {{.Output}}.framework/Versions/A/Headers
207207
cp $WORK/src/gobind/Universe.objc.h {{.Output}}.framework/Versions/A/Headers/Universe.objc.h

0 commit comments

Comments
 (0)