Index: content/content_shell.gypi |
diff --git a/content/content_shell.gypi b/content/content_shell.gypi |
index 8d06d3987a8d350b24373a8739ab19629cdb758a..8e64c70cec27acbbc723516bfa347de400ca908d 100644 |
--- a/content/content_shell.gypi |
+++ b/content/content_shell.gypi |
@@ -235,11 +235,6 @@ |
}, |
}, |
'conditions': [ |
- ['OS=="win" and win_use_allocator_shim==1', { |
- 'dependencies': [ |
- '../base/allocator/allocator.gyp:allocator', |
- ], |
- }], |
['OS=="win"', { |
'resource_include_dirs': [ |
'<(SHARED_INTERMEDIATE_DIR)/content/app/strings', |
@@ -286,12 +281,6 @@ |
'DEBUG_DEVTOOLS=1', |
], |
}], |
- ['(OS=="linux" or OS=="android") and use_allocator!="none"', { |
- 'dependencies': [ |
- # This is needed by content/app/content_main_runner.cc |
- '../base/allocator/allocator.gyp:allocator', |
- ], |
- }], |
['use_aura==1', { |
'dependencies': [ |
'../ui/aura/aura.gyp:aura', |
@@ -492,11 +481,6 @@ |
'../sandbox/sandbox.gyp:sandbox', |
], |
'conditions': [ |
- ['win_use_allocator_shim==1', { |
- 'dependencies': [ |
- '../base/allocator/allocator.gyp:allocator', |
- ], |
- }], |
['win_console_app==1', { |
'defines': ['WIN_CONSOLE_APP'], |
}, { # else win_console_app==0 |