Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Unified Diff: recipes/blink.py

Issue 1186053007: Fix 'fetch blink' recipe for proper management. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: rebase Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: recipes/blink.py
diff --git a/recipes/blink.py b/recipes/blink.py
index aa6084454a73a0b54e0155ebbb5a10299f8f1f82..99c20ede64cddaae065058d54fe5693f4bfb194b 100644
--- a/recipes/blink.py
+++ b/recipes/blink.py
@@ -15,24 +15,40 @@ class Blink(recipe_util.Recipe):
@staticmethod
def fetch_spec(props):
- submodule_spec = {
- 'third_party/WebKit': {
- 'auto': True,
- }
+ chromium_url = 'https://chromium.googlesource.com/chromium/src.git'
+ chromium_solution = {'name': 'src',
+ 'url': chromium_url,
+ 'deps_file': 'DEPS',
+ 'managed': False,
+ 'custom_deps': {
+ 'src/third_party/WebKit': None,
+ },
}
+ blink_url = 'https://chromium.googlesource.com/chromium/blink.git'
+ blink_solution = {'name': 'src/third_party/WebKit',
+ 'url': blink_url,
+ 'deps_file': '.DEPS.git',
+ 'managed': False,
+ 'custom_deps': {},
+ }
+ spec = {
+ 'solutions': [chromium_solution, blink_solution],
+ 'auto': True,
+ }
+ if props.get('target_os'):
+ spec['target_os'] = props['target_os'].split(',')
+ if props.get('target_os_only'):
+ spec['target_os_only'] = props['target_os_only']
+ toolchain_hook = [sys.executable, 'src/build/confirm_toolchain.py']
+ spec['fetch_hooks'] = [toolchain_hook]
return {
- 'alias': {
- 'recipe': 'chromium',
- 'props': [
- '--webkit_revision=ToT',
- '--submodule_git_svn_spec=' + json.dumps(submodule_spec),
- ],
- },
+ 'type': 'gclient_git_svn',
+ 'gclient_git_svn_spec': spec,
}
@staticmethod
def expected_root(_props):
- return ''
+ return 'src/third_party/WebKit'
def main(argv=None):
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698