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

Remove visionos_x86_64 support #2378

Merged
merged 2 commits into from
Jan 22, 2024
Merged

Remove visionos_x86_64 support #2378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
927d5ba
Remove visionos_x86_64 support
keith Jan 22, 2024
7a7f2d1
more
keith Jan 22, 2024
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 apple/internal/visionos_rules.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1650,7 +1650,7 @@ dependency of other Bazel targets. For that use case, use the corresponding
Unlike other visionos bundles, the fat binary in an `visionos_static_framework` may
simultaneously contain simulator and device architectures (that is, you can
build a single framework artifact that works for all architectures by specifying
`--visionos_cpus=x86_64,arm64` when you build).
`--visionos_cpus=sim_arm64,arm64` when you build).

`visionos_static_framework` supports Swift, but there are some constraints:

Expand Down
2 changes: 1 addition & 1 deletion doc/rules-visionos.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ dependency of other Bazel targets. For that use case, use the corresponding
Unlike other visionos bundles, the fat binary in an `visionos_static_framework` may
simultaneously contain simulator and device architectures (that is, you can
build a single framework artifact that works for all architectures by specifying
`--visionos_cpus=x86_64,arm64` when you build).
`--visionos_cpus=sim_arm64,arm64` when you build).

`visionos_static_framework` supports Swift, but there are some constraints:

Expand Down
8 changes: 0 additions & 8 deletions platform_mappings_visionos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ platforms:
--apple_platform_type=tvos
--cpu=tvos_arm64

@build_bazel_apple_support//platforms:visionos_x86_64
--apple_platform_type=visionos
--cpu=visionos_x86_64

@build_bazel_apple_support//platforms:visionos_sim_arm64
--apple_platform_type=visionos
--cpu=visionos_sim_arm64
Expand Down Expand Up @@ -128,10 +124,6 @@ flags:
--apple_platform_type=tvos
@build_bazel_apple_support//platforms:tvos_arm64

--cpu=visionos_x86_64
--apple_platform_type=visionos
@build_bazel_apple_support//platforms:visionos_x86_64

--cpu=visionos_sim_arm64
--apple_platform_type=visionos
@build_bazel_apple_support//platforms:visionos_sim_arm64
Expand Down
2 changes: 1 addition & 1 deletion test/starlark_tests/rules/analysis_output_group_info_files_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ analysis_output_group_info_files_test = make_provider_test_rule(
"//command_line_option:macos_cpus": "arm64,x86_64",
"//command_line_option:ios_multi_cpus": "sim_arm64,x86_64",
"//command_line_option:tvos_cpus": "sim_arm64,x86_64",
"//command_line_option:visionos_cpus": "sim_arm64,x86_64",
"//command_line_option:visionos_cpus": "sim_arm64",
"//command_line_option:watchos_cpus": "arm64,x86_64",
},
)
2 changes: 1 addition & 1 deletion test/starlark_tests/rules/apple_codesigning_dossier_info_provider_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ apple_codesigning_dossier_info_provider_test = make_provider_test_rule(
"//command_line_option:macos_cpus": "arm64,x86_64",
"//command_line_option:ios_multi_cpus": "sim_arm64,x86_64",
"//command_line_option:tvos_cpus": "sim_arm64,x86_64",
"//command_line_option:visionos_cpus": "sim_arm64,x86_64",
"//command_line_option:visionos_cpus": "sim_arm64",
"//command_line_option:watchos_cpus": "arm64,x86_64",
},
)
2 changes: 1 addition & 1 deletion test/starlark_tests/rules/apple_dsym_bundle_info_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ created for them as transitive dependencies of the given providers.
"//command_line_option:macos_cpus": "arm64,x86_64",
"//command_line_option:ios_multi_cpus": "sim_arm64,x86_64",
"//command_line_option:tvos_cpus": "sim_arm64,x86_64",
"//command_line_option:visionos_cpus": "sim_arm64,x86_64",
"//command_line_option:visionos_cpus": "sim_arm64",
"//command_line_option:watchos_cpus": "arm64,x86_64",
},
)
2 changes: 1 addition & 1 deletion test/starlark_tests/rules/linkmap_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ provided.
"//command_line_option:macos_cpus": "arm64,x86_64",
"//command_line_option:ios_multi_cpus": "sim_arm64,x86_64",
"//command_line_option:tvos_cpus": "sim_arm64,x86_64",
"//command_line_option:visionos_cpus": "sim_arm64,x86_64",
"//command_line_option:visionos_cpus": "sim_arm64",
"//command_line_option:watchos_cpus": "arm64,x86_64",
},
fragments = ["apple"],
Expand Down