Home
last modified time | relevance | path

Searched refs:root_sha1 (Results 1 – 1 of 1) sorted by relevance

/frameworks/webview/chromium/tools/
Dmerge_from_chromium.py132 def _MergeProjects(version, root_sha1, target, unattended, buildspec_url): argument
157 if root_sha1:
158 deps_content = _ReadGitFile(root_sha1, '.DEPS.git')
184 if not local_mirrored or not root_sha1:
204 if not root_sha1:
207 root_sha1 = merge_info['']['sha1']
208 merge_common.GetCommandStdout(['git', 'fetch', url, root_sha1])
209 logging.debug('Merging Chromium at %s ...', root_sha1)
211 merge_common.GetCommandStdout(['git', 'merge', '--no-commit', root_sha1],
215 % (version, root_sha1, AUTOGEN_MESSAGE), unattended=unattended)
[all …]