| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 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 'variables': { | 5 'variables': { |
| 6 'chrome_browser_extensions_test_support_sources': [ | 6 'chrome_browser_extensions_test_support_sources': [ |
| 7 # A list of sources which is shared between different browser tests. | 7 # A list of sources which is shared between different browser tests. |
| 8 'browser/apps/app_browsertest_util.cc', | 8 'browser/apps/app_browsertest_util.cc', |
| 9 'browser/apps/app_browsertest_util.h', | 9 'browser/apps/app_browsertest_util.h', |
| 10 'browser/extensions/browsertest_util.cc', | 10 'browser/extensions/browsertest_util.cc', |
| (...skipping 3195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3206 ], | 3206 ], |
| 3207 'includes': [ | 3207 'includes': [ |
| 3208 '../build/isolate.gypi', | 3208 '../build/isolate.gypi', |
| 3209 ], | 3209 ], |
| 3210 'sources': [ | 3210 'sources': [ |
| 3211 'sync_integration_tests.isolate', | 3211 'sync_integration_tests.isolate', |
| 3212 ], | 3212 ], |
| 3213 }, | 3213 }, |
| 3214 ], | 3214 ], |
| 3215 'conditions': [ | 3215 'conditions': [ |
| 3216 ['disable_nacl==1', { |
| 3217 'targets': [ |
| 3218 { |
| 3219 'target_name': 'nacl_integration_run', |
| 3220 'type': 'none', |
| 3221 'dependencies': [ |
| 3222 '../third_party/mesa/mesa.gyp:osmesa', |
| 3223 'chrome', |
| 3224 ], |
| 3225 'conditions': [ |
| 3226 ['use_x11 == 1', { |
| 3227 'dependencies': [ |
| 3228 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 3229 ], |
| 3230 }], |
| 3231 ], |
| 3232 'includes': [ |
| 3233 '../build/isolate.gypi', |
| 3234 ], |
| 3235 'sources': [ |
| 3236 'nacl_integration.isolate', |
| 3237 ], |
| 3238 }, |
| 3239 ], |
| 3240 }], |
| 3241 ], |
| 3242 'conditions': [ |
| 3216 ['archive_gpu_tests==1', { | 3243 ['archive_gpu_tests==1', { |
| 3217 'targets': [ | 3244 'targets': [ |
| 3218 { | 3245 { |
| 3219 'target_name': 'gpu_tests_base', | 3246 'target_name': 'gpu_tests_base', |
| 3220 'type': 'none', | 3247 'type': 'none', |
| 3221 'dependencies': [ | 3248 'dependencies': [ |
| 3222 # depend on icu to fix races. http://crbug.com/417583 | 3249 # depend on icu to fix races. http://crbug.com/417583 |
| 3223 '../third_party/icu/icu.gyp:icudata', | 3250 '../third_party/icu/icu.gyp:icudata', |
| 3224 ], | 3251 ], |
| 3225 # Set this so we aren't included as a target in files that | 3252 # Set this so we aren't included as a target in files that |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3360 'utility', | 3387 'utility', |
| 3361 ], | 3388 ], |
| 3362 'sources': [ | 3389 'sources': [ |
| 3363 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', | 3390 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', |
| 3364 'tools/service_discovery_sniffer/service_discovery_sniffer.h', | 3391 'tools/service_discovery_sniffer/service_discovery_sniffer.h', |
| 3365 ], | 3392 ], |
| 3366 }] | 3393 }] |
| 3367 }], | 3394 }], |
| 3368 ], # 'conditions' | 3395 ], # 'conditions' |
| 3369 } | 3396 } |
| OLD | NEW |