bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-04-15 11:17:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix errors on gclient sync of older release branches (issue #2211)

Browse Source
This commit is contained in:
Marshall Greenblatt 2017-07-18 17:07:23 -04:00
parent 1aea3a06a5
commit 0c24e90b44
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/automate/automate-git.py
View File

@ -896,8 +896,8 @@ if not os.path.exists(gclient_file) or options.forceconfig:
# Initial Chromium checkout. # Initial Chromium checkout.
if not options.nochromiumupdate and not os.path.exists(chromium_src_dir): if not options.nochromiumupdate and not os.path.exists(chromium_src_dir):
chromium_checkout_new = True chromium_checkout_new = True
run("gclient sync --nohooks --with_branch_heads --jobs 16", chromium_dir, \ run("gclient sync --nohooks --with_branch_heads --disable-syntax-validation --jobs 16", \
depot_tools_dir) chromium_dir, depot_tools_dir)
else: else:
chromium_checkout_new = False chromium_checkout_new = False
@ -981,7 +981,7 @@ if chromium_checkout_changed:
os.environ['GYP_CHROMIUM_NO_ACTION'] = '1' os.environ['GYP_CHROMIUM_NO_ACTION'] = '1'
# Update third-party dependencies including branch/tag information. # Update third-party dependencies including branch/tag information.
run("gclient sync %s--with_branch_heads --jobs 16" % \ run("gclient sync %s--with_branch_heads --disable-syntax-validation --jobs 16" % \
(('--reset ' if options.forceclean else '')), \ (('--reset ' if options.forceclean else '')), \
chromium_dir, depot_tools_dir) chromium_dir, depot_tools_dir)