| OLD | NEW |
| 1 import gclient_utils | 1 import gclient_utils |
| 2 import os | 2 import os |
| 3 | 3 |
| 4 path = gclient_utils.FindGclientRoot(os.getcwd()) | 4 path = gclient_utils.FindGclientRoot(os.getcwd()) |
| 5 execfile(os.path.join(path, 'clank.deps', 'DEPS.chromium')) # Include proper Chr
omium DEPS. | 5 execfile(os.path.join(path, 'clank.deps', 'DEPS.chromium')) # Include proper Chr
omium DEPS. |
| 6 | 6 |
| 7 # Now we need to override some settings and add some new ones. | 7 # Now we need to override some settings and add some new ones. |
| 8 | 8 |
| 9 vars.update({ | 9 vars.update({ |
| 10 "chromium_url": "http://src.chromium.org/svn", | 10 "chromium_url": "http://src.chromium.org/svn", |
| 11 "chromium_revision": "224845", | 11 "chromium_revision": "224845", |
| 12 "clank_gerrit": "ssh://gerrit-int.chromium.org:29419/clank/", | 12 "clank_gerrit": "ssh://gerrit-int.chromium.org:29419/clank/", |
| 13 # This revision number should be kept in sync with the version of clank that | 13 # This revision number should be kept in sync with the version of clank that |
| 14 # uses a similar chromium revision to that mentioned just above in | 14 # uses a similar chromium revision to that mentioned just above in |
| 15 # "chromium_revision". You can check which might be a good revision at: | 15 # "chromium_revision". You can check which might be a good revision at: |
| 16 # https://chrome-internal.googlesource.com/clank/internal/apps/ | 16 # https://chrome-internal.googlesource.com/clank/internal/apps/ |
| 17 "clank_rev": "e0ed5bc4595555b79fecdd5df976c6088a792a3f", | 17 "clank_rev": "e0ed5bc4595555b79fecdd5df976c6088a792a3f", |
| 18 "chrome_internal": "https://chrome-internal.googlesource.com/", | 18 "chrome_internal": "https://chrome-internal.googlesource.com/", |
| 19 # The Dart repository URL is pulled out here so that it can be easily | 19 # The Dart repository URL is pulled out here so that it can be easily |
| 20 # updated to "https" for committers. | 20 # updated to "https" for committers. |
| 21 "dart_branch": "/branches/bleeding_edge", | 21 "dart_branch": "/branches/bleeding_edge", |
| 22 "dart_rev": "29181", | 22 "dart_rev": "29181", |
| 23 "multivm_url": "http://src.chromium.org/multivm/trunk", | 23 "multivm_url": "http://src.chromium.org/multivm/trunk", |
| 24 "dartium_webkit_trunk": "http://src.chromium.org/multivm/trunk/webkit", | 24 "dartium_webkit_trunk": "http://src.chromium.org/multivm/trunk/webkit", |
| 25 "dartium_webkit_revision": "1474", | 25 "dartium_webkit_revision": "1474", |
| 26 "dartium_tools_revision": "1475", | 26 "dartium_tools_revision": "1475", |
| 27 "bootstrap_css_rev" : "@28387", | 27 "bootstrap_css_rev" : "@28387", |
| 28 "co19_rev": "@641", | 28 "co19_rev": "@651", |
| 29 }) | 29 }) |
| 30 | 30 |
| 31 def massage_deps(deps): | 31 def massage_deps(deps): |
| 32 for key, value in deps.items(): | 32 for key, value in deps.items(): |
| 33 if value is None: continue | 33 if value is None: continue |
| 34 | 34 |
| 35 if value.startswith('/trunk'): | 35 if value.startswith('/trunk'): |
| 36 deps[key] = Var("chromium_url") + value | 36 deps[key] = Var("chromium_url") + value |
| 37 continue | 37 continue |
| 38 | 38 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 "pattern": ".", | 77 "pattern": ".", |
| 78 "action": ["python", "src/dartium_tools/export_overrides.py"], | 78 "action": ["python", "src/dartium_tools/export_overrides.py"], |
| 79 }, | 79 }, |
| 80 { | 80 { |
| 81 "pattern": "dart", | 81 "pattern": "dart", |
| 82 "action": ["python", "src/dartium_tools/generate_dart_vm_version.py"], | 82 "action": ["python", "src/dartium_tools/generate_dart_vm_version.py"], |
| 83 }] | 83 }] |
| 84 | 84 |
| 85 target_os = ['android'] | 85 target_os = ['android'] |
| 86 | 86 |
| OLD | NEW |