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

Side by Side Diff: base/base.gyp

Issue 17076009: linux: tcmalloc does not depend on glib (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove another assumption that glib means linux Created 7 years, 6 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 | no next file » | 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 22 matching lines...) Expand all
33 'include_dirs': [ 33 'include_dirs': [
34 '..', 34 '..',
35 ], 35 ],
36 }, 36 },
37 'conditions': [ 37 'conditions': [
38 ['use_glib==1', { 38 ['use_glib==1', {
39 'conditions': [ 39 'conditions': [
40 ['chromeos==1', { 40 ['chromeos==1', {
41 'sources/': [ ['include', '_chromeos\\.cc$'] ] 41 'sources/': [ ['include', '_chromeos\\.cc$'] ]
42 }], 42 }],
43 ['linux_use_tcmalloc==0', {
44 'defines': [
45 'NO_TCMALLOC',
46 ],
47 'direct_dependent_settings': {
48 'defines': [
49 'NO_TCMALLOC',
50 ],
51 },
52 }],
53 ['toolkit_uses_gtk==1', { 43 ['toolkit_uses_gtk==1', {
54 'dependencies': [ 44 'dependencies': [
55 '../build/linux/system.gyp:gtk', 45 '../build/linux/system.gyp:gtk',
56 ], 46 ],
57 'export_dependent_settings': [ 47 'export_dependent_settings': [
58 '../build/linux/system.gyp:gtk', 48 '../build/linux/system.gyp:gtk',
59 ], 49 ],
60 }], 50 }],
61 ], 51 ],
62 'dependencies': [ 52 'dependencies': [
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 }], 170 }],
181 ['OS == "linux"', { 171 ['OS == "linux"', {
182 'link_settings': { 172 'link_settings': {
183 'libraries': [ 173 'libraries': [
184 # We need rt for clock_gettime(). 174 # We need rt for clock_gettime().
185 '-lrt', 175 '-lrt',
186 # For 'native_library_linux.cc' 176 # For 'native_library_linux.cc'
187 '-ldl', 177 '-ldl',
188 ], 178 ],
189 }, 179 },
180 'conditions': [
181 ['linux_use_tcmalloc==0', {
182 'defines': [
183 'NO_TCMALLOC',
184 ],
185 'direct_dependent_settings': {
186 'defines': [
187 'NO_TCMALLOC',
188 ],
189 },
190 }],
191 ],
190 }], 192 }],
191 ['OS == "mac" or (OS == "ios" and _toolset == "host")', { 193 ['OS == "mac" or (OS == "ios" and _toolset == "host")', {
192 'link_settings': { 194 'link_settings': {
193 'libraries': [ 195 'libraries': [
194 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', 196 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
195 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framewor k', 197 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framewor k',
196 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', 198 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
197 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', 199 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
198 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 200 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
199 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework', 201 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 }, 719 },
718 'includes': [ '../build/copy_test_data_ios.gypi' ], 720 'includes': [ '../build/copy_test_data_ios.gypi' ],
719 }, 721 },
720 ], 722 ],
721 }], 723 }],
722 ['use_glib==1', { 724 ['use_glib==1', {
723 'sources!': [ 725 'sources!': [
724 'file_version_info_unittest.cc', 726 'file_version_info_unittest.cc',
725 ], 727 ],
726 'conditions': [ 728 'conditions': [
727 [ 'linux_use_tcmalloc==1', {
728 'dependencies': [
729 'allocator/allocator.gyp:allocator',
730 ],
731 },
732 ],
733 [ 'toolkit_uses_gtk==1', { 729 [ 'toolkit_uses_gtk==1', {
734 'sources': [ 730 'sources': [
735 'nix/xdg_util_unittest.cc', 731 'nix/xdg_util_unittest.cc',
736 ], 732 ],
737 'dependencies': [ 733 'dependencies': [
738 '../build/linux/system.gyp:gtk', 734 '../build/linux/system.gyp:gtk',
739 ] 735 ]
740 }], 736 }],
741 ], 737 ],
742 'dependencies': [ 738 'dependencies': [
743 '../build/linux/system.gyp:glib', 739 '../build/linux/system.gyp:glib',
744 '../build/linux/system.gyp:ssl', 740 '../build/linux/system.gyp:ssl',
745 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 741 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
746 ], 742 ],
747 }, { # use_glib!=1 743 }, { # use_glib!=1
748 'sources!': [ 744 'sources!': [
749 'message_pump_glib_unittest.cc', 745 'message_pump_glib_unittest.cc',
750 ] 746 ]
751 }], 747 }],
752 ['use_ozone == 1', { 748 ['use_ozone == 1', {
753 'sources!': [ 749 'sources!': [
754 'message_pump_glib_unittest.cc', 750 'message_pump_glib_unittest.cc',
755 ] 751 ]
756 }], 752 }],
753 ['OS == "linux" and linux_use_tcmalloc==1', {
754 'dependencies': [
755 'allocator/allocator.gyp:allocator',
756 ],
757 },
758 ],
757 ['OS == "win"', { 759 ['OS == "win"', {
758 # This is needed to trigger the dll copy step on windows. 760 # This is needed to trigger the dll copy step on windows.
759 # TODO(mark): This should not be necessary. 761 # TODO(mark): This should not be necessary.
760 'dependencies': [ 762 'dependencies': [
761 '../third_party/icu/icu.gyp:icudata', 763 '../third_party/icu/icu.gyp:icudata',
762 ], 764 ],
763 'sources!': [ 765 'sources!': [
764 'file_descriptor_shuffle_unittest.cc', 766 'file_descriptor_shuffle_unittest.cc',
765 'files/dir_reader_posix_unittest.cc', 767 'files/dir_reader_posix_unittest.cc',
766 'threading/worker_pool_posix_unittest.cc', 768 'threading/worker_pool_posix_unittest.cc',
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
1288 'base_unittests.isolate', 1290 'base_unittests.isolate',
1289 ], 1291 ],
1290 'sources': [ 1292 'sources': [
1291 'base_unittests.isolate', 1293 'base_unittests.isolate',
1292 ], 1294 ],
1293 }, 1295 },
1294 ], 1296 ],
1295 }], 1297 }],
1296 ], 1298 ],
1297 } 1299 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698