| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 linux_android(): | 19 def linux_android(): |
| 20 return chromium_factory.ChromiumFactory('', | 20 return chromium_factory.ChromiumFactory('', |
| 21 'linux2', nohooks_on_update=True, target_os='android', full_checkout=True) | 21 'linux2', nohooks_on_update=True, target_os='android', full_checkout=True) |
| (...skipping 27 matching lines...) Expand all Loading... |
| 49 'android_bot_id': 'webkit-latest-contentshell-rel', | 49 'android_bot_id': 'webkit-latest-contentshell-rel', |
| 50 'archive_webkit_results': ActiveMaster.is_production_host, | 50 'archive_webkit_results': ActiveMaster.is_production_host, |
| 51 'driver_name': 'content_shell', | 51 'driver_name': 'content_shell', |
| 52 'generate_gtest_json': True, | 52 'generate_gtest_json': True, |
| 53 'test_results_server': 'test-results.appspot.com', | 53 'test_results_server': 'test-results.appspot.com', |
| 54 'blink_config': 'blink', | 54 'blink_config': 'blink', |
| 55 })) | 55 })) |
| 56 | 56 |
| 57 def Update(_config, _active_master, c): | 57 def Update(_config, _active_master, c): |
| 58 return helper.Update(c) | 58 return helper.Update(c) |
| OLD | NEW |