| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 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 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 'test_shell_windows_resource_files': [ | 8 'test_shell_windows_resource_files': [ |
| 9 'resources/test_shell.rc', | 9 'resources/test_shell.rc', |
| 10 'resources/pan_east.cur', | 10 'resources/pan_east.cur', |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 # automatically from direct_dependent_settings in | 283 # automatically from direct_dependent_settings in |
| 284 # their various targets (net.gyp:net_resources, etc.), | 284 # their various targets (net.gyp:net_resources, etc.), |
| 285 # but that causes errors in other targets when | 285 # but that causes errors in other targets when |
| 286 # resulting .res files get referenced multiple times. | 286 # resulting .res files get referenced multiple times. |
| 287 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 287 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', |
| 288 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 288 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
| 289 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', | 289 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', |
| 290 ], | 290 ], |
| 291 }], | 291 }], |
| 292 ['OS=="linux"', { | 292 ['OS=="linux"', { |
| 293 'conditions': [ | |
| 294 [ 'linux_use_tcmalloc==1', { | |
| 295 'dependencies': [ | |
| 296 '../../../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', | |
| 297 ], | |
| 298 }, | |
| 299 ], | |
| 300 ], | |
| 301 'dependencies': [ | 293 'dependencies': [ |
| 302 '../../../build/linux/system.gyp:gtk', | 294 '../../../build/linux/system.gyp:gtk', |
| 303 'test_shell_resources', | 295 'test_shell_resources', |
| 304 'test_shell_pak', | 296 'test_shell_pak', |
| 305 ], | 297 ], |
| 306 }], | 298 }], |
| 307 ['OS=="mac"', { | 299 ['OS=="mac"', { |
| 308 'product_name': 'TestShell', | 300 'product_name': 'TestShell', |
| 309 'dependencies': ['layout_test_helper'], | 301 'dependencies': ['layout_test_helper'], |
| 310 'variables': { | 302 'variables': { |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 712 ], | 704 ], |
| 713 }], | 705 }], |
| 714 ], | 706 ], |
| 715 } | 707 } |
| 716 | 708 |
| 717 # Local Variables: | 709 # Local Variables: |
| 718 # tab-width:2 | 710 # tab-width:2 |
| 719 # indent-tabs-mode:nil | 711 # indent-tabs-mode:nil |
| 720 # End: | 712 # End: |
| 721 # vim: set expandtab tabstop=2 shiftwidth=2: | 713 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |