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

Side by Side Diff: content/content_app.gypi

Issue 258433005: Remove {linux|android}_use_tcmalloc and switch to use_allocator in Chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « components/nacl.gyp ('k') | content/content_shell.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 'include_dirs': [ 6 'include_dirs': [
7 '..', 7 '..',
8 ], 8 ],
9 'dependencies': [ 9 'dependencies': [
10 '../base/base.gyp:base', 10 '../base/base.gyp:base',
(...skipping 17 matching lines...) Expand all
28 'app/mojo/mojo_init.h', 28 'app/mojo/mojo_init.h',
29 'app/startup_helper_win.cc', 29 'app/startup_helper_win.cc',
30 'public/app/android_library_loader_hooks.h', 30 'public/app/android_library_loader_hooks.h',
31 'public/app/content_main.h', 31 'public/app/content_main.h',
32 'public/app/content_main_delegate.cc', 32 'public/app/content_main_delegate.cc',
33 'public/app/content_main_delegate.h', 33 'public/app/content_main_delegate.h',
34 'public/app/content_main_runner.h', 34 'public/app/content_main_runner.h',
35 'public/app/startup_helper_win.h', 35 'public/app/startup_helper_win.h',
36 ], 36 ],
37 'conditions': [ 37 'conditions': [
38 # TODO(dmikurube): Kill {linux|android}_use_tcmalloc. http://crbug.com/34555 4 38 ['((OS=="linux" and os_posix==1 and use_aura==1) or OS=="android") and use_a llocator!="none"', {
39 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allo cator=="see_use_tcmalloc" and ((OS=="linux" and os_posix==1 and use_aura==1 and linux_use_tcmalloc==1) or (OS=="android" and android_use_tcmalloc==1)))', {
40 'dependencies': [ 39 'dependencies': [
41 # This is needed by app/content_main_runner.cc 40 # This is needed by app/content_main_runner.cc
42 '../base/allocator/allocator.gyp:allocator', 41 '../base/allocator/allocator.gyp:allocator',
43 ], 42 ],
44 }], 43 }],
45 ['OS=="win"', { 44 ['OS=="win"', {
46 'dependencies': [ 45 'dependencies': [
47 '../sandbox/sandbox.gyp:sandbox', 46 '../sandbox/sandbox.gyp:sandbox',
48 ], 47 ],
49 }], 48 }],
(...skipping 18 matching lines...) Expand all
68 }, { # OS!="ios" 67 }, { # OS!="ios"
69 'dependencies': [ 68 'dependencies': [
70 '../mojo/mojo.gyp:mojo_environment_chromium', 69 '../mojo/mojo.gyp:mojo_environment_chromium',
71 '../mojo/mojo.gyp:mojo_service_manager', 70 '../mojo/mojo.gyp:mojo_service_manager',
72 '../mojo/mojo.gyp:mojo_shell_bindings', 71 '../mojo/mojo.gyp:mojo_shell_bindings',
73 '../mojo/mojo.gyp:mojo_system_impl', 72 '../mojo/mojo.gyp:mojo_system_impl',
74 ], 73 ],
75 }], 74 }],
76 ], 75 ],
77 } 76 }
OLDNEW
« no previous file with comments | « components/nacl.gyp ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698