Skip to content

Commit

Permalink
ios: Don't restrict goma for local developer Xcode-hybrid builds.
Browse files Browse the repository at this point in the history
This is only for local developer builds when testing out official.

Change-Id: Ibaaf1ed9fd81869865981e3e173ac6765b389070
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3726237
Reviewed-by: Sylvain Defresne <[email protected]>
Commit-Queue: Sylvain Defresne <[email protected]>
Auto-Submit: Justin Cohen <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1018598}
  • Loading branch information
Justin Cohen authored and Chromium LUCI CQ committed Jun 28, 2022
1 parent 9bc07e2 commit 6f9a49a
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions ios/build/tools/setup-gn.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,11 @@ def _GetGnArgs(self):
"""
args = []

# build/config/ios/ios_sdk.gni asserts that goma is not enabled when
# building Official, so ignore the value of goma.enabled when creating
# args.gn for Official.
if self._config != 'Official':
if self._settings.getboolean('goma', 'enabled'):
args.append(('use_goma', True))
goma_dir = self._settings.getstring('goma', 'install')
if goma_dir:
args.append(('goma_dir', '"%s"' % os.path.expanduser(goma_dir)))
if self._settings.getboolean('goma', 'enabled'):
args.append(('use_goma', True))
goma_dir = self._settings.getstring('goma', 'install')
if goma_dir:
args.append(('goma_dir', '"%s"' % os.path.expanduser(goma_dir)))

is_debug = self._config == 'Debug'
official = self._config == 'Official'
Expand Down

0 comments on commit 6f9a49a

Please sign in to comment.