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

Side by Side Diff: base/base.gyp

Issue 7054041: Revert 87309 - Second attempt to fix linux redux builder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'base.gypi', 10 'base.gypi',
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 ['gcc_version==44', { 255 ['gcc_version==44', {
256 # Avoid gcc 4.4 strict aliasing issues in stl_tree.h when 256 # Avoid gcc 4.4 strict aliasing issues in stl_tree.h when
257 # building mru_cache_unittest.cc. 257 # building mru_cache_unittest.cc.
258 'cflags': [ 258 'cflags': [
259 '-fno-strict-aliasing', 259 '-fno-strict-aliasing',
260 ], 260 ],
261 }], 261 }],
262 ], 262 ],
263 'dependencies': [ 263 'dependencies': [
264 '../build/linux/system.gyp:gtk', 264 '../build/linux/system.gyp:gtk',
265 '../build/linux/system.gyp:ssl', 265 '../build/linux/system.gyp:nss',
266 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 266 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
267 ], 267 ],
268 }, { # toolkit_uses_gtk!=1 268 }, { # toolkit_uses_gtk!=1
269 'sources!': [ 269 'sources!': [
270 'message_pump_glib_unittest.cc', 270 'message_pump_glib_unittest.cc',
271 ] 271 ]
272 }], 272 }],
273 # This is needed to trigger the dll copy step on windows. 273 # This is needed to trigger the dll copy step on windows.
274 # TODO(mark): This should not be necessary. 274 # TODO(mark): This should not be necessary.
275 ['OS == "win"', { 275 ['OS == "win"', {
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 ], 383 ],
384 }], 384 }],
385 ], 385 ],
386 } 386 }
387 387
388 # Local Variables: 388 # Local Variables:
389 # tab-width:2 389 # tab-width:2
390 # indent-tabs-mode:nil 390 # indent-tabs-mode:nil
391 # End: 391 # End:
392 # vim: set expandtab tabstop=2 shiftwidth=2: 392 # vim: set expandtab tabstop=2 shiftwidth=2:
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