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

Side by Side Diff: content/content_shell.gypi

Issue 206413006: Use use_allocator instead of android_use_tcmalloc to switch the allocator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit fix Created 6 years, 8 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 | « chrome/chrome_android.gypi ('k') | no next file » | 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 # The "19" is so that sites that sniff for version think that this is 8 # The "19" is so that sites that sniff for version think that this is
9 # something reasonably current; the "77.34.5" is a hint that this isn't a 9 # something reasonably current; the "77.34.5" is a hint that this isn't a
10 # standard Chrome. 10 # standard Chrome.
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 # This dependency is for running DRT against the content shell, and 308 # This dependency is for running DRT against the content shell, and
309 # this combination is not yet supported on Android. 309 # this combination is not yet supported on Android.
310 'test_support_content', 310 'test_support_content',
311 ], 311 ],
312 }], # OS=="android" 312 }], # OS=="android"
313 ['os_posix == 1 and OS != "mac" and android_webview_build != 1', { 313 ['os_posix == 1 and OS != "mac" and android_webview_build != 1', {
314 'dependencies': [ 314 'dependencies': [
315 '../components/components.gyp:breakpad_host', 315 '../components/components.gyp:breakpad_host',
316 ], 316 ],
317 }], 317 }],
318 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 318 # TODO(dmikurube): Kill {linux|android}_use_tcmalloc. http://crbug.com/3 45554
319 ['(os_posix==1 and use_aura==1 and ((use_allocator!="none" and use_alloc ator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tc malloc==1))) or (android_use_tcmalloc==1)', { 319 ['(os_posix==1 and use_aura==1 and ((use_allocator!="none" and use_alloc ator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and ((OS=="linux " and linux_use_tcmalloc==1) or (OS=="android" and android_use_tcmalloc==1)))))' , {
320 'dependencies': [ 320 'dependencies': [
321 # This is needed by content/app/content_main_runner.cc 321 # This is needed by content/app/content_main_runner.cc
322 '../base/allocator/allocator.gyp:allocator', 322 '../base/allocator/allocator.gyp:allocator',
323 ], 323 ],
324 }], 324 }],
325 ['use_aura==1', { 325 ['use_aura==1', {
326 'dependencies': [ 326 'dependencies': [
327 '../ui/aura/aura.gyp:aura', 327 '../ui/aura/aura.gyp:aura',
328 '../ui/base/strings/ui_strings.gyp:ui_strings', 328 '../ui/base/strings/ui_strings.gyp:ui_strings',
329 ], 329 ],
(...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after
1166 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1166 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1167 '--destination_dir', '<(dest_dir)', 1167 '--destination_dir', '<(dest_dir)',
1168 ], 1168 ],
1169 }, 1169 },
1170 ], 1170 ],
1171 }, 1171 },
1172 ], 1172 ],
1173 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1173 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1174 ] 1174 ]
1175 } 1175 }
OLDNEW
« no previous file with comments | « chrome/chrome_android.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698