Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cmd/gomobile: add support for Apple TV and XROS #102

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cmd/gomobile: add support for Apple TV and XROS #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/gomobile/bind_iosapp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ func frameworkLayoutForTarget(t targetInfo, title string) (*frameworkLayout, err
filepath.Join("Versions/Current", title): title,
},
}, nil
case "ios", "iossimulator":
case "ios", "iossimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator":
return &frameworkLayout{
headerPath: "Headers",
binaryPath: ".",
Expand Down
36 changes: 21 additions & 15 deletions cmd/gomobile/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,21 +233,24 @@ func printcmd(format string, args ...interface{}) {

// "Build flags", used by multiple commands.
var (
buildA bool // -a
buildI bool // -i
buildN bool // -n
buildV bool // -v
buildX bool // -x
buildO string // -o
buildGcflags string // -gcflags
buildLdflags string // -ldflags
buildTarget string // -target
buildTrimpath bool // -trimpath
buildWork bool // -work
buildBundleID string // -bundleid
buildIOSVersion string // -iosversion
buildAndroidAPI int // -androidapi
buildTags stringsFlag // -tags
buildA bool // -a
buildI bool // -i
buildN bool // -n
buildV bool // -v
buildX bool // -x
buildO string // -o
buildGcflags string // -gcflags
buildLdflags string // -ldflags
buildTarget string // -target
buildTrimpath bool // -trimpath
buildWork bool // -work
buildBundleID string // -bundleid
buildIOSVersion string // -iosversion
buildTVOSVersion string // -tvosversion
buildXROSVersion string // -xrosversion
buildMacOSVersion string // -macosversion
buildAndroidAPI int // -androidapi
buildTags stringsFlag // -tags
)

func addBuildFlags(cmd *command) {
Expand All @@ -257,6 +260,9 @@ func addBuildFlags(cmd *command) {
cmd.flag.StringVar(&buildTarget, "target", "android", "")
cmd.flag.StringVar(&buildBundleID, "bundleid", "", "")
cmd.flag.StringVar(&buildIOSVersion, "iosversion", "13.0", "")
cmd.flag.StringVar(&buildTVOSVersion, "tvosversion", "13.0", "")
cmd.flag.StringVar(&buildXROSVersion, "xrosversion", "1.0", "")
cmd.flag.StringVar(&buildMacOSVersion, "macosversion", "11.0", "")
cmd.flag.IntVar(&buildAndroidAPI, "androidapi", minAndroidAPI, "")

cmd.flag.BoolVar(&buildA, "a", false, "")
Expand Down
35 changes: 31 additions & 4 deletions cmd/gomobile/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ func isApplePlatform(platform string) bool {
return contains(applePlatforms, platform)
}

var applePlatforms = []string{"ios", "iossimulator", "macos", "maccatalyst"}
var applePlatforms = []string{"ios", "iossimulator", "macos", "maccatalyst", "appletvos", "appletvsimulator", "xros", "xrsimulator"}

func platformArchs(platform string) []string {
switch platform {
case "ios":
case "ios", "appletvos", "xros":
return []string{"arm64"}
case "iossimulator":
case "iossimulator", "appletvsimulator", "xrsimulator":
return []string{"arm64", "amd64"}
case "macos", "maccatalyst":
return []string{"arm64", "amd64"}
Expand All @@ -58,7 +58,7 @@ func platformOS(platform string) string {
switch platform {
case "android":
return "android"
case "ios", "iossimulator":
case "ios", "iossimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator":
return "ios"
case "macos", "maccatalyst":
// For "maccatalyst", Go packages should be built with GOOS=darwin,
Expand Down Expand Up @@ -93,6 +93,10 @@ func platformTags(platform string) []string {
// TODO(ydnar): remove tag "ios" when cgo supports Catalyst
// See golang.org/issues/47228
return []string{"ios", "macos", "maccatalyst"}
case "appletvos", "appletvsimulator":
return []string{"appletvos"}
case "xros", "xrsimulator":
return []string{"xros"}
default:
panic(fmt.Sprintf("unexpected platform: %s", platform))
}
Expand Down Expand Up @@ -253,6 +257,29 @@ func envInit() (err error) {
if arch == "arm64" {
cflags += " -fembed-bitcode"
}
cflags += " -mmacosx-version-min=" + buildMacOSVersion
case "appletvos":
goos = "ios"
sdk = "appletvos"
clang, cflags, err = envClang(sdk)
cflags += " -mappletvos-version-min=" + buildTVOSVersion
cflags += " -fembed-bitcode"
case "appletvsimulator":
goos = "ios"
sdk = "appletvsimulator"
clang, cflags, err = envClang(sdk)
cflags += " -mappletvsimulator-version-min=" + buildTVOSVersion
cflags += " -fembed-bitcode"
case "xros":
goos = "ios"
sdk = "xros"
clang, cflags, err = envClang(sdk)
cflags += " -fembed-bitcode"
case "xrsimulator":
goos = "ios"
sdk = "xrsimulator"
clang, cflags, err = envClang(sdk)
cflags += " -fembed-bitcode"
default:
panic(fmt.Errorf("unknown Apple target: %s/%s", platform, arch))
}
Expand Down