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'. | 8 # compilation targets to 'All'. |
9 'app_targets%': [], | 9 'app_targets%': [], |
10 # For Android-specific targets. | 10 # For Android-specific targets. |
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
478 ['use_ash==1', { | 478 ['use_ash==1', { |
479 'dependencies': [ | 479 'dependencies': [ |
480 '../ash/ash.gyp:ash_unittests', | 480 '../ash/ash.gyp:ash_unittests', |
481 ], | 481 ], |
482 }], | 482 }], |
483 ['disable_nacl==0', { | 483 ['disable_nacl==0', { |
484 'dependencies': [ | 484 'dependencies': [ |
485 '../components/nacl.gyp:nacl_loader_unittests', | 485 '../components/nacl.gyp:nacl_loader_unittests', |
486 ], | 486 ], |
487 }], | 487 }], |
| 488 ['disable_nacl==0 and disable_nacl_untrusted==0 and OS=="linux"', { |
| 489 'dependencies': [ |
| 490 '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi_unittests', |
| 491 ], |
| 492 }], |
488 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 493 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
489 'dependencies': [ | 494 'dependencies': [ |
490 '../mojo/mojo_nacl_untrusted.gyp:libmojo', | 495 '../mojo/mojo_nacl_untrusted.gyp:libmojo', |
491 '../mojo/mojo_nacl.gyp:monacl_codegen', | 496 '../mojo/mojo_nacl.gyp:monacl_codegen', |
492 '../mojo/mojo_nacl.gyp:monacl_sel', | 497 '../mojo/mojo_nacl.gyp:monacl_sel', |
493 '../mojo/mojo_nacl.gyp:monacl_shell', | 498 '../mojo/mojo_nacl.gyp:monacl_shell', |
494 ], | 499 ], |
495 }], | 500 }], |
496 ], | 501 ], |
497 }, # target_name: chromium_builder_tests | 502 }, # target_name: chromium_builder_tests |
(...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1400 'dependencies': [ | 1405 'dependencies': [ |
1401 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 1406 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
1402 '../ui/views/views.gyp:views', | 1407 '../ui/views/views.gyp:views', |
1403 '../ui/views/views.gyp:views_unittests', | 1408 '../ui/views/views.gyp:views_unittests', |
1404 ], | 1409 ], |
1405 }, # target_name: macviews_builder | 1410 }, # target_name: macviews_builder |
1406 ], # targets | 1411 ], # targets |
1407 }], # os=='mac' and toolkit_views==1 | 1412 }], # os=='mac' and toolkit_views==1 |
1408 ], # conditions | 1413 ], # conditions |
1409 } | 1414 } |
OLD | NEW |