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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 148643002: Hide X11 dependencies when use_x11=0. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review Fix: remove blank lines Created 6 years, 10 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
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | gpu/tools/tools.gyp » ('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': 'none', 9 'type': 'none',
10 'dependencies': [ 'chrome_initial', ], 10 'dependencies': [ 'chrome_initial', ],
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 'installer_util', 194 'installer_util',
195 ], 195 ],
196 }, { # else toolkit_uses_gtk == 1 196 }, { # else toolkit_uses_gtk == 1
197 'dependencies': [ 197 'dependencies': [
198 # On Linux, link the dependencies (libraries) that make up actua l 198 # On Linux, link the dependencies (libraries) that make up actua l
199 # Chromium functionality directly into the executable. 199 # Chromium functionality directly into the executable.
200 '<@(chromium_browser_dependencies)', 200 '<@(chromium_browser_dependencies)',
201 '<@(chromium_child_dependencies)', 201 '<@(chromium_child_dependencies)',
202 '../content/content.gyp:content_app_both', 202 '../content/content.gyp:content_app_both',
203 # Needed for chrome_main.cc initialization of libraries. 203 # Needed for chrome_main.cc initialization of libraries.
204 '../build/linux/system.gyp:x11',
205 '../build/linux/system.gyp:pangocairo', 204 '../build/linux/system.gyp:pangocairo',
206 '../build/linux/system.gyp:xext',
207 # Needed to use the master_preferences functions 205 # Needed to use the master_preferences functions
208 'installer_util', 206 'installer_util',
209 ], 207 ],
210 }], 208 }],
209 # x11 build. Needed for chrome_main.cc initialization of libraries.
210 ['use_x11==1', {
211 'dependencies': [
212 '../build/linux/system.gyp:x11',
213 '../build/linux/system.gyp:xext',
214 ],
215 }],
211 ], 216 ],
212 'sources': [ 217 'sources': [
213 'app/chrome_dll_resource.h', 218 'app/chrome_dll_resource.h',
214 'app/chrome_main.cc', 219 'app/chrome_main.cc',
215 'app/chrome_main_delegate.cc', 220 'app/chrome_main_delegate.cc',
216 'app/chrome_main_delegate.h', 221 'app/chrome_main_delegate.h',
217 ], 222 ],
218 }], 223 }],
219 ['OS=="mac"', { 224 ['OS=="mac"', {
220 # 'branding' is a variable defined in common.gypi 225 # 'branding' is a variable defined in common.gypi
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 'dependencies': [ 698 'dependencies': [
694 'chrome_nacl_win64', 699 'chrome_nacl_win64',
695 ], 700 ],
696 }], 701 }],
697 ], 702 ],
698 }, 703 },
699 ], 704 ],
700 }], 705 }],
701 ], 706 ],
702 } 707 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | gpu/tools/tools.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698