| OLD | NEW | 
|    1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |    1 # Copyright (c) 2013 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   }, |    8   }, | 
|    9   'targets': [ |    9   'targets': [ | 
|   10     { |   10     { | 
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   93         '../gfx/gfx.gyp:gfx_geometry', |   93         '../gfx/gfx.gyp:gfx_geometry', | 
|   94         '../resources/ui_resources.gyp:ui_test_pak', |   94         '../resources/ui_resources.gyp:ui_test_pak', | 
|   95         '../ui.gyp:ui', |   95         '../ui.gyp:ui', | 
|   96         'keyboard', |   96         'keyboard', | 
|   97       ], |   97       ], | 
|   98       'sources': [ |   98       'sources': [ | 
|   99         'test/run_all_unittests.cc', |   99         'test/run_all_unittests.cc', | 
|  100         'keyboard_controller_unittest.cc', |  100         'keyboard_controller_unittest.cc', | 
|  101       ], |  101       ], | 
|  102       'conditions': [ |  102       'conditions': [ | 
|  103         ['OS=="linux" and linux_use_tcmalloc==1', { |  103         # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 
 |  104         ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc
     malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', { | 
|  104           'dependencies': [ |  105           'dependencies': [ | 
|  105             '<(DEPTH)/base/allocator/allocator.gyp:allocator', |  106             '<(DEPTH)/base/allocator/allocator.gyp:allocator', | 
|  106           ], |  107           ], | 
|  107           'link_settings': { |  108           'link_settings': { | 
|  108             'ldflags': ['-rdynamic'], |  109             'ldflags': ['-rdynamic'], | 
|  109           }, |  110           }, | 
|  110         }], |  111         }], | 
|  111         ['OS=="win" and win_use_allocator_shim==1', { |  112         ['OS=="win" and win_use_allocator_shim==1', { | 
|  112           'dependencies': [ |  113           'dependencies': [ | 
|  113             '<(DEPTH)/base/allocator/allocator.gyp:allocator', |  114             '<(DEPTH)/base/allocator/allocator.gyp:allocator', | 
|  114           ], |  115           ], | 
|  115         }], |  116         }], | 
|  116       ], |  117       ], | 
|  117     }, |  118     }, | 
|  118   ], |  119   ], | 
|  119 } |  120 } | 
| OLD | NEW |