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

Side by Side Diff: base/base.gyp

Issue 12563002: x11: Include X11 dependencies only when building with X11. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 9 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 | « no previous file | build/linux/system.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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 '../build/linux/system.gyp:gtk', 55 '../build/linux/system.gyp:gtk',
56 ], 56 ],
57 'export_dependent_settings': [ 57 'export_dependent_settings': [
58 '../build/linux/system.gyp:gtk', 58 '../build/linux/system.gyp:gtk',
59 ], 59 ],
60 }], 60 }],
61 ], 61 ],
62 'dependencies': [ 62 'dependencies': [
63 'symbolize', 63 'symbolize',
64 '../build/linux/system.gyp:glib', 64 '../build/linux/system.gyp:glib',
65 '../build/linux/system.gyp:x11',
66 'xdg_mime', 65 'xdg_mime',
67 ], 66 ],
68 'defines': [ 67 'defines': [
69 'USE_SYMBOLIZE', 68 'USE_SYMBOLIZE',
70 ], 69 ],
71 'cflags': [ 70 'cflags': [
72 '-Wno-write-strings', 71 '-Wno-write-strings',
73 ], 72 ],
74 'export_dependent_settings': [ 73 'export_dependent_settings': [
75 '../build/linux/system.gyp:glib', 74 '../build/linux/system.gyp:glib',
76 '../build/linux/system.gyp:x11',
77 ], 75 ],
78 }, { # use_glib!=1 76 }, { # use_glib!=1
79 'sources/': [ 77 'sources/': [
80 ['exclude', '/xdg_user_dirs/'], 78 ['exclude', '/xdg_user_dirs/'],
81 ['exclude', '_nss\\.cc$'], 79 ['exclude', '_nss\\.cc$'],
82 ], 80 ],
83 }], 81 }],
82 ['use_x11==1', {
83 'dependencies': [
84 '../build/linux/system.gyp:x11',
85 ],
86 'export_dependent_settings': [
87 '../build/linux/system.gyp:x11',
88 ],
89 }],
84 ['OS == "android" and _toolset == "host"', { 90 ['OS == "android" and _toolset == "host"', {
85 # Base for host support is the minimum required to run the 91 # Base for host support is the minimum required to run the
86 # ssl false start blacklist tool. It requires further changes 92 # ssl false start blacklist tool. It requires further changes
87 # to generically support host builds (and tests). 93 # to generically support host builds (and tests).
88 # Note: when building for host, gyp has OS == "android", 94 # Note: when building for host, gyp has OS == "android",
89 # hence the *_android.cc files are included but the actual code 95 # hence the *_android.cc files are included but the actual code
90 # doesn't have OS_ANDROID / ANDROID defined. 96 # doesn't have OS_ANDROID / ANDROID defined.
91 'conditions': [ 97 'conditions': [
92 # Host build on linux depends on system.gyp::gtk as 98 # Host build on linux depends on system.gyp::gtk as
93 # default linux build has TOOLKIT_GTK defined. 99 # default linux build has TOOLKIT_GTK defined.
(...skipping 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after
1209 'base_unittests.isolate', 1215 'base_unittests.isolate',
1210 ], 1216 ],
1211 'sources': [ 1217 'sources': [
1212 'base_unittests.isolate', 1218 'base_unittests.isolate',
1213 ], 1219 ],
1214 }, 1220 },
1215 ], 1221 ],
1216 }], 1222 }],
1217 ], 1223 ],
1218 } 1224 }
OLDNEW
« no previous file with comments | « no previous file | build/linux/system.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698