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

Unified Diff: chrome/test/interactive_ui/interactive_ui_tests.gypi

Issue 455037: Make no-tcmalloc (really, non-base/allocator) builds work again,... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years 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/renderer/render_thread.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/interactive_ui/interactive_ui_tests.gypi
===================================================================
--- chrome/test/interactive_ui/interactive_ui_tests.gypi (revision 33615)
+++ chrome/test/interactive_ui/interactive_ui_tests.gypi (working copy)
@@ -96,7 +96,6 @@
],
'dependencies': [
'<(DEPTH)/app/app.gyp:app_resources',
- '<(DEPTH)/base/allocator/allocator.gyp:allocator',
'<(DEPTH)/chrome/chrome.gyp:chrome_dll_version',
'<(DEPTH)/chrome/chrome.gyp:crash_service', # run time dependency
'<(DEPTH)/chrome/installer/installer.gyp:installer_util_strings',
@@ -128,6 +127,13 @@
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
],
+ 'conditions': [
+ ['win_use_allocator_shim==1', {
+ 'dependencies': [
+ '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ],
'configurations': {
'Debug': {
'msvs_settings': {
« no previous file with comments | « chrome/renderer/render_thread.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698