commit 8a06dbc53a988a6e94b5562ff8b6503e6d52c8fa
author Mitchel Humpherys <mitchelh@codeaurora.org> Tue Apr 29 15:59:39 2014 -0700
committer Mitchel Humpherys <mitchelh@codeaurora.org> Tue May 27 15:38:19 2014 -0700
tree a335cf49c5cda011dea6f36e278c88f36426751b
parent 9e1a2256348e1ed999d9afb871baa52ab227e433

rename heap_mask -> heap_id_mask

The Ion API is changing yet again. heap_mask has been renamed in Ion to
heap_id_mask. Rename ours.

Change-Id: I70154b7166ce66b27ae37e31345f32480d2b9b2d

libgralloc/ionalloc.cpp

diff --git a/libgralloc/ionalloc.cpp b/libgralloc/ionalloc.cpp
index e6d34f8..2097320 100644
--- a/libgralloc/ionalloc.cpp
+++ b/libgralloc/ionalloc.cpp
@@ -73,11 +73,7 @@
 
     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.