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

Unified Diff: ui/ui.gyp

Issue 61923004: Clean up uses of use_glib that are not related to glib dependencies (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: desktop_linux == 1 or chromeos == 1 Created 7 years, 1 month 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
Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index b167374ff19001b7e1a63551697783d0e2b9f951..69d6393dcead89b27d8f459e87e02e10eb7d8dab 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -395,6 +395,8 @@
'../build/linux/system.gyp:fontconfig',
'../build/linux/system.gyp:glib',
],
+ }],
+ ['desktop_linux == 1 or chromeos == 1', {
'conditions': [
['toolkit_views==0 and use_aura==0', {
# Note: because of gyp predence rules this has to be defined as
@@ -412,11 +414,11 @@
['include', '^base/dragdrop/os_exchange_data.cc'],
],
}],
- ['use_pango==1', {
- 'dependencies': [
- '../build/linux/system.gyp:pangocairo',
- ],
- }],
+ ],
+ }],
+ ['use_pango==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:pangocairo',
],
}],
['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', {
« base/base.gyp ('K') | « ui/message_center/message_center.gyp ('k') | ui/ui_unittests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698