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

Side by Side Diff: base/base.gyp

Issue 24160005: Move ui/base/x/x11_error_tracker to base/x11. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 3 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 | « no previous file | base/base.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 '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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 ['exclude', '_nss\\.cc$'], 69 ['exclude', '_nss\\.cc$'],
70 ], 70 ],
71 }], 71 }],
72 ['use_x11==1', { 72 ['use_x11==1', {
73 'dependencies': [ 73 'dependencies': [
74 '../build/linux/system.gyp:x11', 74 '../build/linux/system.gyp:x11',
75 ], 75 ],
76 'export_dependent_settings': [ 76 'export_dependent_settings': [
77 '../build/linux/system.gyp:x11', 77 '../build/linux/system.gyp:x11',
78 ], 78 ],
79 }, { # use_11==0
Daniel Erat 2013/09/23 14:42:09 nit: use_x11 but do you even need this? it looks
kcwu 2013/09/23 15:46:08 Done. Thanks. I didn't know these rules.
80 'sources/': [
81 ['exclude', 'base/x11/*'],
82 ],
79 }], 83 }],
80 ['OS == "android" and _toolset == "host"', { 84 ['OS == "android" and _toolset == "host"', {
81 # Always build base as a static_library for host toolset, even if 85 # Always build base as a static_library for host toolset, even if
82 # we're doing a component build. Specifically, we only care about the 86 # we're doing a component build. Specifically, we only care about the
83 # target toolset using components since that's what developers are 87 # target toolset using components since that's what developers are
84 # focusing on. In theory we should do this more generally for all 88 # focusing on. In theory we should do this more generally for all
85 # targets when building for host, but getting the gyp magic 89 # targets when building for host, but getting the gyp magic
86 # per-toolset for the "component" variable is hard, and we really only 90 # per-toolset for the "component" variable is hard, and we really only
87 # need base on host. 91 # need base on host.
88 'type': 'static_library', 92 'type': 'static_library',
(...skipping 1242 matching lines...) Expand 10 before | Expand all | Expand 10 after
1331 'base_unittests.isolate', 1335 'base_unittests.isolate',
1332 ], 1336 ],
1333 'sources': [ 1337 'sources': [
1334 'base_unittests.isolate', 1338 'base_unittests.isolate',
1335 ], 1339 ],
1336 }, 1340 },
1337 ], 1341 ],
1338 }], 1342 }],
1339 ], 1343 ],
1340 } 1344 }
OLDNEW
« no previous file with comments | « no previous file | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698