| 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', ], |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 ], | 91 ], |
| 92 }], | 92 }], |
| 93 ['order_text_section!=""', { | 93 ['order_text_section!=""', { |
| 94 'target_conditions' : [ | 94 'target_conditions' : [ |
| 95 ['_toolset=="target"', { | 95 ['_toolset=="target"', { |
| 96 'ldflags': [ | 96 'ldflags': [ |
| 97 '-Wl,-section-ordering-file=<(order_text_section)' ], | 97 '-Wl,-section-ordering-file=<(order_text_section)' ], |
| 98 }], | 98 }], |
| 99 ] | 99 ] |
| 100 }], | 100 }], |
| 101 ['OS == "win"', { |
| 102 'dependencies': [ |
| 103 '../components/components.gyp:browser_watcher', |
| 104 '../components/components.gyp:browser_watcher_client', |
| 105 ], |
| 106 }], |
| 101 ['OS == "android"', { | 107 ['OS == "android"', { |
| 102 # Don't put the 'chrome' target in 'all' on android | 108 # Don't put the 'chrome' target in 'all' on android |
| 103 'suppress_wildcard': 1, | 109 'suppress_wildcard': 1, |
| 104 }], | 110 }], |
| 105 ['os_posix == 1 and OS != "mac" and OS != "android"', { | 111 ['os_posix == 1 and OS != "mac" and OS != "android"', { |
| 106 'actions': [ | 112 'actions': [ |
| 107 { | 113 { |
| 108 'action_name': 'manpage', | 114 'action_name': 'manpage', |
| 109 'conditions': [ | 115 'conditions': [ |
| 110 [ 'branding == "Chrome"', { | 116 [ 'branding == "Chrome"', { |
| (...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 686 'dependencies': [ | 692 'dependencies': [ |
| 687 'chrome_nacl_win64', | 693 'chrome_nacl_win64', |
| 688 ], | 694 ], |
| 689 }], | 695 }], |
| 690 ], | 696 ], |
| 691 }, | 697 }, |
| 692 ], | 698 ], |
| 693 }], | 699 }], |
| 694 ], | 700 ], |
| 695 } | 701 } |
| OLD | NEW |