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

Commit 1a8cd1b

Browse files
authored
Remove --ios-cpu flag. Only the arm64 variant is supported. (#53044)
We don't support 32-bit arm iOS builds anymore. But adding the --ios-cpu=arm64 appends the "_arm" to the out subdirectory. This just causes confusion since the ios_debug_unopt is still arm64. Just remove the flag that does nothing.
1 parent f4b7854 commit 1a8cd1b

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

tools/gn

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ def get_out_dir(args):
4141
if args.android_cpu != 'arm':
4242
target_dir.append(args.android_cpu)
4343

44-
if args.ios_cpu != 'arm64':
45-
target_dir.append(args.ios_cpu)
46-
4744
if args.mac_cpu != 'x64':
4845
target_dir.append(args.mac_cpu)
4946

@@ -183,7 +180,7 @@ def get_target_cpu(args):
183180
if args.target_os == 'ios':
184181
if args.simulator:
185182
return args.simulator_cpu
186-
return args.ios_cpu
183+
return 'arm64'
187184
if args.target_os == 'mac':
188185
return args.mac_cpu
189186
if args.target_os == 'linux':
@@ -917,7 +914,6 @@ def parse_args(args):
917914
'--android-cpu', type=str, choices=['arm', 'x64', 'x86', 'arm64'], default='arm'
918915
)
919916
parser.add_argument('--ios', dest='target_os', action='store_const', const='ios')
920-
parser.add_argument('--ios-cpu', type=str, choices=['arm', 'arm64'], default='arm64')
921917
parser.add_argument('--mac', dest='target_os', action='store_const', const='mac')
922918
parser.add_argument('--mac-cpu', type=str, choices=['x64', 'arm64'], default='x64')
923919
parser.add_argument(
@@ -1232,12 +1228,6 @@ def validate_args(args):
12321228
'to use `--simulator-cpu`?'
12331229
)
12341230
valid = False
1235-
if args.ios_cpu != 'arm64':
1236-
print(
1237-
'Specified a non-default ios-cpu for a simulator build. Did you mean '
1238-
'to use `--simulator-cpu`?'
1239-
)
1240-
valid = False
12411231

12421232
if not valid:
12431233
sys.exit(-1)

0 commit comments

Comments
 (0)