Enable unified OpenGL/Metal builds. (flutter/engine#17217)

This commit is contained in:
Chinmay Garde 2020-03-19 19:46:02 -07:00 committed by GitHub
parent f1937cf92f
commit 9ba13307d8

View File

@ -44,9 +44,6 @@ def get_out_dir(args):
if args.enable_vulkan:
target_dir.append('vulkan')
if args.enable_metal and args.target_os == 'ios':
target_dir.append('metal')
return os.path.join(args.out_dir, 'out', '_'.join(target_dir))
def to_command_line(gn_args):
@ -219,7 +216,8 @@ def to_gn_args(args):
gn_args['use_goma'] = False
gn_args['goma_dir'] = None
if args.enable_metal:
# Enable Metal on non-simulator iOS builds.
if args.target_os == 'ios' and not args.simulator:
gn_args['skia_use_metal'] = True
gn_args['shell_enable_metal'] = True
# Bitcode enabled builds using the current version of the toolchain leak
@ -323,7 +321,6 @@ def parse_args(args):
parser.add_argument('--operator-new-alignment', dest='operator_new_alignment', type=str, default=None)
parser.add_argument('--enable-vulkan', action='store_true', default=False)
parser.add_argument('--enable-metal', action='store_true', default=False)
parser.add_argument('--enable-fontconfig', action='store_true', default=False)
parser.add_argument('--enable-skshaper', action='store_true', default=False)