status-im/mobile
2
0
Fork 0
mirror of synced 2025-02-22 14:28:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/gomobile: set *build.Context GOOS

Browse Source 
This lets `gomobile build` work on a package that contains files all
protected as '// +build android'.

Change-Id: I22915aecda8674597cfe18e1f75d30e6bfc4aab7
Reviewed-on: https://go-review.googlesource.com/12640
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
This commit is contained in:
David Crawshaw 2015-07-24 07:04:40 -04:00
parent 58652d815d
commit ecc4253790
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/gomobile/bind.go
View File

@ -70,6 +70,16 @@ func runBind(cmd *command) error {
args := cmd.flag.Args()
ctx.GOARCH = "arm"
switch buildTarget {
case "android":
ctx.GOOS = "android"
case "ios":
ctx.GOOS = "darwin"
default:
return fmt.Errorf(`unknown -target, %q.`, buildTarget)
}
var pkg *build.Package
switch len(args) {
case 0:
@ -89,8 +99,6 @@ func runBind(cmd *command) error {
return goAndroidBind(pkg)
case "ios":
return goIOSBind(pkg)
default:
return fmt.Errorf(`unknown -target, %q.`, buildTarget)
}
}

12
cmd/gomobile/build.go
View File

@ -63,6 +63,16 @@ func runBuild(cmd *command) (err error) {
args := cmd.flag.Args()
ctx.GOARCH = "arm"
switch buildTarget {
case "android":
ctx.GOOS = "android"
case "ios":
ctx.GOOS = "darwin"
default:
return fmt.Errorf(`unknown -target, %q.`, buildTarget)
}
switch len(args) {
case 0:
pkg, err = ctx.ImportDir(cwd, build.ImportComment)
@ -101,8 +111,6 @@ func runBuild(cmd *command) (err error) {
if err := goIOSBuild(pkg); err != nil {
return err
}
default:
return fmt.Errorf(`unknown -target, %q.`, buildTarget)
}
// TODO(crawshaw): This is an incomplete package scan.