| 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 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 '../mojo/mojo_nacl.gyp:monacl_codegen', | 461 '../mojo/mojo_nacl.gyp:monacl_codegen', |
| 462 '../mojo/mojo_nacl.gyp:monacl_sel', | 462 '../mojo/mojo_nacl.gyp:monacl_sel', |
| 463 '../mojo/mojo_nacl.gyp:monacl_shell', | 463 '../mojo/mojo_nacl.gyp:monacl_shell', |
| 464 ], | 464 ], |
| 465 }], | 465 }], |
| 466 ], | 466 ], |
| 467 }, # target_name: chromium_builder_tests | 467 }, # target_name: chromium_builder_tests |
| 468 ], | 468 ], |
| 469 'conditions': [ | 469 'conditions': [ |
| 470 # TODO(GYP): make gn_migration.gypi work unconditionally. | 470 # TODO(GYP): make gn_migration.gypi work unconditionally. |
| 471 ['OS=="linux" and chromeos==0', { | 471 ['OS=="linux" and target_arch=="x64" and chromeos==0', { |
| 472 'includes': [ | 472 'includes': [ |
| 473 'gn_migration.gypi', | 473 'gn_migration.gypi', |
| 474 ], | 474 ], |
| 475 }], | 475 }], |
| 476 ['OS!="ios"', { | 476 ['OS!="ios"', { |
| 477 'targets': [ | 477 'targets': [ |
| 478 { | 478 { |
| 479 'target_name': 'blink_tests', | 479 'target_name': 'blink_tests', |
| 480 'type': 'none', | 480 'type': 'none', |
| 481 'dependencies': [ | 481 'dependencies': [ |
| (...skipping 847 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1329 'dependencies': [ | 1329 'dependencies': [ |
| 1330 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 1330 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
| 1331 '../ui/views/views.gyp:views', | 1331 '../ui/views/views.gyp:views', |
| 1332 '../ui/views/views.gyp:views_unittests', | 1332 '../ui/views/views.gyp:views_unittests', |
| 1333 ], | 1333 ], |
| 1334 }, # target_name: macviews_builder | 1334 }, # target_name: macviews_builder |
| 1335 ], # targets | 1335 ], # targets |
| 1336 }], # os=='mac' and toolkit_views==1 | 1336 }], # os=='mac' and toolkit_views==1 |
| 1337 ], # conditions | 1337 ], # conditions |
| 1338 } | 1338 } |
| OLD | NEW |