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

Side by Side Diff: ui/ui_unittests.gypi

Issue 15102010: untangle pango usage from use_x11 and OS==linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove stray unit test inclusion (bad rebase?) Created 7 years, 7 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/ui.gyp ('k') | no next file » | 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) 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'ui_test_support', 8 'target_name': 'ui_test_support',
9 'type': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 }, 202 },
203 'link_settings': { 203 'link_settings': {
204 'libraries': [ 204 'libraries': [
205 '-limm32.lib', 205 '-limm32.lib',
206 '-loleacc.lib', 206 '-loleacc.lib',
207 ], 207 ],
208 }, 208 },
209 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 209 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
210 'msvs_disabled_warnings': [ 4267, ], 210 'msvs_disabled_warnings': [ 4267, ],
211 }], 211 }],
212 ['OS == "linux"', {
213 'sources': [
214 'gfx/platform_font_pango_unittest.cc',
215 ],
216 }],
217 ['OS == "linux" and toolkit_views==1', { 212 ['OS == "linux" and toolkit_views==1', {
218 'sources': [ 213 'sources': [
219 'base/x/events_x_unittest.cc', 214 'base/x/events_x_unittest.cc',
220 ], 215 ],
221 }], 216 }],
222 ['OS != "mac" and OS != "ios"', { 217 ['OS != "mac" and OS != "ios"', {
223 'sources': [ 218 'sources': [
224 'gfx/transform_unittest.cc', 219 'gfx/transform_unittest.cc',
225 'gfx/interpolated_transform_unittest.cc', 220 'gfx/interpolated_transform_unittest.cc',
226 ], 221 ],
227 }], 222 }],
228 ['OS == "android" and gtest_target_type == "shared_library"', { 223 ['OS == "android" and gtest_target_type == "shared_library"', {
229 'dependencies': [ 224 'dependencies': [
230 '../testing/android/native_test.gyp:native_test_native_code', 225 '../testing/android/native_test.gyp:native_test_native_code',
231 ], 226 ],
232 }], 227 }],
233 ['use_glib == 1 or OS == "ios"', { 228 ['use_glib == 1 or OS == "ios"', {
234 'dependencies': [ 229 'dependencies': [
235 'base/strings/ui_strings.gyp:ui_unittest_strings', 230 'base/strings/ui_strings.gyp:ui_unittest_strings',
236 ], 231 ],
237 }], 232 }],
238 ['use_glib == 1', { 233 ['use_pango == 1', {
239 'dependencies': [ 234 'dependencies': [
240 '../build/linux/system.gyp:pangocairo', 235 '../build/linux/system.gyp:pangocairo',
241 ], 236 ],
237 'sources': [
238 'gfx/platform_font_pango_unittest.cc',
239 ],
242 'conditions': [ 240 'conditions': [
243 ['linux_use_tcmalloc==1', { 241 ['linux_use_tcmalloc==1', {
244 'dependencies': [ 242 'dependencies': [
245 '../base/allocator/allocator.gyp:allocator', 243 '../base/allocator/allocator.gyp:allocator',
246 ], 244 ],
247 }], 245 }],
248 ['toolkit_views==1', { 246 ['toolkit_views==1', {
249 'sources!': [ 247 'sources!': [
250 'browser/ui/gtk/gtk_expanded_container_unittest.cc', 248 'browser/ui/gtk/gtk_expanded_container_unittest.cc',
251 ], 249 ],
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 'variables': { 318 'variables': {
321 'test_suite_name': 'ui_unittests', 319 'test_suite_name': 'ui_unittests',
322 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ui_unitte sts<(SHARED_LIB_SUFFIX)', 320 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ui_unitte sts<(SHARED_LIB_SUFFIX)',
323 }, 321 },
324 'includes': [ '../build/apk_test.gypi' ], 322 'includes': [ '../build/apk_test.gypi' ],
325 }, 323 },
326 ], 324 ],
327 }], 325 }],
328 ], 326 ],
329 } 327 }
OLDNEW
« no previous file with comments | « ui/ui.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698