| 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 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'chrome', | 8 'target_name': 'chrome', |
| 9 'type': 'none', | 9 'type': 'none', |
| 10 'dependencies': [ 'chrome_initial', ], | 10 'dependencies': [ 'chrome_initial', ], |
| 11 'conditions': [ | 11 'conditions': [ |
| 12 ['OS=="linux" and clang_type_profiler==1', { | |
| 13 'dependencies!': [ | |
| 14 '<(DEPTH)/base/allocator/allocator.gyp:type_profiler', | |
| 15 ], | |
| 16 }], | |
| 17 ['OS == "win"', { | 12 ['OS == "win"', { |
| 18 'actions': [ | 13 'actions': [ |
| 19 { | 14 { |
| 20 'variables': { | 15 'variables': { |
| 21 'reorder_py_path': '<(DEPTH)/build/win/reorder-imports.py', | 16 'reorder_py_path': '<(DEPTH)/build/win/reorder-imports.py', |
| 22 # See comment in chrome_dll.gypi in the hardlink_to_output | 17 # See comment in chrome_dll.gypi in the hardlink_to_output |
| 23 # target for why this cannot be 'initial' like the DLL. | 18 # target for why this cannot be 'initial' like the DLL. |
| 24 'exe_input_path':'$(OutDir)\\initialexe', | 19 'exe_input_path':'$(OutDir)\\initialexe', |
| 25 'exe_output_path':'<(PRODUCT_DIR)', | 20 'exe_output_path':'<(PRODUCT_DIR)', |
| 26 }, | 21 }, |
| (...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 662 'dependencies': [ | 657 'dependencies': [ |
| 663 'chrome_nacl_win64', | 658 'chrome_nacl_win64', |
| 664 ], | 659 ], |
| 665 }], | 660 }], |
| 666 ], | 661 ], |
| 667 }, | 662 }, |
| 668 ], | 663 ], |
| 669 }], | 664 }], |
| 670 ], | 665 ], |
| 671 } | 666 } |
| OLD | NEW |