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

Unified Diff: chrome/chrome_exe.gypi

Issue 831453004: Do not depend on or try to configure pangocairo when use_pango == 0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 0c78a0e98d7297be98d6663b9715a487bfb64cdd..93617b3eb835c57efe23f5229ef24881734b196a 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -187,6 +187,12 @@
'../build/linux/system.gyp:xext',
],
}],
+ # Needed for chrome_main.cc initialization of libraries.
+ ['use_pango==1 and use_cairo==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:pangocairo',
+ ],
+ }],
],
'sources': [
'app/chrome_dll_resource.h',
@@ -200,8 +206,6 @@
'<@(chromium_browser_dependencies)',
'<@(chromium_child_dependencies)',
'../content/content.gyp:content_app_both',
- # Needed for chrome_main.cc initialization of libraries.
- '../build/linux/system.gyp:pangocairo',
# Needed to use the master_preferences functions
'installer_util',
],
« build/linux/system.gyp ('K') | « build/linux/system.gyp ('k') | skia/skia_library.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698