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

Side by Side Diff: base/base.gypi

Issue 7473010: Adding Wayland message loop and gyp build deps (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 5 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 | base/message_loop.h » ('j') | base/message_pump_wayland.h » ('J')
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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'base_target': 0, 8 'base_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 '..', 357 '..',
358 ], 358 ],
359 # These warnings are needed for the files in third_party\dmg_fp. 359 # These warnings are needed for the files in third_party\dmg_fp.
360 'msvs_disabled_warnings': [ 360 'msvs_disabled_warnings': [
361 4244, 4554, 4018, 4102, 361 4244, 4554, 4018, 4102,
362 ], 362 ],
363 'mac_framework_dirs': [ 363 'mac_framework_dirs': [
364 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Fr ameworks', 364 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Fr ameworks',
365 ], 365 ],
366 'conditions': [ 366 'conditions': [
367 [ 'use_wayland == 1', {
368 'sources!': [
369 'message_pump_gtk.cc',
370 'message_pump_x.cc',
371 ],
372 }, {
373 'sources!': [
374 'message_pump_wayland.cc',
375 'message_pump_wayland.h',
376 ],
377 }],
367 [ 'toolkit_uses_gtk==0', { 378 [ 'toolkit_uses_gtk==0', {
368 'sources/': [ 379 'sources/': [
369 ['exclude', '^nix/'], 380 ['exclude', '^nix/'],
370 ], 381 ],
371 'sources!': [ 382 'sources!': [
372 'atomicops_internals_x86_gcc.cc', 383 'atomicops_internals_x86_gcc.cc',
373 'message_pump_glib.cc', 384 'message_pump_glib.cc',
374 'message_pump_gtk.cc', 385 'message_pump_gtk.cc',
375 'message_pump_x.cc', 386 'message_pump_x.cc',
376 ], 387 ],
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions', 458 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions',
448 ], 459 ],
449 # TODO(gregoryd): direct_dependent_settings should be shared with the 460 # TODO(gregoryd): direct_dependent_settings should be shared with the
450 # 64-bit target, but it doesn't work due to a bug in gyp 461 # 64-bit target, but it doesn't work due to a bug in gyp
451 'direct_dependent_settings': { 462 'direct_dependent_settings': {
452 'include_dirs': [ 463 'include_dirs': [
453 '..', 464 '..',
454 ], 465 ],
455 }, 466 },
456 'conditions': [ 467 'conditions': [
468 ['use_wayland == 1', {
469 'dependencies': [
470 '../build/linux/system.gyp:dbus-glib',
471 ],
472 }],
457 [ 'toolkit_uses_gtk==1', { 473 [ 'toolkit_uses_gtk==1', {
458 'conditions': [ 474 'conditions': [
459 [ 'chromeos==1', { 475 [ 'chromeos==1', {
460 'sources/': [ ['include', '_chromeos\\.cc$'] ] 476 'sources/': [ ['include', '_chromeos\\.cc$'] ]
461 }, 477 },
462 ], 478 ],
463 [ 'linux_use_tcmalloc==0', { 479 [ 'linux_use_tcmalloc==0', {
464 'defines': [ 480 'defines': [
465 'NO_TCMALLOC', 481 'NO_TCMALLOC',
466 ], 482 ],
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 'message_pump_glib.cc', 585 'message_pump_glib.cc',
570 'message_pump_glib.h', 586 'message_pump_glib.h',
571 'message_pump_gtk.cc', 587 'message_pump_gtk.cc',
572 'message_pump_gtk.h', 588 'message_pump_gtk.h',
573 'message_pump_x.cc', 589 'message_pump_x.cc',
574 'message_pump_x.h', 590 'message_pump_x.h',
575 'message_pump_libevent.cc', 591 'message_pump_libevent.cc',
576 'message_pump_libevent.h', 592 'message_pump_libevent.h',
577 'message_pump_mac.h', 593 'message_pump_mac.h',
578 'message_pump_mac.mm', 594 'message_pump_mac.mm',
595 'message_pump_wayland.cc',
596 'message_pump_wayland.h',
579 'metrics/field_trial.cc', 597 'metrics/field_trial.cc',
580 'metrics/field_trial.h', 598 'metrics/field_trial.h',
581 'string16.cc', 599 'string16.cc',
582 'string16.h', 600 'string16.h',
583 'sync_socket.h', 601 'sync_socket.h',
584 'sync_socket_win.cc', 602 'sync_socket_win.cc',
585 'sync_socket_posix.cc', 603 'sync_socket_posix.cc',
586 'time_mac.cc', 604 'time_mac.cc',
587 'time_posix.cc', 605 'time_posix.cc',
588 ], 606 ],
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 'third_party/xdg_mime/xdgmimemagic.c', 727 'third_party/xdg_mime/xdgmimemagic.c',
710 'third_party/xdg_mime/xdgmimemagic.h', 728 'third_party/xdg_mime/xdgmimemagic.h',
711 'third_party/xdg_mime/xdgmimeparent.c', 729 'third_party/xdg_mime/xdgmimeparent.c',
712 'third_party/xdg_mime/xdgmimeparent.h', 730 'third_party/xdg_mime/xdgmimeparent.h',
713 ], 731 ],
714 }, 732 },
715 ], 733 ],
716 }], 734 }],
717 ], 735 ],
718 } 736 }
OLDNEW
« no previous file with comments | « no previous file | base/message_loop.h » ('j') | base/message_pump_wayland.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698