| 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 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 9 }, | 9 }, |
| 10 'includes': [ | 10 'includes': [ |
| (...skipping 1049 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1060 '../ui/display/display.gyp:display_types', | 1060 '../ui/display/display.gyp:display_types', |
| 1061 ], | 1061 ], |
| 1062 'sources': [ | 1062 'sources': [ |
| 1063 'first_run/first_run_helper_unittest.cc', | 1063 'first_run/first_run_helper_unittest.cc', |
| 1064 ], | 1064 ], |
| 1065 }, { # else: chromeos!=1 | 1065 }, { # else: chromeos!=1 |
| 1066 'sources/': [ | 1066 'sources/': [ |
| 1067 ['exclude', 'display/resolution_notification_controller_unittest.cc'
], | 1067 ['exclude', 'display/resolution_notification_controller_unittest.cc'
], |
| 1068 ], | 1068 ], |
| 1069 }], | 1069 }], |
| 1070 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 1070 ['OS=="linux" and component=="shared_library" and use_allocator!="none"'
, { |
| 1071 ['OS=="linux" and component=="shared_library" and ((use_allocator!="none
" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" a
nd linux_use_tcmalloc==1))', { | |
| 1072 'dependencies': [ | 1071 'dependencies': [ |
| 1073 '<(DEPTH)/base/allocator/allocator.gyp:allocator', | 1072 '<(DEPTH)/base/allocator/allocator.gyp:allocator', |
| 1074 ], | 1073 ], |
| 1075 'link_settings': { | 1074 'link_settings': { |
| 1076 'ldflags': ['-rdynamic'], | 1075 'ldflags': ['-rdynamic'], |
| 1077 }, | 1076 }, |
| 1078 }], | 1077 }], |
| 1079 ['use_ozone==1', { | 1078 ['use_ozone==1', { |
| 1080 'sources!': [ | 1079 'sources!': [ |
| 1081 'sticky_keys/sticky_keys_unittest.cc', # crbug.com/354035 | 1080 'sticky_keys/sticky_keys_unittest.cc', # crbug.com/354035 |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1192 'ash_shell_lib', | 1191 'ash_shell_lib', |
| 1193 'ash_test_support', | 1192 'ash_test_support', |
| 1194 ], | 1193 ], |
| 1195 'sources': [ | 1194 'sources': [ |
| 1196 'shell/window_watcher_unittest.cc', | 1195 'shell/window_watcher_unittest.cc', |
| 1197 'test/ash_unittests.cc', | 1196 'test/ash_unittests.cc', |
| 1198 ], | 1197 ], |
| 1199 }, | 1198 }, |
| 1200 ], | 1199 ], |
| 1201 } | 1200 } |
| OLD | NEW |