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

Side by Side Diff: remoting/remoting_host.gypi

Issue 177353002: Add use_allocator instead of linux_use_tcmalloc to switch the allocator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 9 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 | « printing/printing.gyp ('k') | remoting/remoting_host_linux.gypi » ('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) 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 'includes': [ 6 'includes': [
7 'remoting_host_linux.gypi', 7 'remoting_host_linux.gypi',
8 'remoting_host_mac.gypi', 8 'remoting_host_mac.gypi',
9 'remoting_host_win.gypi', 9 'remoting_host_win.gypi',
10 ], 10 ],
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 }, 736 },
737 'action': [ 737 'action': [
738 '<(dump_product_syms_path)', 738 '<(dump_product_syms_path)',
739 '<(version_full)', 739 '<(version_full)',
740 ], 740 ],
741 }, # end of postbuild 'dump_symbols' 741 }, # end of postbuild 'dump_symbols'
742 ], # end of 'postbuilds' 742 ], # end of 'postbuilds'
743 }], # mac_breakpad==1 743 }], # mac_breakpad==1
744 ], # conditions 744 ], # conditions
745 }], # OS=mac 745 }], # OS=mac
746 ['OS=="linux" and linux_use_tcmalloc==1', { 746 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
747 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_us e_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
747 'dependencies': [ 748 'dependencies': [
748 '../base/allocator/allocator.gyp:allocator', 749 '../base/allocator/allocator.gyp:allocator',
749 ], 750 ],
750 }], # OS=linux 751 }], # OS=linux
751 ], # end of 'conditions' 752 ], # end of 'conditions'
752 }, # end of target 'remoting_me2me_host' 753 }, # end of target 'remoting_me2me_host'
753 { 754 {
754 'target_name': 'remoting_me2me_native_messaging_host', 755 'target_name': 'remoting_me2me_native_messaging_host',
755 'type': 'executable', 756 'type': 'executable',
756 'product_name': 'remoting_native_messaging_host', 757 'product_name': 'remoting_native_messaging_host',
757 'variables': { 'enable_wexit_time_destructors': 1, }, 758 'variables': { 'enable_wexit_time_destructors': 1, },
758 'dependencies': [ 759 'dependencies': [
759 '../base/base.gyp:base', 760 '../base/base.gyp:base',
760 'remoting_host', 761 'remoting_host',
761 'remoting_host_setup_base', 762 'remoting_host_setup_base',
762 'remoting_native_messaging_base', 763 'remoting_native_messaging_base',
763 ], 764 ],
764 'sources': [ 765 'sources': [
765 'host/setup/me2me_native_messaging_host.cc', 766 'host/setup/me2me_native_messaging_host.cc',
766 'host/setup/me2me_native_messaging_host.h', 767 'host/setup/me2me_native_messaging_host.h',
767 'host/setup/me2me_native_messaging_host_entry_point.cc', 768 'host/setup/me2me_native_messaging_host_entry_point.cc',
768 'host/setup/me2me_native_messaging_host_main.cc', 769 'host/setup/me2me_native_messaging_host_main.cc',
769 'host/setup/me2me_native_messaging_host_main.h', 770 'host/setup/me2me_native_messaging_host_main.h',
770 ], 771 ],
771 'conditions': [ 772 'conditions': [
772 ['OS=="linux" and linux_use_tcmalloc==1', { 773 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
774 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_us e_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
773 'dependencies': [ 775 'dependencies': [
774 '../base/allocator/allocator.gyp:allocator', 776 '../base/allocator/allocator.gyp:allocator',
775 ], 777 ],
776 }], 778 }],
777 ], 779 ],
778 }, # end of target 'remoting_me2me_native_messaging_host' 780 }, # end of target 'remoting_me2me_native_messaging_host'
779 { 781 {
780 'target_name': 'remoting_it2me_native_messaging_host', 782 'target_name': 'remoting_it2me_native_messaging_host',
781 'type': 'executable', 783 'type': 'executable',
782 'variables': { 'enable_wexit_time_destructors': 1, }, 784 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 11 matching lines...) Expand all
794 'host/it2me/it2me_native_messaging_host_main.cc', 796 'host/it2me/it2me_native_messaging_host_main.cc',
795 'host/it2me/it2me_native_messaging_host_main.h', 797 'host/it2me/it2me_native_messaging_host_main.h',
796 ], 798 ],
797 'conditions': [ 799 'conditions': [
798 ['OS=="linux"', { 800 ['OS=="linux"', {
799 'dependencies': [ 801 'dependencies': [
800 # Always use GTK on Linux, even for Aura builds. 802 # Always use GTK on Linux, even for Aura builds.
801 '../build/linux/system.gyp:gtk', 803 '../build/linux/system.gyp:gtk',
802 ], 804 ],
803 }], 805 }],
804 ['OS=="linux" and linux_use_tcmalloc==1', { 806 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
807 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_us e_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
805 'dependencies': [ 808 'dependencies': [
806 '../base/allocator/allocator.gyp:allocator', 809 '../base/allocator/allocator.gyp:allocator',
807 ], 810 ],
808 }], 811 }],
809 ], 812 ],
810 }, # end of target 'remoting_it2me_native_messaging_host' 813 }, # end of target 'remoting_it2me_native_messaging_host'
811 ], # end of 'targets' 814 ], # end of 'targets'
812 }], # OS!="win" 815 }], # OS!="win"
813 816
814 ], # end of 'conditions' 817 ], # end of 'conditions'
815 } 818 }
OLDNEW
« no previous file with comments | « printing/printing.gyp ('k') | remoting/remoting_host_linux.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698