| OLD | NEW |
| 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 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 'dependencies': [ | 187 'dependencies': [ |
| 188 'content_shell_jni_headers', | 188 'content_shell_jni_headers', |
| 189 ], | 189 ], |
| 190 }, { # else: OS!="android" | 190 }, { # else: OS!="android" |
| 191 'dependencies': [ | 191 'dependencies': [ |
| 192 # This dependency is for running DRT against the content shell, and | 192 # This dependency is for running DRT against the content shell, and |
| 193 # this combination is not yet supported on Android. | 193 # this combination is not yet supported on Android. |
| 194 '../webkit/support/webkit_support.gyp:webkit_support', | 194 '../webkit/support/webkit_support.gyp:webkit_support', |
| 195 ], | 195 ], |
| 196 }], # OS=="android" | 196 }], # OS=="android" |
| 197 ['OS=="android" and android_use_tcmalloc==1', { |
| 198 'dependencies': [ |
| 199 '../base/allocator/allocator.gyp:allocator', |
| 200 ], |
| 201 }], |
| 197 ['os_posix==1 and use_aura==1 and linux_use_tcmalloc==1', { | 202 ['os_posix==1 and use_aura==1 and linux_use_tcmalloc==1', { |
| 198 'dependencies': [ | 203 'dependencies': [ |
| 199 # This is needed by content/app/content_main_runner.cc | 204 # This is needed by content/app/content_main_runner.cc |
| 200 '../base/allocator/allocator.gyp:allocator', | 205 '../base/allocator/allocator.gyp:allocator', |
| 201 ], | 206 ], |
| 202 }], | 207 }], |
| 203 ['use_aura==1', { | 208 ['use_aura==1', { |
| 204 'dependencies': [ | 209 'dependencies': [ |
| 205 '../ui/aura/aura.gyp:aura', | 210 '../ui/aura/aura.gyp:aura', |
| 206 '../ui/base/strings/ui_strings.gyp:ui_strings', | 211 '../ui/base/strings/ui_strings.gyp:ui_strings', |
| (...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 683 'native_lib_target': 'libcontent_shell_content_view', | 688 'native_lib_target': 'libcontent_shell_content_view', |
| 684 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont
ent_shell.pak'], | 689 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont
ent_shell.pak'], |
| 685 'asset_location': '<(ant_build_out)/content_shell/assets', | 690 'asset_location': '<(ant_build_out)/content_shell/assets', |
| 686 }, | 691 }, |
| 687 'includes': [ '../build/java_apk.gypi' ], | 692 'includes': [ '../build/java_apk.gypi' ], |
| 688 }, | 693 }, |
| 689 ], | 694 ], |
| 690 }], # OS=="android" | 695 }], # OS=="android" |
| 691 ] | 696 ] |
| 692 } | 697 } |
| OLD | NEW |