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

Unified Diff: chrome/chrome.gyp

Issue 119265: Convert tcmalloc (and its modified libcmt) to building with gyp.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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 | « chrome/app/chrome_dll.vcproj ('k') | third_party/tcmalloc/prep_libc.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 17784)
+++ chrome/chrome.gyp (working copy)
@@ -3698,6 +3698,7 @@
'../third_party/modp_b64/modp_b64.gyp:*',
'../third_party/npapi/npapi.gyp:*',
'../third_party/sqlite/sqlite.gyp:*',
+ '../third_party/tcmalloc/tcmalloc.gyp:*',
'../third_party/zlib/zlib.gyp:*',
'../webkit/tools/test_shell/test_shell.gyp:*',
'../webkit/webkit.gyp:*',
@@ -3727,12 +3728,6 @@
],
},
{
- 'target_name': 'tcmalloc',
- 'type': '<(library)',
- 'msvs_guid': 'C564F145-9172-42C3-BFCB-60FDEA124321',
- 'msvs_existing_vcproj': '../third_party/tcmalloc/tcmalloc.vcproj',
- },
- {
'target_name': 'chrome_dll',
'type': 'shared_library',
'product_name': 'chrome',
@@ -3750,10 +3745,10 @@
'worker',
'../build/util/build_util.gyp:lastchange',
'../net/net.gyp:net_resources',
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
'../views/views.gyp:views',
'../webkit/webkit.gyp:webkit_resources',
'../gears/gears.gyp:gears',
- 'tcmalloc',
],
'rules': [
{
« no previous file with comments | « chrome/app/chrome_dll.vcproj ('k') | third_party/tcmalloc/prep_libc.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698