content/content_common.gypi - Issue 15102010: untangle pango usage from use_x11 and OS==linux

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/content_common.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:

Index: content/content_common.gypi

diff --git a/content/content_common.gypi b/content/content_common.gypi

index 47af968f5c92a15cd76b9045ccc6b5303e77cdaf..6ccb2bd9d540eb21179fc2dee65db496871c5cb5 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -193,8 +193,8 @@

'common/font_list.cc',

'common/font_list.h',

'common/font_list_android.cc',

- 'common/font_list_linux.cc',

'common/font_list_mac.mm',

+ 'common/font_list_pango.cc',

'common/font_list_win.cc',

'common/gamepad_hardware_buffer.h',

'common/gamepad_messages.h',

@@ -427,10 +427,14 @@

'../build/linux/system.gyp:gtk',

}],

- ['OS=="linux"', {

+ ['use_pango == 1', {

'dependencies': [

'../build/linux/system.gyp:pangocairo',

+ }, { # use_pango == 0

+ 'sources!': [

+ 'common/font_list_pango.cc',

+ ],

}],

['use_x11 == 1', {

'include_dirs': [

« no previous file with comments | « content/content_browser.gypi ('k') | ui/ui.gyp » ('j') | no next file with comments »