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

Side by Side Diff: content/content_shell.gypi

Issue 216573003: Fix a use_allocator condition for android_use_tcmalloc in content/content_shell.gypi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | « no previous file | 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 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 # this combination is not yet supported on Android. 305 # this combination is not yet supported on Android.
306 'test_support_content', 306 'test_support_content',
307 ], 307 ],
308 }], # OS=="android" 308 }], # OS=="android"
309 ['os_posix == 1 and OS != "mac" and android_webview_build != 1', { 309 ['os_posix == 1 and OS != "mac" and android_webview_build != 1', {
310 'dependencies': [ 310 'dependencies': [
311 '../components/components.gyp:breakpad_host', 311 '../components/components.gyp:breakpad_host',
312 ], 312 ],
313 }], 313 }],
314 # TODO(dmikurube): Kill {linux|android}_use_tcmalloc. http://crbug.com/3 45554 314 # TODO(dmikurube): Kill {linux|android}_use_tcmalloc. http://crbug.com/3 45554
315 ['(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)))))' , { 315 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_ allocator=="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)))', {
316 'dependencies': [ 316 'dependencies': [
317 # This is needed by content/app/content_main_runner.cc 317 # This is needed by content/app/content_main_runner.cc
318 '../base/allocator/allocator.gyp:allocator', 318 '../base/allocator/allocator.gyp:allocator',
319 ], 319 ],
320 }], 320 }],
321 ['use_aura==1', { 321 ['use_aura==1', {
322 'dependencies': [ 322 'dependencies': [
323 '../ui/aura/aura.gyp:aura', 323 '../ui/aura/aura.gyp:aura',
324 '../ui/base/strings/ui_strings.gyp:ui_strings', 324 '../ui/base/strings/ui_strings.gyp:ui_strings',
325 ], 325 ],
(...skipping 807 matching lines...) Expand 10 before | Expand all | Expand 10 after
1133 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1133 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1134 '--destination_dir', '<(dest_dir)', 1134 '--destination_dir', '<(dest_dir)',
1135 ], 1135 ],
1136 }, 1136 },
1137 ], 1137 ],
1138 }, 1138 },
1139 ], 1139 ],
1140 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1140 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1141 ] 1141 ]
1142 } 1142 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698