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

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: pure rebase 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
« no previous file with comments | « content/content_renderer.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « content/content_renderer.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698