commit 528a556514fddfd1275cda9f2c2af17abc02c693
author djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Feb 01 15:57:13 2013 +0000
committer djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Feb 01 15:57:13 2013 +0000
tree 1606387d38ab1c4eebd64b67f50dab4b826e0b6a
parent d11c91e7aa10c260c1dc5d978d1620a2b9be19e8

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

src/images/SkImages.cpp

diff --git a/src/images/SkImages.cpp b/src/images/SkImages.cpp
index 0bcc33f..5b6bf6b 100644
--- a/src/images/SkImages.cpp
+++ b/src/images/SkImages.cpp
@@ -9,6 +9,13 @@
 #include "SkImageRef_GlobalPool.h"
 #include "SkImages.h"
 
+#ifdef SK_BUILD_FOR_ANDROID
+#include "SkImageRef_ashmem.h"
+#endif
+
 void SkImages::InitializeFlattenables() {
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkImageRef_GlobalPool)
+#ifdef SK_BUILD_FOR_ANDROID
+    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkImageRef_ashmem)
+#endif
 }