From 2c8230f4dd7177669a75ed3aea2cddcb0db9eafc Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Fri, 20 Mar 2020 12:31:06 -0700 Subject: [PATCH] Re-land "Enable unified OpenGL/Metal builds." This reverts commit fd60ddf7517ce2bfd6577636bda2065c0e492664. [My patch in Skia](https://github.com/google/skia/commit/7cbcd79a4af538578ee87b43740c32a5a7d40a9b) and was [rolled in here](https://github.com/flutter/engine/pull/17227). --- tools/gn | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/gn b/tools/gn index 0fb187febda35..6d47127ca30fe 100755 --- a/tools/gn +++ b/tools/gn @@ -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)