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

Side by Side Diff: ui/keyboard/keyboard.gyp

Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pure rebase Created 4 years, 10 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
« no previous file with comments | « ui/keyboard/BUILD.gn ('k') | ui/message_center/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 'input_tools_root_dir': '../../third_party/google_input_tools/src/chrome/os' , 8 'input_tools_root_dir': '../../third_party/google_input_tools/src/chrome/os' ,
9 'inputview_gen_js': '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/resources/inputv iew.js', 9 'inputview_gen_js': '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/resources/inputv iew.js',
10 }, 10 },
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 '../gfx/gfx.gyp:gfx', 142 '../gfx/gfx.gyp:gfx',
143 '../gfx/gfx.gyp:gfx_geometry', 143 '../gfx/gfx.gyp:gfx_geometry',
144 '../wm/wm.gyp:wm', 144 '../wm/wm.gyp:wm',
145 'keyboard', 145 'keyboard',
146 ], 146 ],
147 'sources': [ 147 'sources': [
148 'keyboard_controller_unittest.cc', 148 'keyboard_controller_unittest.cc',
149 'keyboard_util_unittest.cc', 149 'keyboard_util_unittest.cc',
150 'test/run_all_unittests.cc', 150 'test/run_all_unittests.cc',
151 ], 151 ],
152 'conditions': [
153 ['OS=="linux" and use_allocator!="none"', {
154 'dependencies': [
155 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
156 ],
157 'link_settings': {
158 'ldflags': ['-rdynamic'],
159 },
160 }],
161 ['OS=="win" and win_use_allocator_shim==1', {
162 'dependencies': [
163 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
164 ],
165 }],
166 ],
167 }, 152 },
168 ], 153 ],
169 } 154 }
OLDNEW
« no previous file with comments | « ui/keyboard/BUILD.gn ('k') | ui/message_center/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698