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

Side by Side 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, 10 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 unified diff | Download patch
« no previous file with comments | « content/content_renderer.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 'content_shell_version': '99.77.34.5', 8 'content_shell_version': '99.77.34.5',
9 'conditions': [ 9 'conditions': [
10 ['OS=="linux"', { 10 ['OS=="linux"', {
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 'shell/renderer/shell_render_view_observer.h', 228 'shell/renderer/shell_render_view_observer.h',
229 'shell/utility/shell_content_utility_client.cc', 229 'shell/utility/shell_content_utility_client.cc',
230 'shell/utility/shell_content_utility_client.h', 230 'shell/utility/shell_content_utility_client.h',
231 ], 231 ],
232 'msvs_settings': { 232 'msvs_settings': {
233 'VCLinkerTool': { 233 'VCLinkerTool': {
234 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 234 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
235 }, 235 },
236 }, 236 },
237 'conditions': [ 237 'conditions': [
238 ['OS=="win" and win_use_allocator_shim==1', {
239 'dependencies': [
240 '../base/allocator/allocator.gyp:allocator',
241 ],
242 }],
243 ['OS=="win"', { 238 ['OS=="win"', {
244 'resource_include_dirs': [ 239 'resource_include_dirs': [
245 '<(SHARED_INTERMEDIATE_DIR)/content/app/strings', 240 '<(SHARED_INTERMEDIATE_DIR)/content/app/strings',
246 ], 241 ],
247 'dependencies': [ 242 'dependencies': [
248 '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings', 243 '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
249 ], 244 ],
250 'configurations': { 245 'configurations': {
251 'Debug_Base': { 246 'Debug_Base': {
252 'msvs_settings': { 247 'msvs_settings': {
(...skipping 26 matching lines...) Expand all
279 ['os_posix == 1 and OS != "mac"', { 274 ['os_posix == 1 and OS != "mac"', {
280 'dependencies': [ 275 'dependencies': [
281 '../components/components.gyp:breakpad_host', 276 '../components/components.gyp:breakpad_host',
282 ], 277 ],
283 }], 278 }],
284 ['debug_devtools==1', { 279 ['debug_devtools==1', {
285 'defines': [ 280 'defines': [
286 'DEBUG_DEVTOOLS=1', 281 'DEBUG_DEVTOOLS=1',
287 ], 282 ],
288 }], 283 }],
289 ['(OS=="linux" or OS=="android") and use_allocator!="none"', {
290 'dependencies': [
291 # This is needed by content/app/content_main_runner.cc
292 '../base/allocator/allocator.gyp:allocator',
293 ],
294 }],
295 ['use_aura==1', { 284 ['use_aura==1', {
296 'dependencies': [ 285 'dependencies': [
297 '../ui/aura/aura.gyp:aura', 286 '../ui/aura/aura.gyp:aura',
298 '../ui/aura/aura.gyp:aura_test_support', 287 '../ui/aura/aura.gyp:aura_test_support',
299 '../ui/events/events.gyp:events', 288 '../ui/events/events.gyp:events',
300 '../ui/strings/ui_strings.gyp:ui_strings', 289 '../ui/strings/ui_strings.gyp:ui_strings',
301 '../ui/wm/wm.gyp:wm', 290 '../ui/wm/wm.gyp:wm',
302 ], 291 ],
303 'conditions': [ 292 'conditions': [
304 ['toolkit_views==1', { 293 ['toolkit_views==1', {
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 'VCLinkerTool': { 474 'VCLinkerTool': {
486 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 475 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
487 }, 476 },
488 }, 477 },
489 }, 478 },
490 }, 479 },
491 'dependencies': [ 480 'dependencies': [
492 '../sandbox/sandbox.gyp:sandbox', 481 '../sandbox/sandbox.gyp:sandbox',
493 ], 482 ],
494 'conditions': [ 483 'conditions': [
495 ['win_use_allocator_shim==1', {
496 'dependencies': [
497 '../base/allocator/allocator.gyp:allocator',
498 ],
499 }],
500 ['win_console_app==1', { 484 ['win_console_app==1', {
501 'defines': ['WIN_CONSOLE_APP'], 485 'defines': ['WIN_CONSOLE_APP'],
502 }, { # else win_console_app==0 486 }, { # else win_console_app==0
503 'msvs_settings': { 487 'msvs_settings': {
504 'VCLinkerTool': { 488 'VCLinkerTool': {
505 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 489 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
506 }, 490 },
507 }, 491 },
508 }], 492 }],
509 ], 493 ],
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
993 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 977 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
994 '--destination_dir', '<(dest_dir)', 978 '--destination_dir', '<(dest_dir)',
995 ], 979 ],
996 }, 980 },
997 ], 981 ],
998 }, 982 },
999 ], 983 ],
1000 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 984 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1001 ] 985 ]
1002 } 986 }
OLDNEW
« 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