diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-14 16:39:55 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-14 16:39:55 +0000 |
| commit | b4ad2eed5ec652b0247310518223831d231166dd (patch) | |
| tree | c6c9bc2d2585414de51df28d87f6d8f9ca4a894b /skia/skia.gyp | |
| parent | 6a5d3b04a4444ee95ce9552b52c1d5fee2a65053 (diff) | |
| download | chromium_src-b4ad2eed5ec652b0247310518223831d231166dd.zip chromium_src-b4ad2eed5ec652b0247310518223831d231166dd.tar.gz chromium_src-b4ad2eed5ec652b0247310518223831d231166dd.tar.bz2 | |
Roll Skia to 9113 & update skia.gyp for Android
R=reed@google.com
Review URL: https://codereview.chromium.org/14977012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 6fea4b7..56f77d6 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -31,6 +31,10 @@ 'sources': [ # this should likely be moved into src/utils in skia '../third_party/skia/src/core/SkFlate.cpp', + # We don't want to add this to Skia's core.gypi since it is + # Android only. Include it here and remove it for everyone + # but Android later. + '../third_party/skia/src/core/SkPaintOptionsAndroid.cpp', #'../third_party/skia/src/images/bmpdecoderhelper.cpp', #'../third_party/skia/src/images/bmpdecoderhelper.h', @@ -321,6 +325,9 @@ 'sources/': [ ['exclude', '_android\\.(cc|cpp)$'], ], + 'sources!': [ + '../third_party/skia/src/core/SkPaintOptionsAndroid.cpp' + ], 'defines': [ 'SK_DEFAULT_FONT_CACHE_LIMIT=(20*1024*1024)', ], @@ -394,7 +401,7 @@ 'defines': [ 'HAVE_PTHREADS', 'OS_ANDROID', - 'SK_BUILD_FOR_ANDROID_NDK', + 'SK_BUILD_FOR_ANDROID', # Android devices are typically more memory constrained, so # use a smaller glyph cache. 'SK_DEFAULT_FONT_CACHE_LIMIT=(8*1024*1024)', @@ -573,7 +580,7 @@ ], 'defines': [ # Don't use non-NDK available stuff. - 'SK_BUILD_FOR_ANDROID_NDK', + 'SK_BUILD_FOR_ANDROID', ], 'conditions': [ [ '_toolset == "target" and android_webview_build == 0', { @@ -648,7 +655,7 @@ }], [ 'OS == "android"', { 'defines': [ - 'SK_BUILD_FOR_ANDROID_NDK', + 'SK_BUILD_FOR_ANDROID', ], }], [ 'target_arch != "arm" and target_arch != "mipsel"', { |