From 115c11232ee87cdc3bcb25e5afebe14391d9164f Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Sun, 14 Feb 2021 18:24:54 +0900 Subject: [PATCH] Revert "cmd/ebitenmobile: Use the better way to go-get dependencies" This reverts commit ad2d3562620f29a617c1f77f20c5420760e9f266. Reason: Installation failed on Windows. Closes #1493 --- cmd/ebitenmobile/gomobile.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/ebitenmobile/gomobile.go b/cmd/ebitenmobile/gomobile.go index 749957be9..9404acfbd 100644 --- a/cmd/ebitenmobile/gomobile.go +++ b/cmd/ebitenmobile/gomobile.go @@ -104,9 +104,11 @@ func prepareGomobileCommands() error { return err } - // To record gomobile and its dependencies to go.sum for Go 1.16 and later, go-get golang.org/x/mobile with `...` (#1487). + // To record gomobile to go.sum for Go 1.16 and later, go-get gomobile instaed of golang.org/x/mobile (#1487). + // This also records gobind as gomobile depends on gobind indirectly. + // Using `...` doesn't work on Windows since mobile/internal/mobileinit cannot be compiled on Windows w/o Cgo (#1493). // Note that `go mod tidy` doesn't work since this removes all the indirect imports. - if err := runGo("get", "golang.org/x/mobile/...@"+gomobileHash); err != nil { + if err := runGo("get", "golang.org/x/mobile/cmd/gomobile@"+gomobileHash); err != nil { return err } if localgm := os.Getenv("EBITENMOBILE_GOMOBILE"); localgm != "" {