From 13c5a7050ec0601e76c60fd2b13acd6c9dacebf1 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Thu, 17 Dec 2020 11:08:08 -0800 Subject: [PATCH 1/2] Make it easier to turn on Xcode symlinks --- tools/gn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/gn b/tools/gn index f7b69306619da..835ce1b630c2e 100755 --- a/tools/gn +++ b/tools/gn @@ -234,6 +234,10 @@ def to_gn_args(args): gn_args['use_goma'] = False gn_args['goma_dir'] = None + if gn_args['use_goma']: + if args.xcode_symlinks: + gn_args['create_xcode_symlinks'] = True + # Enable Metal on iOS builds. if args.target_os == 'ios': gn_args['skia_use_metal'] = True @@ -339,6 +343,8 @@ def parse_args(args): parser.add_argument('--goma', default=True, action='store_true') parser.add_argument('--no-goma', dest='goma', action='store_false') + parser.add_argument('--xcode-symlinks', action='store_true') + parser.add_argument('--no-xcode-symlinks', dest='xcode_symlinks', default=False, action='store_false') parser.add_argument('--depot-tools', default='~/depot_tools', type=str, help='Depot tools provides an alternative location for gomacc in ' + '/path/to/depot_tools/.cipd_bin') From b17d36ecf6c64cd5f57e8989a5c7ec2ee7092d06 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Thu, 17 Dec 2020 11:49:03 -0800 Subject: [PATCH 2/2] help text --- tools/gn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/gn b/tools/gn index 835ce1b630c2e..e65a60abed577 100755 --- a/tools/gn +++ b/tools/gn @@ -343,7 +343,9 @@ def parse_args(args): parser.add_argument('--goma', default=True, action='store_true') parser.add_argument('--no-goma', dest='goma', action='store_false') - parser.add_argument('--xcode-symlinks', action='store_true') + parser.add_argument('--xcode-symlinks', action='store_true', help='Set to true for builds targetting macOS or iOS ' + + 'when using goma. If set, symlinks to the Xcode provided sysroot and SDKs will be created in a generated ' + + 'folder, which will avoid potential backend errors in Fuchsia RBE.') parser.add_argument('--no-xcode-symlinks', dest='xcode_symlinks', default=False, action='store_false') parser.add_argument('--depot-tools', default='~/depot_tools', type=str, help='Depot tools provides an alternative location for gomacc in ' +