diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-01 15:57:13 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-01 15:57:13 +0000 |
| commit | 528a556514fddfd1275cda9f2c2af17abc02c693 (patch) | |
| tree | 1606387d38ab1c4eebd64b67f50dab4b826e0b6a /gyp | |
| parent | d11c91e7aa10c260c1dc5d978d1620a2b9be19e8 (diff) | |
Fix android errors when unflattening an SkImageRef_ashmem object.
Review URL: https://codereview.appspot.com/7228071
git-svn-id: http://skia.googlecode.com/svn/trunk@7514 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/images.gyp | 10 | ||||
| -rw-r--r-- | gyp/ports.gyp | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gyp/images.gyp b/gyp/images.gyp index 1bfd2d30b9..8c4690e574 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -44,6 +44,8 @@ '../src/images/SkImageRef.cpp', '../src/images/SkImageRefPool.cpp', '../src/images/SkImageRefPool.h', + '../src/images/SkImageRef_ashmem.h', + '../src/images/SkImageRef_ashmem.cpp', '../src/images/SkImageRef_GlobalPool.cpp', '../src/images/SkImages.cpp', '../src/images/SkJpegUtility.cpp', @@ -109,7 +111,8 @@ # end libpng stuff }], [ 'skia_os == "android"', { - 'sources!': [ + 'include_dirs': [ + '../src/utils', ], 'dependencies': [ 'android_deps.gyp:gif', @@ -118,6 +121,11 @@ 'defines': [ 'SK_ENABLE_LIBPNG', ], + },{ #else if skia_os != android + 'sources!': [ + '../src/images/SkImageRef_ashmem.h', + '../src/images/SkImageRef_ashmem.cpp', + ], }], [ 'skia_os == "ios"', { 'include_dirs': [ diff --git a/gyp/ports.gyp b/gyp/ports.gyp index 0b298d13c9..219bf3edc6 100644 --- a/gyp/ports.gyp +++ b/gyp/ports.gyp @@ -161,7 +161,6 @@ '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/FontHostConfiguration_android.cpp', - '../src/ports/SkImageRef_ashmem.cpp', ], 'dependencies': [ 'freetype.gyp:freetype', |