Chromium Code Reviews| Index: gyp/common_variables.gypi |
| diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi |
| index c3ec7d8ce6a9efb65d8490d2ed73d9d2e089f4e9..ed74cc3ebdf63f3014e7b789eedfab625490fec6 100644 |
| --- a/gyp/common_variables.gypi |
| +++ b/gyp/common_variables.gypi |
| @@ -93,6 +93,42 @@ |
| }], |
| ], |
| + # 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%': 'skia_os in ["android", "nacl"]', |
|
scroggo
2014/02/18 21:46:24
It seems like these aren't really "common". Aren't
borenet
2014/02/18 22:15:36
I could go either way, but I think it makes sense
hal.canary
2014/02/19 15:21:03
It looks like many of the variables are only used
|
| + |
| + # skia_freetype_dynamic - use the system-proviced version of the |
| + # FreeType library. If both skia_freetype_dynamic and |
| + # skia_freetype_static are true, skia_freetype_static takes |
| + # precedence. |
|
borenet
2014/02/18 22:15:36
I don't like these conflicting variables. "not ski
hal.canary
2014/02/19 15:21:03
More inspection indicated that if we got to freety
|
| + 'skia_freetype_dynamic%': |
| + 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', |
| + |
| + # 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 |
| + # 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 +187,13 @@ |
| 'arm_neon_optional%': 0, |
| 'skia_os%': '<(skia_os)', |
| 'os_posix%': '<(os_posix)', |
| + |
| + 'skia_freetype_static%': '<(skia_freetype_static)', |
| + 'skia_freetype_dynamic%': '<(skia_freetype_dynamic)', |
| + '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)', |