gyp/freetype.gyp - Issue 154053002: Reland "Gyp file changes for the android framework."

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

Issue 154053002: Reland "Gyp file changes for the android framework." (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Fix android build. Created 6 years, 10 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: gyp/freetype.gyp

diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp

index b0957d03eb141b1298f94490d8c42eecf6c930e9..6717c78f65ca01c8e066357771c11b8199cd6e9b 100644

--- a/gyp/freetype.gyp

+++ b/gyp/freetype.gyp

@@ -37,6 +37,22 @@

}],

+ [ 'skia_android_framework', {

+ 'include_dirs': [

+ 'external/expat/lib',

+ 'external/freetype/include',

+ ],

+ 'libraries': [

+ '-lft2',

+ ],

+ # Remove these, and use the system's freetype instead.

+ 'dependencies!': [

+ 'freetype_static',

+ ],

+ 'export_dependent_settings!': [

+ 'freetype_static',

+ ]

+ }],

{

« no previous file with comments | « gyp/core.gyp ('k') | gyp/images.gyp » ('j') | no next file with comments »