1 files changed, 4 insertions, 3 deletions
diff --git a/src/ports/SkImageRef_ashmem.cpp b/src/ports/SkImageRef_ashmem.cpp
index cdd56c811d..f8a9bb9f90 100644
--- a/src/ports/SkImageRef_ashmem.cpp
+++ b/src/ports/SkImageRef_ashmem.cpp
@@ -7,12 +7,13 @@
  */
 #include "SkImageRef_ashmem.h"
 #include "SkImageDecoder.h"
-#include "SkFlattenable.h"
+#include "SkFlattenableBuffers.h"
 #include "SkThread.h"
 
+#include "android/ashmem.h"
+
 #include <sys/mman.h>
 #include <unistd.h>
-#include <cutils/ashmem.h>
 
 //#define TRACE_ASH_PURGE     // just trace purges
 
@@ -224,7 +225,7 @@ SkImageRef_ashmem::SkImageRef_ashmem(SkFlattenableReadBuffer& buffer)
     fRec.fSize = 0;
     fRec.fPinned = false;
     fCT = NULL;
-    const char* uri = buffer.readString();
+    char* uri = buffer.readString();
     if (uri) {
         setURI(uri);
         sk_free(uri);