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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/freetype.gyp

Issue 140503007: Scripts to generate Android.mk for framework Skia. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Respond to Elliot's comments in patch set 16. Created 6 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
« no previous file with comments | « gyp/core.gyp ('k') | gyp/images.gyp » ('j') | platform_tools/android/gyp_gen/vars_dict_lib.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/freetype.gyp
diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp
index 41f3b575df47e9b22f3e8403b34a962ecfe0f11d..f53efc9bc28e583a2becb9a3ea7b2d77b71eb2f7 100644
--- a/gyp/freetype.gyp
+++ b/gyp/freetype.gyp
@@ -36,6 +36,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') | platform_tools/android/gyp_gen/vars_dict_lib.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698