commit 68ee7c0e3e18cf51e019a1509923f11eca9a4dcd
author Naseer Ahmed <naseer@codeaurora.org> Fri Apr 11 19:59:39 2014 -0400
committer Naseer Ahmed <naseer@codeaurora.org> Mon Apr 14 10:51:47 2014 -0400
tree 3959bfdacc9f8da8abe2f7523f236a306c68fac1
parent 07bded6ac921e7049cc4b5075c0f9cd5a402ea4b

gralloc: Fix heap_id_mask

heap_mask has changed to heap_id_mask in newer ion headers.

Change-Id: I605ea81a59660e1aaae2e688dca5fa27c74e79a8

libgralloc/ionalloc.cpp

diff --git a/libgralloc/ionalloc.cpp b/libgralloc/ionalloc.cpp
index 3acf06e..e657610 100644
--- a/libgralloc/ionalloc.cpp
+++ b/libgralloc/ionalloc.cpp
@@ -73,7 +73,11 @@
 
     ionAllocData.len = data.size;
     ionAllocData.align = data.align;
+#ifdef QCOM_BSP
     ionAllocData.heap_mask = data.flags & ~ION_SECURE;
+#else
+    ionAllocData.heap_id_mask = data.flags & ~ION_SECURE;
+#endif
     ionAllocData.flags = data.uncached ? 0 : ION_FLAG_CACHED;
     // ToDo: replace usage of alloc data structure with
     //  ionallocdata structure.