Skip to content

Commit fd60ddf

Browse files
authored
Revert "Enable unified OpenGL/Metal builds. (flutter#17217)" (flutter#17218)
This reverts commit 8581937.
1 parent 8581937 commit fd60ddf

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

tools/gn

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ def get_out_dir(args):
4444
if args.enable_vulkan:
4545
target_dir.append('vulkan')
4646

47+
if args.enable_metal and args.target_os == 'ios':
48+
target_dir.append('metal')
49+
4750
return os.path.join(args.out_dir, 'out', '_'.join(target_dir))
4851

4952
def to_command_line(gn_args):
@@ -216,8 +219,7 @@ def to_gn_args(args):
216219
gn_args['use_goma'] = False
217220
gn_args['goma_dir'] = None
218221

219-
# Enable Metal on non-simulator iOS builds.
220-
if args.target_os == 'ios' and not args.simulator:
222+
if args.enable_metal:
221223
gn_args['skia_use_metal'] = True
222224
gn_args['shell_enable_metal'] = True
223225
# Bitcode enabled builds using the current version of the toolchain leak
@@ -321,6 +323,7 @@ def parse_args(args):
321323
parser.add_argument('--operator-new-alignment', dest='operator_new_alignment', type=str, default=None)
322324

323325
parser.add_argument('--enable-vulkan', action='store_true', default=False)
326+
parser.add_argument('--enable-metal', action='store_true', default=False)
324327

325328
parser.add_argument('--enable-fontconfig', action='store_true', default=False)
326329
parser.add_argument('--enable-skshaper', action='store_true', default=False)

0 commit comments

Comments
 (0)