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

Side by Side Diff: chrome/chrome_android.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 | « cc/cc_tests.gyp ('k') | chrome/chrome_exe.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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 'package_name': 'chrome_shell_apk', 7 'package_name': 'chrome_shell_apk',
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'chrome_android_paks.gypi', # Included for the list of pak resources. 10 'chrome_android_paks.gypi', # Included for the list of pak resources.
(...skipping 21 matching lines...) Expand all
32 '../skia/config', 32 '../skia/config',
33 ], 33 ],
34 'conditions': [ 34 'conditions': [
35 [ 'order_profiling!=0', { 35 [ 'order_profiling!=0', {
36 'conditions': [ 36 'conditions': [
37 [ 'OS=="android"', { 37 [ 'OS=="android"', {
38 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ], 38 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
39 }], 39 }],
40 ], 40 ],
41 }], 41 }],
42 # TODO(dmikurube): Kill android_use_tcmalloc. http://crbug.com/345554 42 [ 'use_allocator!="none"', {
43 [ '(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use _allocator=="see_use_tcmalloc" and android_use_tcmalloc==1)', {
44 'dependencies': [ 43 'dependencies': [
45 '../base/allocator/allocator.gyp:allocator', ], 44 '../base/allocator/allocator.gyp:allocator', ],
46 }], 45 }],
47 ['OS=="android"', { 46 ['OS=="android"', {
48 'ldflags': [ 47 'ldflags': [
49 # Some android targets still depend on --gc-sections to link. 48 # Some android targets still depend on --gc-sections to link.
50 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). 49 # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
51 '-Wl,--gc-sections', 50 '-Wl,--gc-sections',
52 ], 51 ],
53 }], 52 }],
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 { 131 {
133 'destination': '<(chrome_android_pak_output_folder)', 132 'destination': '<(chrome_android_pak_output_folder)',
134 'files': [ 133 'files': [
135 '<@(chrome_android_pak_input_resources)', 134 '<@(chrome_android_pak_input_resources)',
136 ], 135 ],
137 } 136 }
138 ], 137 ],
139 }, 138 },
140 ], 139 ],
141 } 140 }
OLDNEW
« no previous file with comments | « cc/cc_tests.gyp ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698