ui/gfx/gfx.gyp - Issue 26541007: ozone: Allow building for ozone without depending on pango

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: ui/gfx/gfx.gyp

Issue 26541007: ozone: Allow building for ozone without depending on pango (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: prepare-land 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/gfx/gfx.gyp

diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp

index 6d8f939baf1560c035a6237f5ad22961ebd9084c..4a75a5e0720dd84d915a8865a1ad7dd1de15a789 100644

--- a/ui/gfx/gfx.gyp

+++ b/ui/gfx/gfx.gyp

@@ -168,6 +168,7 @@

'platform_font_ios.mm',

'platform_font_mac.h',

'platform_font_mac.mm',

+ 'platform_font_ozone.cc',

'platform_font_pango.cc',

'platform_font_pango.h',

'platform_font_win.cc',

@@ -197,10 +198,11 @@

'rect_f.h',

'render_text.cc',

'render_text.h',

- 'render_text_linux.cc',

- 'render_text_linux.h',

'render_text_mac.cc',

'render_text_mac.h',

+ 'render_text_ozone.cc',

+ 'render_text_pango.cc',

+ 'render_text_pango.h',

'render_text_win.cc',

'render_text_win.h',

'safe_integer_conversions.h',

@@ -302,12 +304,6 @@

'canvas_skia.cc',

}],

- ['use_pango==0', {

- 'sources/': [

- ['exclude', '^pango_util\\.'],

- ['exclude', '^platform_font_pango\\.'],

- ],

- }],

['toolkit_uses_gtk == 1', {

'dependencies': [

'<(DEPTH)/build/linux/system.gyp:gtk',

« no previous file with comments | « ui/gfx/font_unittest.cc ('k') | ui/gfx/platform_font_ozone.cc » ('j') | no next file with comments »