commit de50c5f5528930b31aa7981d8891370d6ea4e77e
author Kra1o5 <kra1o5x@gmail.com> Thu Apr 23 21:46:36 2015 +0200
committer Kra1o5 <kra1o5x@gmail.com> Thu Apr 23 21:49:57 2015 +0200
tree 5f046d5ba3cd4df0e5b6a6ba6b205bcf68657f93
parent 2252d24c964df89189143e8d09626e9455e0f580

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

diff --git a/minui/Android.mk b/minui/Android.mk
index 5e42d2f..ccf6d3c 100644
--- a/minui/Android.mk
+++ b/minui/Android.mk
@@ -29,6 +29,10 @@
   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

minui/graphics_overlay.c

diff --git a/minui/graphics_overlay.c b/minui/graphics_overlay.c
index 5677ad7..d793b57 100644
--- a/minui/graphics_overlay.c
+++ b/minui/graphics_overlay.c
@@ -145,7 +145,11 @@
     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);
 

minuitwrp/Android.mk

diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk
index c9749eb..f429744 100644
--- a/minuitwrp/Android.mk
+++ b/minuitwrp/Android.mk
@@ -26,6 +26,10 @@
   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 \

minuitwrp/graphics_overlay.c

diff --git a/minuitwrp/graphics_overlay.c b/minuitwrp/graphics_overlay.c
index 05c5472..61d9ecf 100644
--- a/minuitwrp/graphics_overlay.c
+++ b/minuitwrp/graphics_overlay.c
@@ -158,7 +158,11 @@
     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);