| Index: masters/master.chromium.webkit/master_linux_webkit_latest_cfg.py
|
| diff --git a/masters/master.chromium.webkit/master_linux_webkit_latest_cfg.py b/masters/master.chromium.webkit/master_linux_webkit_latest_cfg.py
|
| index 4c8ef1b7dac9a1be05c8cdf616d400a4fca3203f..9141a4ff1e25b469d584e6c2df0505d1bc36f927 100644
|
| --- a/masters/master.chromium.webkit/master_linux_webkit_latest_cfg.py
|
| +++ b/masters/master.chromium.webkit/master_linux_webkit_latest_cfg.py
|
| @@ -48,7 +48,10 @@ F('f_webkit_linux_rel', linux().ChromiumFactory(
|
| ],
|
| factory_properties={
|
| 'archive_webkit_results': ActiveMaster.is_production_host,
|
| - 'gclient_env': { 'GYP_GENERATORS': 'ninja' },
|
| + 'gclient_env': {
|
| + 'GYP_DEFINES': 'use_ash=0 use_aura=0',
|
| + 'GYP_GENERATORS': 'ninja',
|
| + },
|
| 'generate_gtest_json': True,
|
| 'test_results_server': 'test-results.appspot.com',
|
| 'blink_config': 'blink',
|
| @@ -76,7 +79,10 @@ F('f_webkit_linux_rel_asan', linux().ChromiumFactory(
|
| 'archive_webkit_results': ActiveMaster.is_production_host,
|
| 'asan': True,
|
| 'blink_config': 'blink',
|
| - 'gclient_env': {'GYP_DEFINES': asan_gyp, 'GYP_GENERATORS': 'ninja'},
|
| + 'gclient_env': {
|
| + 'GYP_DEFINES': asan_gyp + ' use_ash=0 use_aura=0',
|
| + 'GYP_GENERATORS': 'ninja',
|
| + },
|
| 'generate_gtest_json': True,
|
| 'gs_bucket': 'gs://webkit-asan',
|
| 'test_results_server': 'test-results.appspot.com',
|
| @@ -107,7 +113,10 @@ F('f_webkit_dbg_tests', linux().ChromiumFactory(
|
| 'archive_webkit_results': ActiveMaster.is_production_host,
|
| 'generate_gtest_json': True,
|
| 'test_results_server': 'test-results.appspot.com',
|
| - 'gclient_env': { 'GYP_GENERATORS': 'ninja' },
|
| + 'gclient_env': {
|
| + 'GYP_DEFINES': 'use_ash=0 use_aura=0',
|
| + 'GYP_GENERATORS':'ninja',
|
| + },
|
| 'blink_config': 'blink',
|
| }))
|
|
|
|
|