Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Remove --ios-cpu flag. Only the arm64 variant is supported. #53044

Merged
merged 1 commit into from
May 28, 2024
Merged
Changes from all commits
Commits
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
12 changes: 1 addition & 11 deletions tools/gn
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ def get_out_dir(args):
if args.android_cpu != 'arm':
target_dir.append(args.android_cpu)

if args.ios_cpu != 'arm64':
target_dir.append(args.ios_cpu)

if args.mac_cpu != 'x64':
target_dir.append(args.mac_cpu)

Expand Down Expand Up @@ -183,7 +180,7 @@ def get_target_cpu(args):
if args.target_os == 'ios':
if args.simulator:
return args.simulator_cpu
return args.ios_cpu
return 'arm64'
if args.target_os == 'mac':
return args.mac_cpu
if args.target_os == 'linux':
Expand Down Expand Up @@ -917,7 +914,6 @@ def parse_args(args):
'--android-cpu', type=str, choices=['arm', 'x64', 'x86', 'arm64'], default='arm'
)
parser.add_argument('--ios', dest='target_os', action='store_const', const='ios')
parser.add_argument('--ios-cpu', type=str, choices=['arm', 'arm64'], default='arm64')
parser.add_argument('--mac', dest='target_os', action='store_const', const='mac')
parser.add_argument('--mac-cpu', type=str, choices=['x64', 'arm64'], default='x64')
parser.add_argument(
Expand Down Expand Up @@ -1232,12 +1228,6 @@ def validate_args(args):
'to use `--simulator-cpu`?'
)
valid = False
if args.ios_cpu != 'arm64':
print(
'Specified a non-default ios-cpu for a simulator build. Did you mean '
'to use `--simulator-cpu`?'
)
valid = False

if not valid:
sys.exit(-1)
Expand Down