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

Unified Diff: base/base.gypi

Issue 2819031: Linux: Undo a bit of tcmalloc gyp change from r49597.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
===================================================================
--- base/base.gypi (revision 51321)
+++ base/base.gypi (working copy)
@@ -463,17 +463,6 @@
'sources/': [ ['include', '_chromeos\\.cc$'] ]
},
],
- [ 'linux_use_tcmalloc==0', {
- 'defines': [
- 'NO_TCMALLOC',
- ],
- 'direct_dependent_settings': {
- 'defines': [
- 'NO_TCMALLOC',
- ],
- },
- },
- ],
],
'defines': [
'USE_SYMBOLIZE',
@@ -530,6 +519,17 @@
'conditions': [
[ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
'conditions': [
+ [ 'linux_use_tcmalloc==0', {
+ 'defines': [
+ 'NO_TCMALLOC',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'NO_TCMALLOC',
+ ],
+ },
+ },
+ ],
[ 'linux_use_tcmalloc==1', {
'dependencies': [
'allocator/allocator.gyp:allocator',
« 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