diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 09:26:43 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 09:26:43 +0000 |
| commit | 4a7e5bf159fc0c0be10ef7051568047adcc31dc0 (patch) | |
| tree | 01f333ca01af983b07aedc1f87da46a95f0dea05 /skia | |
| parent | e15a1597a6a5d81a13e1dc749f97a29cef2483f1 (diff) | |
| download | chromium_src-4a7e5bf159fc0c0be10ef7051568047adcc31dc0.zip chromium_src-4a7e5bf159fc0c0be10ef7051568047adcc31dc0.tar.gz chromium_src-4a7e5bf159fc0c0be10ef7051568047adcc31dc0.tar.bz2 | |
Skia should define SK_BUILD_FOR_ANDROID_NDK when building for Android.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8038017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102905 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index e62eeb8..18d0081 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -748,6 +748,9 @@ ['include', 'ext/platform_device_linux.cc'], ['include', 'ext/platform_canvas_linux.cc'], ], + 'defines': [ + 'SK_BUILD_FOR_ANDROID_NDK', + ], }, { # OS != "android" 'sources/': [ ['exclude', '_android\\.(cc|cpp)$'] ], }], @@ -844,7 +847,7 @@ 'config/win', ], }, - },], + }], ['component=="shared_library"', { 'defines': [ 'GR_DLL=1', @@ -861,7 +864,7 @@ 'SKIA_DLL', ], }, - },], + }], ], 'dependencies': [ 'skia_opts', @@ -890,6 +893,13 @@ 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', 'GR_AGGRESSIVE_SHADER_OPTS=1', ], + 'conditions': [ + ['OS=="android"', { + 'defines': [ + 'SK_BUILD_FOR_ANDROID_NDK', + ], + }], + ], }, }, @@ -930,6 +940,11 @@ '-msse2', ], }], + [ 'OS == "android"', { + 'defines': [ + 'SK_BUILD_FOR_ANDROID_NDK', + ], + }], [ 'target_arch != "arm"', { 'sources': [ '../third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp', |