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

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

Issue 14624010: Change MessagePumpLinux to MessagePumpOzone (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | « ui/ui.gyp ('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) 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 'conditions': [ 7 'conditions': [
8 ['inside_chromium_build==0', { 8 ['inside_chromium_build==0', {
9 'webkit_src_dir': '../../../../..', 9 'webkit_src_dir': '../../../../..',
10 },{ 10 },{
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 'sources!': [ 400 'sources!': [
401 'webcursor_mac.mm', 401 'webcursor_mac.mm',
402 'webcursor_win.cc', 402 'webcursor_win.cc',
403 ], 403 ],
404 }], 404 }],
405 ['use_aura==1 and use_x11==1', { 405 ['use_aura==1 and use_x11==1', {
406 'link_settings': { 406 'link_settings': {
407 'libraries': [ '-lXcursor', ], 407 'libraries': [ '-lXcursor', ],
408 }, 408 },
409 }], 409 }],
410 ['use_messagepump_linux==0', { 410 ['use_ozone==0', {
411 'sources!': [ 411 'sources!': [
412 'webcursor_null.cc', 412 'webcursor_null.cc',
413 ], 413 ],
414 }], 414 }],
415 ['use_aura==1 and OS=="win"', { 415 ['use_aura==1 and OS=="win"', {
416 'sources/': [ 416 'sources/': [
417 ['exclude', '^\\.\\./plugins/npapi/webplugin_delegate_impl_aura'], 417 ['exclude', '^\\.\\./plugins/npapi/webplugin_delegate_impl_aura'],
418 ], 418 ],
419 }], 419 }],
420 ['OS!="mac"', { 420 ['OS!="mac"', {
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 'variables': { 508 'variables': {
509 'jni_gen_package': 'webkit', 509 'jni_gen_package': 'webkit',
510 'input_java_class': 'android/widget/OverScroller.class', 510 'input_java_class': 'android/widget/OverScroller.class',
511 }, 511 },
512 'includes': [ '../../build/jar_file_jni_generator.gypi' ], 512 'includes': [ '../../build/jar_file_jni_generator.gypi' ],
513 }, 513 },
514 ], 514 ],
515 }], 515 }],
516 ], 516 ],
517 } 517 }
OLDNEW
« no previous file with comments | « ui/ui.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698