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

Unified Diff: gyp/ports.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 comments in patch set 3. 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
Index: gyp/ports.gyp
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index a62791002a44e60c51e34412079ff33f73ea0e2a..62e75a9382e5a61f8b5cc3c83ea0dd2c9fb9ab4c 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -59,6 +59,17 @@
'../src/ports/SkFontHost_FreeType.cpp',
'../src/ports/SkFontHost_FreeType_common.cpp',
],
+ # FIXME: This needs to be removed when skia_android_framework is set, but it is
+ # not being removed by that conditional. Instead, use a separate condition to
+ # determine whether to add it.
+ #'dependencies': [
+ # 'freetype.gyp:freetype',
+ #],
+ }],
+ # FIXME: If this dependency was being removed properly when skia_android_framework is set, this
+ # block would be unnecessary.
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "nacl", "android"] \
+ and skia_android_framework == 0', {
djsollen 2014/01/22 21:02:44 not sure I understand what is going on here. Is th
scroggo 2014/01/22 23:52:41 Hmm, I thought so, but it must have been user erro
'dependencies': [
'freetype.gyp:freetype',
],
@@ -170,6 +181,20 @@
'android_deps.gyp:expat',
],
}],
+ [ 'skia_android_framework', {
+ 'include_dirs': [
+ 'external/expat/lib',
+ 'external/freetype/include',
+ ],
+ # FIXME: This is not removing the dependency. Instead, we do not
+ # include it to begin with.
+ #'dependencies!': [
+ # 'freetype.gyp:freetype',
+ #],
+ 'libraries' : [
+ '-lft2',
+ ],
+ }],
],
'direct_dependent_settings': {
'include_dirs': [

Powered by Google App Engine
This is Rietveld 408576698