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 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
404 '../ash/ash.gyp:ash_unittests', | 404 '../ash/ash.gyp:ash_unittests', |
405 ], | 405 ], |
406 }], | 406 }], |
407 ['disable_nacl==0', { | 407 ['disable_nacl==0', { |
408 'dependencies': [ | 408 'dependencies': [ |
409 '../components/nacl.gyp:nacl_loader_unittests', | 409 '../components/nacl.gyp:nacl_loader_unittests', |
410 ], | 410 ], |
411 }], | 411 }], |
412 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 412 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
413 'dependencies': [ | 413 'dependencies': [ |
414 '../testing/gtest_nacl.gyp:*', | 414 '../mojo/monacl.gyp:*', |
viettrungluu
2014/08/20 19:52:38
This change seems a bit odd to me.
Nick Bray (chromium)
2014/09/03 23:45:02
Otherwise the gyp file is not part of the build.
| |
415 ], | 415 ], |
416 }], | 416 }], |
417 ], | 417 ], |
418 }, # target_name: chromium_builder_tests | 418 }, # target_name: chromium_builder_tests |
419 ], | 419 ], |
420 'conditions': [ | 420 'conditions': [ |
421 ['OS!="ios"', { | 421 ['OS!="ios"', { |
422 'targets': [ | 422 'targets': [ |
423 { | 423 { |
424 'target_name': 'blink_tests', | 424 'target_name': 'blink_tests', |
(...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1288 'dependencies': [ | 1288 'dependencies': [ |
1289 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 1289 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
1290 '../ui/views/views.gyp:views', | 1290 '../ui/views/views.gyp:views', |
1291 '../ui/views/views.gyp:views_unittests', | 1291 '../ui/views/views.gyp:views_unittests', |
1292 ], | 1292 ], |
1293 }, # target_name: macviews_builder | 1293 }, # target_name: macviews_builder |
1294 ], # targets | 1294 ], # targets |
1295 }], # os=='mac' and toolkit_views==1 | 1295 }], # os=='mac' and toolkit_views==1 |
1296 ], # conditions | 1296 ], # conditions |
1297 } | 1297 } |
OLD | NEW |