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

Side by Side Diff: content/content_shell.gypi

Issue 14321006: Adds TCMalloc support for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 }], # OS=="win" 180 }], # OS=="win"
181 ['OS=="linux"', { 181 ['OS=="linux"', {
182 'dependencies': [ 182 'dependencies': [
183 '../build/linux/system.gyp:fontconfig', 183 '../build/linux/system.gyp:fontconfig',
184 ], 184 ],
185 }], 185 }],
186 ['OS=="android"', { 186 ['OS=="android"', {
187 'dependencies': [ 187 'dependencies': [
188 'content_shell_jni_headers', 188 'content_shell_jni_headers',
189 ], 189 ],
190 }, { # else: OS!="android" 190 }],
191 ['OS=="android" and android_use_tcmalloc==1', {
192 'dependencies': [
193 '../base/allocator/allocator.gyp:allocator',
194 ],
195 }],
196 ['OS!="android"', {
Peter Beverloo 2013/04/29 17:03:31 Why don't you add the block on 191-195 below line
bulach 2013/04/30 18:43:08 Done.
191 'dependencies': [ 197 'dependencies': [
192 # This dependency is for running DRT against the content shell, and 198 # This dependency is for running DRT against the content shell, and
193 # this combination is not yet supported on Android. 199 # this combination is not yet supported on Android.
194 '../webkit/support/webkit_support.gyp:webkit_support', 200 '../webkit/support/webkit_support.gyp:webkit_support',
195 ], 201 ],
196 }], # OS=="android" 202 }], # OS=="android"
197 ['os_posix==1 and use_aura==1 and linux_use_tcmalloc==1', { 203 ['os_posix==1 and use_aura==1 and linux_use_tcmalloc==1', {
198 'dependencies': [ 204 'dependencies': [
199 # This is needed by content/app/content_main_runner.cc 205 # This is needed by content/app/content_main_runner.cc
200 '../base/allocator/allocator.gyp:allocator', 206 '../base/allocator/allocator.gyp:allocator',
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 'native_lib_target': 'libcontent_shell_content_view', 689 'native_lib_target': 'libcontent_shell_content_view',
684 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 690 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
685 'asset_location': '<(ant_build_out)/content_shell/assets', 691 'asset_location': '<(ant_build_out)/content_shell/assets',
686 }, 692 },
687 'includes': [ '../build/java_apk.gypi' ], 693 'includes': [ '../build/java_apk.gypi' ],
688 }, 694 },
689 ], 695 ],
690 }], # OS=="android" 696 }], # OS=="android"
691 ] 697 ]
692 } 698 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698