diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-19 19:34:23 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-19 19:34:23 +0000 |
| commit | 276a2956f58b5baaa7a173daf1da163856099d71 (patch) | |
| tree | af548a67b3718f954f63bcdd3d669320c1a6aa3f /gyp | |
| parent | d163636ec6914a95c7a8333dc94bc0cae68b226a (diff) | |
Add support for SkImageRef_ashmem.
This requires copying the ashmem utility wrapper functions from a
private android library into our source tree in order to be NDK
compliant.
Review URL: https://codereview.appspot.com/6846076
git-svn-id: http://skia.googlecode.com/svn/trunk@6488 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/ports.gyp | 2 | ||||
| -rw-r--r-- | gyp/utils.gyp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gyp/ports.gyp b/gyp/ports.gyp index 6403693f98..a84f7883d7 100644 --- a/gyp/ports.gyp +++ b/gyp/ports.gyp @@ -163,7 +163,7 @@ '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/FontHostConfiguration_android.cpp', - #TODO: include the ports/SkImageRef_ashmem.cpp for non-NDK builds + '../src/ports/SkImageRef_ashmem.cpp', ], 'dependencies': [ 'freetype.gyp:freetype', diff --git a/gyp/utils.gyp b/gyp/utils.gyp index 6fef6685f8..706b851903 100644 --- a/gyp/utils.gyp +++ b/gyp/utils.gyp @@ -179,6 +179,11 @@ '../src/utils/SkThreadUtils_pthread_linux.cpp', ], }], + [ 'skia_os == "android"', { + 'sources': [ + '../src/utils/android/ashmem.c', + ], + }], ], 'direct_dependent_settings': { 'include_dirs': [ |