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

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: Updating files Created 9 years, 4 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') | 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 '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 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 '..', 361 '..',
362 ], 362 ],
363 # These warnings are needed for the files in third_party\dmg_fp. 363 # These warnings are needed for the files in third_party\dmg_fp.
364 'msvs_disabled_warnings': [ 364 'msvs_disabled_warnings': [
365 4244, 4554, 4018, 4102, 365 4244, 4554, 4018, 4102,
366 ], 366 ],
367 'mac_framework_dirs': [ 367 'mac_framework_dirs': [
368 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Fr ameworks', 368 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Fr ameworks',
369 ], 369 ],
370 'conditions': [ 370 'conditions': [
371 [ 'use_wayland == 1', {
372 'sources!': [
373 'message_pump_gtk.cc',
374 'message_pump_x.cc',
375 ],
376 }],
371 [ 'toolkit_uses_gtk==0', { 377 [ 'toolkit_uses_gtk==0', {
372 'sources/': [ 378 'sources/': [
373 ['exclude', '^nix/'], 379 ['exclude', '^nix/'],
374 ], 380 ],
375 'sources!': [ 381 'sources!': [
376 'atomicops_internals_x86_gcc.cc', 382 'atomicops_internals_x86_gcc.cc',
377 'message_pump_glib.cc', 383 'message_pump_glib.cc',
378 'message_pump_gtk.cc', 384 'message_pump_gtk.cc',
379 'message_pump_x.cc', 385 'message_pump_x.cc',
380 ], 386 ],
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 'message_pump_glib.cc', 580 'message_pump_glib.cc',
575 'message_pump_glib.h', 581 'message_pump_glib.h',
576 'message_pump_gtk.cc', 582 'message_pump_gtk.cc',
577 'message_pump_gtk.h', 583 'message_pump_gtk.h',
578 'message_pump_x.cc', 584 'message_pump_x.cc',
579 'message_pump_x.h', 585 'message_pump_x.h',
580 'message_pump_libevent.cc', 586 'message_pump_libevent.cc',
581 'message_pump_libevent.h', 587 'message_pump_libevent.h',
582 'message_pump_mac.h', 588 'message_pump_mac.h',
583 'message_pump_mac.mm', 589 'message_pump_mac.mm',
590 'message_pump_wayland.cc',
591 'message_pump_wayland.h',
584 'metrics/field_trial.cc', 592 'metrics/field_trial.cc',
585 'metrics/field_trial.h', 593 'metrics/field_trial.h',
586 'string16.cc', 594 'string16.cc',
587 'string16.h', 595 'string16.h',
588 'sync_socket.h', 596 'sync_socket.h',
589 'sync_socket_win.cc', 597 'sync_socket_win.cc',
590 'sync_socket_posix.cc', 598 'sync_socket_posix.cc',
591 'time_mac.cc', 599 'time_mac.cc',
592 'time_posix.cc', 600 'time_posix.cc',
593 ], 601 ],
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 'third_party/xdg_mime/xdgmimemagic.c', 719 'third_party/xdg_mime/xdgmimemagic.c',
712 'third_party/xdg_mime/xdgmimemagic.h', 720 'third_party/xdg_mime/xdgmimemagic.h',
713 'third_party/xdg_mime/xdgmimeparent.c', 721 'third_party/xdg_mime/xdgmimeparent.c',
714 'third_party/xdg_mime/xdgmimeparent.h', 722 'third_party/xdg_mime/xdgmimeparent.h',
715 ], 723 ],
716 }, 724 },
717 ], 725 ],
718 }], 726 }],
719 ], 727 ],
720 } 728 }
OLDNEW
« no previous file with comments | « no previous file | base/message_loop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698