Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(956)

Side by Side Diff: chrome/chrome_exe.gypi

Issue 14794004: Add chrome_split_dll gyp variable, and duplicate chrome_main_dll target (reland) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: browser in condition Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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': 'executable', 9 'type': 'executable',
10 'mac_bundle': 1, 10 'mac_bundle': 1,
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 'files': ['app/theme/chromium/product_logo_48.png'] 135 'files': ['app/theme/chromium/product_logo_48.png']
136 }], 136 }],
137 ], 137 ],
138 }, 138 },
139 ], 139 ],
140 }], 140 }],
141 ['toolkit_uses_gtk == 1', { 141 ['toolkit_uses_gtk == 1', {
142 'dependencies': [ 142 'dependencies': [
143 # On Linux, link the dependencies (libraries) that make up actua l 143 # On Linux, link the dependencies (libraries) that make up actua l
144 # Chromium functionality directly into the executable. 144 # Chromium functionality directly into the executable.
145 '<@(chromium_dependencies)', 145 '<@(chromium_browser_dependencies)',
146 '<@(chromium_child_dependencies)',
146 # Needed for chrome_main.cc initialization of libraries. 147 # Needed for chrome_main.cc initialization of libraries.
147 '../build/linux/system.gyp:gtk', 148 '../build/linux/system.gyp:gtk',
148 # Needed to use the master_preferences functions 149 # Needed to use the master_preferences functions
149 'installer_util', 150 'installer_util',
150 ], 151 ],
151 }, { # else toolkit_uses_gtk == 1 152 }, { # else toolkit_uses_gtk == 1
152 'dependencies': [ 153 'dependencies': [
153 # On Linux, link the dependencies (libraries) that make up actua l 154 # On Linux, link the dependencies (libraries) that make up actua l
154 # Chromium functionality directly into the executable. 155 # Chromium functionality directly into the executable.
155 '<@(chromium_dependencies)', 156 '<@(chromium_browser_dependencies)',
157 '<@(chromium_child_dependencies)',
156 # Needed for chrome_main.cc initialization of libraries. 158 # Needed for chrome_main.cc initialization of libraries.
157 '../build/linux/system.gyp:x11', 159 '../build/linux/system.gyp:x11',
158 '../build/linux/system.gyp:pangocairo', 160 '../build/linux/system.gyp:pangocairo',
159 '../build/linux/system.gyp:xext', 161 '../build/linux/system.gyp:xext',
160 # Needed to use the master_preferences functions 162 # Needed to use the master_preferences functions
161 'installer_util', 163 'installer_util',
162 ], 164 ],
163 }], 165 }],
164 ], 166 ],
165 'sources': [ 167 'sources': [
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 'dependencies': [ 625 'dependencies': [
624 'chrome_nacl_win64', 626 'chrome_nacl_win64',
625 ], 627 ],
626 }], 628 }],
627 ], 629 ],
628 }, 630 },
629 ], 631 ],
630 }], 632 }],
631 ], 633 ],
632 } 634 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698