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

Side by Side Diff: base/base.gypi

Issue 14597007: Support target/host architecture with ninja iOS builds (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rsleevei space 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
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 '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 646 matching lines...) Expand 10 before | Expand all | Expand 10 after
657 ], 657 ],
658 'sources/': [ 658 'sources/': [
659 ['include', '^files/file_path_watcher_linux\\.cc$'], 659 ['include', '^files/file_path_watcher_linux\\.cc$'],
660 ['include', '^process_util_linux\\.cc$'], 660 ['include', '^process_util_linux\\.cc$'],
661 ['include', '^posix/unix_domain_socket_linux\\.cc$'], 661 ['include', '^posix/unix_domain_socket_linux\\.cc$'],
662 ['include', '^strings/sys_string_conversions_posix\\.cc$'], 662 ['include', '^strings/sys_string_conversions_posix\\.cc$'],
663 ['include', '^sys_info_linux\\.cc$'], 663 ['include', '^sys_info_linux\\.cc$'],
664 ['include', '^worker_pool_linux\\.cc$'], 664 ['include', '^worker_pool_linux\\.cc$'],
665 ], 665 ],
666 }], 666 }],
667 ['OS == "ios"', { 667 ['OS == "ios"', {
stuartmorgan 2013/05/07 13:14:46 I think you want a !host on this too
justincohen 2013/05/07 14:50:57 Done.
668 'sources/': [ 668 'sources/': [
669 # Pull in specific Mac files for iOS (which have been filtered out 669 # Pull in specific Mac files for iOS (which have been filtered out
670 # by file name rules). 670 # by file name rules).
671 ['include', '^atomicops_internals_mac\\.'], 671 ['include', '^atomicops_internals_mac\\.'],
672 ['include', '^base_paths_mac\\.'], 672 ['include', '^base_paths_mac\\.'],
673 ['include', '^file_util_mac\\.'], 673 ['include', '^file_util_mac\\.'],
674 ['include', '^file_version_info_mac\\.'], 674 ['include', '^file_version_info_mac\\.'],
675 ['include', '^mac/bundle_locations\\.'], 675 ['include', '^mac/bundle_locations\\.'],
676 ['include', '^mac/foundation_util\\.'], 676 ['include', '^mac/foundation_util\\.'],
677 ['include', '^mac/mac_logging\\.'], 677 ['include', '^mac/mac_logging\\.'],
678 ['include', '^mac/objc_property_releaser\\.'], 678 ['include', '^mac/objc_property_releaser\\.'],
679 ['include', '^mac/scoped_mach_port\\.'], 679 ['include', '^mac/scoped_mach_port\\.'],
680 ['include', '^mac/scoped_nsautorelease_pool\\.'], 680 ['include', '^mac/scoped_nsautorelease_pool\\.'],
681 ['include', '^memory/discardable_memory_mac\\.'], 681 ['include', '^memory/discardable_memory_mac\\.'],
682 ['include', '^message_pump_mac\\.'], 682 ['include', '^message_pump_mac\\.'],
683 ['include', '^threading/platform_thread_mac\\.'], 683 ['include', '^threading/platform_thread_mac\\.'],
684 ['include', '^strings/sys_string_conversions_mac\\.'], 684 ['include', '^strings/sys_string_conversions_mac\\.'],
685 ['include', '^time_mac\\.'], 685 ['include', '^time_mac\\.'],
686 ['include', '^worker_pool_mac\\.'], 686 ['include', '^worker_pool_mac\\.'],
687 # Exclude all process_util except the minimal implementation 687 # Exclude all process_util except the minimal implementation
688 # needed on iOS (mostly for unit tests). 688 # needed on iOS (mostly for unit tests).
689 ['exclude', '^process_util'], 689 ['exclude', '^process_util'],
690 ['include', '^process_util_ios\\.mm$'], 690 ['include', '^process_util_ios\\.mm$'],
691 ], 691 ],
692 'sources!': [ 692 'sources!': [
693 'message_pump_libevent.cc' 693 'message_pump_libevent.cc'
694 ], 694 ],
695 }], 695 }],
696 ['OS == "ios" and _toolset == "host"', {
697 'sources/': [
698 ['include', '^process_util_mac\\.mm$'],
699 ['include', '^process_util_posix\\.cc'],
700 ['include', '^process_util\\.cc'],
stuartmorgan 2013/05/07 13:14:46 ... at which point you should be able to remove th
justincohen 2013/05/07 14:50:57 Done.
701 ['include', '_(cocoa|mac)(_unittest)?\\.(h|cc|mm?)$'],
stuartmorgan 2013/05/07 13:14:46 Can you stick a comment above this line that says
justincohen 2013/05/07 14:50:57 Done.
702 ['include', '(^|/)(cocoa|mac)/'],
703 ['exclude', '_ios(_unittest)?\\.(h|cc|mm?)$'],
704 ['exclude', '(^|/)ios/'],
705 ]
706 }],
696 ['OS != "mac" or >(nacl_untrusted_build)==1', { 707 ['OS != "mac" or >(nacl_untrusted_build)==1', {
697 'sources!': [ 708 'sources!': [
698 'mac/scoped_aedesc.h' 709 'mac/scoped_aedesc.h'
699 ], 710 ],
700 }], 711 }],
701 # For now, just test the *BSD platforms enough to exclude them. 712 # For now, just test the *BSD platforms enough to exclude them.
702 # Subsequent changes will include them further. 713 # Subsequent changes will include them further.
703 ['OS != "freebsd" or >(nacl_untrusted_build)==1', { 714 ['OS != "freebsd" or >(nacl_untrusted_build)==1', {
704 'sources/': [ ['exclude', '_freebsd\\.cc$'] ], 715 'sources/': [ ['exclude', '_freebsd\\.cc$'] ],
705 }, 716 },
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 ['<(use_system_nspr)==1 and >(nacl_untrusted_build)==0', { 786 ['<(use_system_nspr)==1 and >(nacl_untrusted_build)==0', {
776 'sources/': [ 787 'sources/': [
777 ['exclude', '^third_party/nspr/'], 788 ['exclude', '^third_party/nspr/'],
778 ], 789 ],
779 }], 790 }],
780 ], 791 ],
781 }], 792 }],
782 ], 793 ],
783 }, 794 },
784 } 795 }
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | breakpad/breakpad.gyp » ('j') | build/common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698