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

Unified Diff: content/content_shell.gypi

Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 11 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
Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 3147271fbdb8ca296844d01e131472ce4acc8118..ce98ad2dd2aff550d508838c6c4bb49514977d3b 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',
@@ -281,12 +276,6 @@
'../components/components.gyp:breakpad_host',
],
}],
- ['(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',
@@ -487,11 +476,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

Powered by Google App Engine
This is Rietveld 408576698