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

Side by Side Diff: webkit/glue/webkit_glue.gypi

Issue 8114025: fix _x11 exclusion rule for webkit_glue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 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 | no next file » | 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 'conditions': [ 7 'conditions': [
8 ['inside_chromium_build==0', { 8 ['inside_chromium_build==0', {
9 'webkit_src_dir': '../../../../..', 9 'webkit_src_dir': '../../../../..',
10 },{ 10 },{
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 ], 450 ],
451 # When glue is a dependency, it needs to be a hard dependency. 451 # When glue is a dependency, it needs to be a hard dependency.
452 # Dependents may rely on files generated by this target or one of its 452 # Dependents may rely on files generated by this target or one of its
453 # own hard dependencies. 453 # own hard dependencies.
454 'hard_dependency': 1, 454 'hard_dependency': 1,
455 'conditions': [ 455 'conditions': [
456 ['toolkit_uses_gtk == 1', { 456 ['toolkit_uses_gtk == 1', {
457 'dependencies': [ 457 'dependencies': [
458 '<(DEPTH)/build/linux/system.gyp:gtk', 458 '<(DEPTH)/build/linux/system.gyp:gtk',
459 ], 459 ],
460 'sources/': [['exclude', '_x11\\.cc$']],
460 'sources!': [ 461 'sources!': [
461 'plugins/plugin_stubs.cc', 462 'plugins/plugin_stubs.cc',
462 ], 463 ],
463 }, { # else: toolkit_uses_gtk != 1 464 }, { # else: toolkit_uses_gtk != 1
464 'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$'], 465 'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$'],
465 ['exclude', r'/gtk_']], 466 ['exclude', r'/gtk_']],
466 }], 467 }],
467 ['use_aura==1', { 468 ['use_aura==1', {
468 'sources/': [ 469 'sources/': [
469 ['exclude', '^../plugins/npapi/webplugin_delegate_impl_win.cc'], 470 ['exclude', '^../plugins/npapi/webplugin_delegate_impl_win.cc'],
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 }, 549 },
549 'includes': [ '../../build/grit_action.gypi' ], 550 'includes': [ '../../build/grit_action.gypi' ],
550 }, 551 },
551 ], 552 ],
552 'includes': [ '../../build/grit_target.gypi' ], 553 'includes': [ '../../build/grit_target.gypi' ],
553 }, 554 },
554 ], 555 ],
555 }], 556 }],
556 ], 557 ],
557 } 558 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698