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

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: . 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
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 21 matching lines...) Expand all
274 'dependencies': [ 269 'dependencies': [
275 '../mojo/mojo_base.gyp:libmojo_system_java', 270 '../mojo/mojo_base.gyp:libmojo_system_java',
276 'content_shell_jni_headers', 271 'content_shell_jni_headers',
277 ], 272 ],
278 }], # OS=="android" 273 }], # OS=="android"
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 ['(OS=="linux" or OS=="android") and use_allocator!="none"', {
285 'dependencies': [
286 # This is needed by content/app/content_main_runner.cc
287 '../base/allocator/allocator.gyp:allocator',
288 ],
289 }],
290 ['use_aura==1', { 279 ['use_aura==1', {
291 'dependencies': [ 280 'dependencies': [
292 '../ui/aura/aura.gyp:aura', 281 '../ui/aura/aura.gyp:aura',
293 '../ui/aura/aura.gyp:aura_test_support', 282 '../ui/aura/aura.gyp:aura_test_support',
294 '../ui/events/events.gyp:events', 283 '../ui/events/events.gyp:events',
295 '../ui/strings/ui_strings.gyp:ui_strings', 284 '../ui/strings/ui_strings.gyp:ui_strings',
296 '../ui/wm/wm.gyp:wm', 285 '../ui/wm/wm.gyp:wm',
297 ], 286 ],
298 'conditions': [ 287 'conditions': [
299 ['toolkit_views==1', { 288 ['toolkit_views==1', {
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 'VCLinkerTool': { 469 'VCLinkerTool': {
481 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 470 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
482 }, 471 },
483 }, 472 },
484 }, 473 },
485 }, 474 },
486 'dependencies': [ 475 'dependencies': [
487 '../sandbox/sandbox.gyp:sandbox', 476 '../sandbox/sandbox.gyp:sandbox',
488 ], 477 ],
489 'conditions': [ 478 'conditions': [
490 ['win_use_allocator_shim==1', {
491 'dependencies': [
492 '../base/allocator/allocator.gyp:allocator',
493 ],
494 }],
495 ['win_console_app==1', { 479 ['win_console_app==1', {
496 'defines': ['WIN_CONSOLE_APP'], 480 'defines': ['WIN_CONSOLE_APP'],
497 }, { # else win_console_app==0 481 }, { # else win_console_app==0
498 'msvs_settings': { 482 'msvs_settings': {
499 'VCLinkerTool': { 483 'VCLinkerTool': {
500 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 484 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
501 }, 485 },
502 }, 486 },
503 }], 487 }],
504 ], 488 ],
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
988 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 972 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
989 '--destination_dir', '<(dest_dir)', 973 '--destination_dir', '<(dest_dir)',
990 ], 974 ],
991 }, 975 },
992 ], 976 ],
993 }, 977 },
994 ], 978 ],
995 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 979 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
996 ] 980 ]
997 } 981 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698