coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-12 06:29:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update Chromium sync scripts for WebRTC r7222 changes

Browse Source 
https://code.google.com/p/webrtc/source/detail?r=7222 contains
a few fixes for edge cases when moving back and forth with
Chromium DEPS.

TBR=fbarchard@google.com
BUG=

Review URL: https://webrtc-codereview.appspot.com/30529004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@1090 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
kjellander@google.com 2014-09-23 12:53:42 +00:00
parent 77ba1546f2
commit 2114d196f8
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
setup_links.py
View File

@ -64,6 +64,7 @@ FILES = {
'third_party/BUILD.gn': None,
}
ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
CHROMIUM_CHECKOUT = os.path.join('chromium', 'src')
LINKS_DB = 'links'
@ -240,6 +241,14 @@ class LibyuvLinkSetup():
source_dir, None, check_fn=os.path.isdir,
check_msg='directories')
if not on_bot and self._force:
# When making the manual switch from legacy SVN checkouts to the new
# Git-based Chromium DEPS, the .gclient_entries file that contains cached
# URLs for all DEPS entries must be removed to avoid future sync problems.
entries_file = os.path.join(os.path.dirname(ROOT_DIR), '.gclient_entries')
if os.path.exists(entries_file):
actions.append(Remove(entries_file, dangerous=True))
actions.sort()
if self._dry_run:

6
sync_chromium.py
View File

@ -59,6 +59,12 @@ def main():
return 0
os.unlink(flag_file)
# To avoid gclient sync problems when DEPS entries have been removed we must
# wipe the .gclient_entries file that contains cached URLs for all DEPS.
entries_file = os.path.join(opts.chromium_dir, '.gclient_entries')
if os.path.exists(entries_file):
os.unlink(entries_file)
env = os.environ.copy()
env['GYP_CHROMIUM_NO_ACTION'] = '1'
gclient_cmd = 'gclient.bat' if sys.platform.startswith('win') else 'gclient'