From de50c5f5528930b31aa7981d8891370d6ea4e77e Mon Sep 17 00:00:00 2001
From: Kra1o5 <kra1o5x@gmail.com>
Date: Thu, 23 Apr 2015 21:46:36 +0200
Subject: Add option to use new heap_id_mask instead of old heap_mask Use
 TW_NEW_ION_HEAP := true to use it

Change-Id: I2ad105fa6d122b460ed4b5dc78563077b7904567
---
 minui/Android.mk             | 4 ++++
 minui/graphics_overlay.c     | 4 ++++
 minuitwrp/Android.mk         | 4 ++++
 minuitwrp/graphics_overlay.c | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/minui/Android.mk b/minui/Android.mk
index 5e42d2fa9..ccf6d3c2a 100644
--- a/minui/Android.mk
+++ b/minui/Android.mk
@@ -29,6 +29,10 @@ else
   LOCAL_C_INCLUDES += $(commands_recovery_local_path)/minui/include
 endif
 
+ifeq ($(TW_NEW_ION_HEAP), true)
+  LOCAL_CFLAGS += -DNEW_ION_HEAP
+endif
+
 LOCAL_STATIC_LIBRARY := libpng
 LOCAL_WHOLE_STATIC_LIBRARIES := libpixelflinger_static
 LOCAL_MODULE := libminui
diff --git a/minui/graphics_overlay.c b/minui/graphics_overlay.c
index 5677ad73d..d793b57e6 100644
--- a/minui/graphics_overlay.c
+++ b/minui/graphics_overlay.c
@@ -145,7 +145,11 @@ int alloc_ion_mem(unsigned int size)
     ionAllocData.flags = 0;
     ionAllocData.len = size;
     ionAllocData.align = sysconf(_SC_PAGESIZE);
+#ifdef NEW_ION_HEAP
+    ionAllocData.heap_id_mask =
+#else
     ionAllocData.heap_mask =
+#endif
             ION_HEAP(ION_IOMMU_HEAP_ID) |
             ION_HEAP(ION_SYSTEM_CONTIG_HEAP_ID);
 
diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk
index c9749eb16..f42974413 100644
--- a/minuitwrp/Android.mk
+++ b/minuitwrp/Android.mk
@@ -26,6 +26,10 @@ else
   LOCAL_C_INCLUDES += $(commands_recovery_local_path)/minuitwrp/include
 endif
 
+ifeq ($(TW_NEW_ION_HEAP), true)
+  LOCAL_CFLAGS += -DNEW_ION_HEAP
+endif
+
 LOCAL_C_INCLUDES += \
     external/libpng \
     external/zlib \
diff --git a/minuitwrp/graphics_overlay.c b/minuitwrp/graphics_overlay.c
index 05c5472dc..61d9ecf47 100644
--- a/minuitwrp/graphics_overlay.c
+++ b/minuitwrp/graphics_overlay.c
@@ -158,7 +158,11 @@ int alloc_ion_mem(unsigned int size)
     ionAllocData.flags = 0;
     ionAllocData.len = size;
     ionAllocData.align = sysconf(_SC_PAGESIZE);
+#ifdef NEW_ION_HEAP
+    ionAllocData.heap_id_mask =
+#else
     ionAllocData.heap_mask =
+#endif
             ION_HEAP(ION_IOMMU_HEAP_ID) |
             ION_HEAP(ION_SYSTEM_CONTIG_HEAP_ID);
 
-- 
cgit v1.2.3