| 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 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 ], | 412 ], |
| 413 'msvs_settings': { | 413 'msvs_settings': { |
| 414 'VCLinkerTool': { | 414 'VCLinkerTool': { |
| 415 # Enable profile information (necessary for SyzyAsan | 415 # Enable profile information (necessary for SyzyAsan |
| 416 # instrumentation). This is incompatible with incremental | 416 # instrumentation). This is incompatible with incremental |
| 417 # linking. | 417 # linking. |
| 418 'Profile': 'true', | 418 'Profile': 'true', |
| 419 }, | 419 }, |
| 420 } | 420 } |
| 421 }], | 421 }], |
| 422 ['component!="shared_library" or target_arch!="ia32"', { | |
| 423 'dependencies': [ | |
| 424 '../chrome/installer/mini_installer.gyp:next_version_mini_instal
ler', | |
| 425 ], | |
| 426 }], | |
| 427 ], | 422 ], |
| 428 }], | 423 }], |
| 429 ['chromeos==1', { | 424 ['chromeos==1', { |
| 430 'dependencies': [ | 425 'dependencies': [ |
| 431 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_unittests', | 426 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_unittests', |
| 432 '../ui/arc/arc.gyp:ui_arc_unittests', | 427 '../ui/arc/arc.gyp:ui_arc_unittests', |
| 433 ], | 428 ], |
| 434 }], | 429 }], |
| 435 ['OS=="linux"', { | 430 ['OS=="linux"', { |
| 436 'dependencies': [ | 431 'dependencies': [ |
| (...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1384 'dependencies': [ | 1379 'dependencies': [ |
| 1385 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 1380 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
| 1386 '../ui/views/views.gyp:views', | 1381 '../ui/views/views.gyp:views', |
| 1387 '../ui/views/views.gyp:views_unittests', | 1382 '../ui/views/views.gyp:views_unittests', |
| 1388 ], | 1383 ], |
| 1389 }, # target_name: macviews_builder | 1384 }, # target_name: macviews_builder |
| 1390 ], # targets | 1385 ], # targets |
| 1391 }], # os=='mac' and toolkit_views==1 | 1386 }], # os=='mac' and toolkit_views==1 |
| 1392 ], # conditions | 1387 ], # conditions |
| 1393 } | 1388 } |
| OLD | NEW |