Index: gyp/common_variables.gypi |
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi |
index c3ec7d8ce6a9efb65d8490d2ed73d9d2e089f4e9..6d101ed64c73932c43d99c6ca5b4a5cd44ec61ea 100644 |
--- a/gyp/common_variables.gypi |
+++ b/gyp/common_variables.gypi |
@@ -91,8 +91,42 @@ |
'arm_version%': 0, |
'arm_neon%': 0, |
}], |
+ [ 'skia_os in ["android", "nacl"] and not skia_android_framework', |
+ # skia_freetype_static - on OS variants that normally would |
+ # dynamically link the system FreeType library, don't do |
+ # that; instead statically link to the version in |
+ # third_party/freetype and third_party/externals/freetype. |
+ { |
+ 'skia_freetype_static%': '1', |
+ }, { |
+ 'skia_freetype_static%': '0', |
+ } |
+ ], |
], |
+ # skia_giflib_static - on OS variants that normally would link giflib |
+ # with '-lgif' and include the headers from '/usr/include/gif_lib.h', |
+ # don't do that; instead compile and staticlly link the version of |
+ # giflib in third_party/externals/giflib. |
+ 'skia_giflib_static%': '0', |
+ |
+ # skia_libpng_static - on OS variants that normally would link libpng |
+ # with '-lpng' and include the headers from '/usr/include/png.h', |
+ # don't do that; instead compile and staticlly link the version of |
+ # libpng in third_party/externals/libpng. |
+ 'skia_libpng_static%': '0', |
+ |
+ # skia_zlib_static - on OS variants that normally would link zlib with |
+ # '-lz' or libz.dylib and include the headers from '<zlib.h>', |
+ # don't do that; instead compile and staticlly link the version of |
borenet
2014/02/24 20:46:57
Nit: spelling
|
+ # zlib in third_party/externals/zlib. |
+ 'skia_zlib_static%': '0', |
+ |
+ # skia_no_fontconfig - On POSIX systems that would normally use the |
+ # SkFontHost_fontconfig interface; use the SkFontHost_linux |
+ # version instead. |
+ 'skia_no_fontconfig%': '0', |
+ |
'skia_sanitizer%': '', |
'skia_scalar%': 'float', |
'skia_mesa%': 0, |
@@ -151,6 +185,12 @@ |
'arm_neon_optional%': 0, |
'skia_os%': '<(skia_os)', |
'os_posix%': '<(os_posix)', |
+ |
+ 'skia_freetype_static%': '<(skia_freetype_static)', |
+ 'skia_giflib_static%': '<(skia_giflib_static)', |
+ 'skia_libpng_static%': '<(skia_libpng_static)', |
+ 'skia_zlib_static%': '<(skia_zlib_static)', |
+ 'skia_no_fontconfig%': '<(skia_no_fontconfig)', |
'skia_sanitizer%': '<(skia_sanitizer)', |
'skia_scalar%': '<(skia_scalar)', |
'skia_mesa%': '<(skia_mesa)', |