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

Side by Side Diff: base/base.gypi

Issue 3748002: Add a message pump for touchui=1 (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: gyp magic to fix build failure (hopefully). Created 10 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
« no previous file with comments | « no previous file | base/message_loop.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'base_extra_target': 0, 9 'base_extra_target': 0,
10 }, 10 },
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Fr ameworks', 326 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Fr ameworks',
327 ], 327 ],
328 'conditions': [ 328 'conditions': [
329 [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "so laris"', { 329 [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "so laris"', {
330 'sources/': [ 330 'sources/': [
331 ['exclude', '^nix/'], 331 ['exclude', '^nix/'],
332 ], 332 ],
333 'sources!': [ 333 'sources!': [
334 'atomicops_internals_x86_gcc.cc', 334 'atomicops_internals_x86_gcc.cc',
335 'message_pump_glib.cc', 335 'message_pump_glib.cc',
336 'message_pump_glib_x.cc',
336 ], 337 ],
337 }], 338 }],
338 [ 'OS != "linux"', { 339 [ 'OS != "linux"', {
339 'sources!': [ 340 'sources!': [
340 # Not automatically excluded by the *linux.cc rules. 341 # Not automatically excluded by the *linux.cc rules.
341 'gtk_util.cc', 342 'gtk_util.cc',
342 'gtk_util.h', 343 'gtk_util.h',
343 'linux_util.cc', 344 'linux_util.cc',
344 'setproctitle_linux.c', 345 'setproctitle_linux.c',
345 'setproctitle_linux.h', 346 'setproctitle_linux.h',
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 'hmac_nss.cc', 435 'hmac_nss.cc',
435 'hmac_win.cc', 436 'hmac_win.cc',
436 'image_util.cc', 437 'image_util.cc',
437 'image_util.h', 438 'image_util.h',
438 'linux_util.cc', 439 'linux_util.cc',
439 'linux_util.h', 440 'linux_util.h',
440 'md5.cc', 441 'md5.cc',
441 'md5.h', 442 'md5.h',
442 'message_pump_glib.cc', 443 'message_pump_glib.cc',
443 'message_pump_glib.h', 444 'message_pump_glib.h',
445 'message_pump_glib_x.cc',
446 'message_pump_glib_x.h',
444 'message_pump_libevent.cc', 447 'message_pump_libevent.cc',
445 'message_pump_libevent.h', 448 'message_pump_libevent.h',
446 'message_pump_mac.h', 449 'message_pump_mac.h',
447 'message_pump_mac.mm', 450 'message_pump_mac.mm',
448 'metrics/field_trial.cc', 451 'metrics/field_trial.cc',
449 'metrics/field_trial.h', 452 'metrics/field_trial.h',
450 'nsimage_cache_mac.h', 453 'nsimage_cache_mac.h',
451 'nsimage_cache_mac.mm', 454 'nsimage_cache_mac.mm',
452 'nss_util.cc', 455 'nss_util.cc',
453 'nss_util.h', 456 'nss_util.h',
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 ], 552 ],
550 }, 553 },
551 }, 554 },
552 ], 555 ],
553 ], 556 ],
554 'dependencies': [ 557 'dependencies': [
555 'symbolize', 558 'symbolize',
556 '../build/util/build_util.gyp:lastchange', 559 '../build/util/build_util.gyp:lastchange',
557 '../build/linux/system.gyp:gtk', 560 '../build/linux/system.gyp:gtk',
558 '../build/linux/system.gyp:nss', 561 '../build/linux/system.gyp:nss',
562 '../build/linux/system.gyp:x11',
559 'xdg_mime', 563 'xdg_mime',
560 ], 564 ],
561 'export_dependent_settings': [ 565 'export_dependent_settings': [
562 '../build/linux/system.gyp:gtk', 566 '../build/linux/system.gyp:gtk',
567 '../build/linux/system.gyp:x11',
563 ], 568 ],
564 },], 569 },],
565 [ 'OS == "freebsd" or OS == "openbsd"', { 570 [ 'OS == "freebsd" or OS == "openbsd"', {
566 'link_settings': { 571 'link_settings': {
567 'libraries': [ 572 'libraries': [
568 '-L/usr/local/lib -lexecinfo', 573 '-L/usr/local/lib -lexecinfo',
569 ], 574 ],
570 }, 575 },
571 }, 576 },
572 ], 577 ],
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 'include_dirs': [ 658 'include_dirs': [
654 '..', 659 '..',
655 ], 660 ],
656 }, 661 },
657 'conditions': [ 662 'conditions': [
658 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 663 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
659 'dependencies': [ 664 'dependencies': [
660 '../build/util/build_util.gyp:lastchange', 665 '../build/util/build_util.gyp:lastchange',
661 '../build/linux/system.gyp:gtk', 666 '../build/linux/system.gyp:gtk',
662 '../build/linux/system.gyp:nss', 667 '../build/linux/system.gyp:nss',
668 '../build/linux/system.gyp:x11',
663 'xdg_mime', 669 'xdg_mime',
664 ], 670 ],
665 'export_dependent_settings': [ 671 'export_dependent_settings': [
666 '../build/linux/system.gyp:gtk', 672 '../build/linux/system.gyp:gtk',
673 '../build/linux/system.gyp:x11',
667 ], 674 ],
668 },], 675 },],
669 ['OS == "linux"', { 676 ['OS == "linux"', {
670 'link_settings': { 677 'link_settings': {
671 'libraries': [ 678 'libraries': [
672 # We need rt for clock_gettime(). 679 # We need rt for clock_gettime().
673 '-lrt', 680 '-lrt',
674 # For 'native_library_linux.cc' 681 # For 'native_library_linux.cc'
675 '-ldl', 682 '-ldl',
676 ], 683 ],
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 'third_party/xdg_mime/xdgmimemagic.c', 747 'third_party/xdg_mime/xdgmimemagic.c',
741 'third_party/xdg_mime/xdgmimemagic.h', 748 'third_party/xdg_mime/xdgmimemagic.h',
742 'third_party/xdg_mime/xdgmimeparent.c', 749 'third_party/xdg_mime/xdgmimeparent.c',
743 'third_party/xdg_mime/xdgmimeparent.h', 750 'third_party/xdg_mime/xdgmimeparent.h',
744 ], 751 ],
745 }, 752 },
746 ], 753 ],
747 }], 754 }],
748 ], 755 ],
749 } 756 }
OLDNEW
« no previous file with comments | « no previous file | base/message_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698