From 9b73c5b5f4b1a7e5d4d792896ec82dfb08322998 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Sat, 25 May 2024 19:13:40 -0700 Subject: [PATCH] Remove --ios-cpu flag. Only the arm64 variant is supported. 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. --- tools/gn | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/tools/gn b/tools/gn index 37cc2480076cb..5072663db7fdb 100755 --- a/tools/gn +++ b/tools/gn @@ -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) @@ -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': @@ -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( @@ -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)