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 from master import master_config | 5 from master import master_config |
6 from master.factory import chromium_factory | 6 from master.factory import chromium_factory |
7 | 7 |
8 import master_site_config | 8 import master_site_config |
9 | 9 |
10 ActiveMaster = master_site_config.ChromiumWebkit | 10 ActiveMaster = master_site_config.ChromiumWebkit |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 '--build-tool=ninja', | 44 '--build-tool=ninja', |
45 '--compiler=goma', | 45 '--compiler=goma', |
46 '--', | 46 '--', |
47 'all_webkit', | 47 'all_webkit', |
48 ], | 48 ], |
49 factory_properties={ | 49 factory_properties={ |
50 'additional_expectations': [ | 50 'additional_expectations': [ |
51 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ], | 51 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ], |
52 ], | 52 ], |
53 'archive_webkit_results': ActiveMaster.is_production_host, | 53 'archive_webkit_results': ActiveMaster.is_production_host, |
54 'gclient_env': { 'GYP_GENERATORS': 'ninja' }, | 54 'gclient_env': { |
| 55 'GYP_DEFINES': 'use_ash=0 use_aura=0', |
| 56 'GYP_GENERATORS':'ninja', |
| 57 }, |
55 'generate_gtest_json': True, | 58 'generate_gtest_json': True, |
56 'test_results_server': 'test-results.appspot.com', | 59 'test_results_server': 'test-results.appspot.com', |
57 })) | 60 })) |
58 | 61 |
59 def Update(_config, _active_master, c): | 62 def Update(_config, _active_master, c): |
60 return helper.Update(c) | 63 return helper.Update(c) |
OLD | NEW |