summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 19:20:20 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 19:20:20 +0000
commite138a0e3656325ece99d912f002e0033e800cbcb (patch)
tree153151e61255564f3076c15dddfdb61ef54ff8ff /third_party
parent85273e20dd7b1dd150abd2a6df46d8a7b44816f5 (diff)
downloadchromium_src-e138a0e3656325ece99d912f002e0033e800cbcb.zip
chromium_src-e138a0e3656325ece99d912f002e0033e800cbcb.tar.gz
chromium_src-e138a0e3656325ece99d912f002e0033e800cbcb.tar.bz2
Fix tcmalloc.gyp for scons generator.
Had errors like (note, I added an exception handler to print the error): ________ running '/usr/bin/python src/build/gyp_chromium' in '/usr/local/google/chromium1' Updating projects from gyp files... Traceback (most recent call last): File "src/build/gyp_chromium", line 79, in <module> sys.exit(gyp.main(args)) File "src/tools/gyp/pylib/gyp/__init__.py", line 432, in main generator.GenerateOutput(flat_list, targets, data, params) File "src/tools/gyp/pylib/gyp/generator/scons.py", line 995, in GenerateOutput GenerateSConscript(output_file, spec, build_file, data[build_file]) File "src/tools/gyp/pylib/gyp/generator/scons.py", line 328, in GenerateSConscript GenerateConfig(fp, config, indent, src_subdir) File "src/tools/gyp/pylib/gyp/generator/scons.py", line 207, in GenerateConfig value = [escape_quotes(v) for v in value] File "src/tools/gyp/pylib/gyp/generator/scons.py", line 172, in escape_quotes foo = escape_quotes_re.sub('\\1\\"\\2\\"', s) TypeError: expected string or buffer Input: ['NO_TCMALLOC_SAMPLES', '']. failed to run command: /usr/bin/python src/build/gyp_chromium Review URL: http://codereview.chromium.org/399075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32361 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/tcmalloc/tcmalloc.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp
index c0dcec5..d5ad5a3 100644
--- a/third_party/tcmalloc/tcmalloc.gyp
+++ b/third_party/tcmalloc/tcmalloc.gyp
@@ -15,7 +15,7 @@
'../..',
],
'defines': [
- ['NO_TCMALLOC_SAMPLES', '']
+ 'NO_TCMALLOC_SAMPLES',
],
'direct_dependent_settings': {
'configurations': {