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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ui.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui_unittests.gypi
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 27a2a3ad980eaaaefe1cfba6e4ca8cd33a6a47b4..a66dad6a4d414bab3ab9854aff6ec8ffb03c7431 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -209,11 +209,6 @@
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
}],
- ['OS == "linux"', {
- 'sources': [
- 'gfx/platform_font_pango_unittest.cc',
- ],
- }],
['OS == "linux" and toolkit_views==1', {
'sources': [
'base/x/events_x_unittest.cc',
@@ -235,10 +230,13 @@
'base/strings/ui_strings.gyp:ui_unittest_strings',
],
}],
- ['use_glib == 1', {
+ ['use_pango == 1', {
'dependencies': [
'../build/linux/system.gyp:pangocairo',
],
+ 'sources': [
+ 'gfx/platform_font_pango_unittest.cc',
+ ],
'conditions': [
['linux_use_tcmalloc==1', {
'dependencies': [
« 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