Chromium Code Reviews| 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 'variables': { | 6 'variables': { |
| 7 # A hook that can be overridden in other repositories to add additional | 7 # A hook that can be overridden in other repositories to add additional |
| 8 # compilation targets to 'All'. Only used on Android. | 8 # compilation targets to 'All'. Only used on Android. |
| 9 'android_app_targets%': [], | 9 'android_app_targets%': [], |
| 10 }, | 10 }, |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 331 'VCLinkerTool': { | 331 'VCLinkerTool': { |
| 332 # Enable profile information (necessary for SyzyAsan | 332 # Enable profile information (necessary for SyzyAsan |
| 333 # instrumentation). This is incompatible with incremental | 333 # instrumentation). This is incompatible with incremental |
| 334 # linking. | 334 # linking. |
| 335 'Profile': 'true', | 335 'Profile': 'true', |
| 336 }, | 336 }, |
| 337 } | 337 } |
| 338 }], | 338 }], |
| 339 ], | 339 ], |
| 340 }], | 340 }], |
| 341 ['OS=="linux"', { | 341 ['OS=="linux"', { |
|
Mark Seaborn
2014/04/28 15:31:49
Hmm, nacl_loader_unittests shouldn't really be con
hamaji
2014/04/28 18:03:18
Done, but I'm not sure this works on Windows and M
| |
| 342 'dependencies': [ | 342 'dependencies': [ |
| 343 '../dbus/dbus.gyp:dbus_unittests', | 343 '../dbus/dbus.gyp:dbus_unittests', |
| 344 '../sandbox/sandbox.gyp:sandbox_linux_unittests', | 344 '../sandbox/sandbox.gyp:sandbox_linux_unittests', |
| 345 ], | 345 ], |
| 346 'conditions': [ | |
| 347 ['disable_nacl==0', { | |
| 348 'dependencies': [ | |
| 349 '../components/nacl.gyp:nacl_loader_unittests', | |
| 350 ], | |
| 351 }], | |
| 352 ] | |
| 346 }], | 353 }], |
| 347 ['OS=="mac"', { | 354 ['OS=="mac"', { |
| 348 'dependencies': [ | 355 'dependencies': [ |
| 349 '../ui/app_list/app_list.gyp:app_list_unittests', | 356 '../ui/app_list/app_list.gyp:app_list_unittests', |
| 350 '../ui/message_center/message_center.gyp:*', | 357 '../ui/message_center/message_center.gyp:*', |
| 351 ], | 358 ], |
| 352 }], | 359 }], |
| 353 ['test_isolation_mode != "noop"', { | 360 ['test_isolation_mode != "noop"', { |
| 354 'dependencies': [ | 361 'dependencies': [ |
| 355 'chromium_swarm_tests', | 362 'chromium_swarm_tests', |
| (...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1236 # http://crbug.com/157234 | 1243 # http://crbug.com/157234 |
| 1237 #'../chrome/chrome.gyp:sync_integration_tests_run', | 1244 #'../chrome/chrome.gyp:sync_integration_tests_run', |
| 1238 '../chrome/chrome.gyp:unit_tests_run', | 1245 '../chrome/chrome.gyp:unit_tests_run', |
| 1239 '../net/net.gyp:net_unittests_run', | 1246 '../net/net.gyp:net_unittests_run', |
| 1240 ], | 1247 ], |
| 1241 }, # target_name: chromium_swarm_tests | 1248 }, # target_name: chromium_swarm_tests |
| 1242 ], | 1249 ], |
| 1243 }], | 1250 }], |
| 1244 ], # conditions | 1251 ], # conditions |
| 1245 } | 1252 } |
| OLD | NEW |