OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 | 5 |
6 from master import master_config | 6 from master import master_config |
7 from master.factory import chromium_factory | 7 from master.factory import chromium_factory |
8 | 8 |
9 import config | 9 import master_site_config |
10 | 10 |
11 ActiveMaster = config.Master.ChromiumWebkit | 11 ActiveMaster = master_site_config.ChromiumWebkit |
12 | 12 |
13 defaults = {} | 13 defaults = {} |
14 | 14 |
15 helper = master_config.Helper(defaults) | 15 helper = master_config.Helper(defaults) |
16 B = helper.Builder | 16 B = helper.Builder |
17 F = helper.Factory | 17 F = helper.Factory |
18 | 18 |
19 def win(): | 19 def win(): |
20 return chromium_factory.ChromiumFactory('src/build', 'win32') | 20 return chromium_factory.ChromiumFactory('src/build', 'win32') |
21 | 21 |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 'archive_webkit_results': ActiveMaster.is_production_host, | 53 'archive_webkit_results': ActiveMaster.is_production_host, |
54 'driver_name': 'content_shell', | 54 'driver_name': 'content_shell', |
55 'gclient_env': {'GYP_DEFINES': 'fastbuild=1'}, | 55 'gclient_env': {'GYP_DEFINES': 'fastbuild=1'}, |
56 'test_results_server': 'test-results.appspot.com', | 56 'test_results_server': 'test-results.appspot.com', |
57 'blink_config': 'blink', | 57 'blink_config': 'blink', |
58 })) | 58 })) |
59 | 59 |
60 | 60 |
61 def Update(_config, _active_master, c): | 61 def Update(_config, _active_master, c): |
62 return helper.Update(c) | 62 return helper.Update(c) |
OLD | NEW |