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

Side by Side Diff: remoting/remoting_host.gypi

Issue 258433005: Remove {linux|android}_use_tcmalloc and switch to use_allocator in Chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 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 | 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 734 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 }, 745 },
746 'action': [ 746 'action': [
747 '<(dump_product_syms_path)', 747 '<(dump_product_syms_path)',
748 '<(version_full)', 748 '<(version_full)',
749 ], 749 ],
750 }, # end of postbuild 'dump_symbols' 750 }, # end of postbuild 'dump_symbols'
751 ], # end of 'postbuilds' 751 ], # end of 'postbuilds'
752 }], # mac_breakpad==1 752 }], # mac_breakpad==1
753 ], # conditions 753 ], # conditions
754 }], # OS=mac 754 }], # OS=mac
755 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 755 ['OS=="linux" and use_allocator!="none"', {
756 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_us e_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
757 'dependencies': [ 756 'dependencies': [
758 '../base/allocator/allocator.gyp:allocator', 757 '../base/allocator/allocator.gyp:allocator',
759 ], 758 ],
760 }], # OS=linux 759 }], # OS=linux
761 ], # end of 'conditions' 760 ], # end of 'conditions'
762 }, # end of target 'remoting_me2me_host' 761 }, # end of target 'remoting_me2me_host'
763 { 762 {
764 'target_name': 'remoting_me2me_native_messaging_host', 763 'target_name': 'remoting_me2me_native_messaging_host',
765 'type': 'executable', 764 'type': 'executable',
766 'product_name': 'native_messaging_host', 765 'product_name': 'native_messaging_host',
(...skipping 10 matching lines...) Expand all
777 'VERSION=<(version_full)', 776 'VERSION=<(version_full)',
778 ], 777 ],
779 'sources': [ 778 'sources': [
780 'host/setup/me2me_native_messaging_host.cc', 779 'host/setup/me2me_native_messaging_host.cc',
781 'host/setup/me2me_native_messaging_host.h', 780 'host/setup/me2me_native_messaging_host.h',
782 'host/setup/me2me_native_messaging_host_entry_point.cc', 781 'host/setup/me2me_native_messaging_host_entry_point.cc',
783 'host/setup/me2me_native_messaging_host_main.cc', 782 'host/setup/me2me_native_messaging_host_main.cc',
784 'host/setup/me2me_native_messaging_host_main.h', 783 'host/setup/me2me_native_messaging_host_main.h',
785 ], 784 ],
786 'conditions': [ 785 'conditions': [
787 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 786 ['OS=="linux" and use_allocator!="none"', {
788 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_us e_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
789 'dependencies': [ 787 'dependencies': [
790 '../base/allocator/allocator.gyp:allocator', 788 '../base/allocator/allocator.gyp:allocator',
791 ], 789 ],
792 }], 790 }],
793 ['OS=="mac"', { 791 ['OS=="mac"', {
794 'mac_bundle': 1, 792 'mac_bundle': 1,
795 'variables': { 793 'variables': {
796 'host_bundle_id': '<!(python <(version_py_path) -f <(branding_p ath) -t "@MAC_NATIVE_MESSAGING_HOST_BUNDLE_ID@")', 794 'host_bundle_id': '<!(python <(version_py_path) -f <(branding_p ath) -t "@MAC_NATIVE_MESSAGING_HOST_BUNDLE_ID@")',
797 }, 795 },
798 'xcode_settings': { 796 'xcode_settings': {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
870 'host/it2me/it2me_native_messaging_host_main.cc', 868 'host/it2me/it2me_native_messaging_host_main.cc',
871 'host/it2me/it2me_native_messaging_host_main.h', 869 'host/it2me/it2me_native_messaging_host_main.h',
872 ], 870 ],
873 'conditions': [ 871 'conditions': [
874 ['OS=="linux"', { 872 ['OS=="linux"', {
875 'dependencies': [ 873 'dependencies': [
876 # Always use GTK on Linux, even for Aura builds. 874 # Always use GTK on Linux, even for Aura builds.
877 '../build/linux/system.gyp:gtk', 875 '../build/linux/system.gyp:gtk',
878 ], 876 ],
879 }], 877 }],
880 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 878 ['OS=="linux" and use_allocator!="none"', {
881 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_us e_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
882 'dependencies': [ 879 'dependencies': [
883 '../base/allocator/allocator.gyp:allocator', 880 '../base/allocator/allocator.gyp:allocator',
884 ], 881 ],
885 }], 882 }],
886 ['OS=="mac"', { 883 ['OS=="mac"', {
887 'mac_bundle': 1, 884 'mac_bundle': 1,
888 'variables': { 885 'variables': {
889 'host_bundle_id': '<!(python <(version_py_path) -f <(branding_p ath) -t "@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_ID@")', 886 'host_bundle_id': '<!(python <(version_py_path) -f <(branding_p ath) -t "@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_ID@")',
890 }, 887 },
891 'xcode_settings': { 888 'xcode_settings': {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 }], # mac_breakpad==1 937 }], # mac_breakpad==1
941 ], # conditions 938 ], # conditions
942 }], # OS=mac 939 }], # OS=mac
943 ], 940 ],
944 }, # end of target 'remoting_it2me_native_messaging_host' 941 }, # end of target 'remoting_it2me_native_messaging_host'
945 ], # end of 'targets' 942 ], # end of 'targets'
946 }], # OS!="win" 943 }], # OS!="win"
947 944
948 ], # end of 'conditions' 945 ], # end of 'conditions'
949 } 946 }
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