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

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

Issue 7840010: Revert 99810 - Get the rest of the chrome target to build (but not link) with USE_AURA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « printing/printing_context_win.cc ('k') | 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 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 'dependencies': [ 454 'dependencies': [
455 '<(DEPTH)/build/linux/system.gyp:gtk', 455 '<(DEPTH)/build/linux/system.gyp:gtk',
456 ], 456 ],
457 'sources!': [ 457 'sources!': [
458 'plugins/plugin_stubs.cc', 458 'plugins/plugin_stubs.cc',
459 ], 459 ],
460 }, { # else: toolkit_uses_gtk != 1 460 }, { # else: toolkit_uses_gtk != 1
461 'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$'], 461 'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$'],
462 ['exclude', r'/gtk_']], 462 ['exclude', r'/gtk_']],
463 }], 463 }],
464 ['use_aura==1', {
465 'sources/': [
466 ['exclude', '^../plugins/npapi/webplugin_delegate_impl_win.cc'],
467 ],
468 }],
469 ['OS!="mac"', { 464 ['OS!="mac"', {
470 'sources/': [['exclude', '_mac\\.(cc|mm)$']], 465 'sources/': [['exclude', '_mac\\.(cc|mm)$']],
471 'sources!': [ 466 'sources!': [
472 'webthemeengine_impl_mac.cc', 467 'webthemeengine_impl_mac.cc',
473 ], 468 ],
474 }, { # else: OS=="mac" 469 }, { # else: OS=="mac"
475 'sources/': [['exclude', 'plugin_(lib|list)_posix\\.cc$']], 470 'sources/': [['exclude', 'plugin_(lib|list)_posix\\.cc$']],
476 'link_settings': { 471 'link_settings': {
477 'libraries': [ 472 'libraries': [
478 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 473 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 }, 540 },
546 'includes': [ '../../build/grit_action.gypi' ], 541 'includes': [ '../../build/grit_action.gypi' ],
547 }, 542 },
548 ], 543 ],
549 'includes': [ '../../build/grit_target.gypi' ], 544 'includes': [ '../../build/grit_target.gypi' ],
550 }, 545 },
551 ], 546 ],
552 }], 547 }],
553 ], 548 ],
554 } 549 }
OLDNEW
« no previous file with comments | « printing/printing_context_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698