summaryrefslogtreecommitdiffstats
path: root/minui
diff options
context:
space:
mode:
authorKra1o5 <kra1o5x@gmail.com>2015-04-23 21:46:36 +0200
committerKra1o5 <kra1o5x@gmail.com>2015-04-23 21:49:57 +0200
commitde50c5f5528930b31aa7981d8891370d6ea4e77e (patch)
tree5f046d5ba3cd4df0e5b6a6ba6b205bcf68657f93 /minui
parenttwrpTar: fix segfault after encrypted backups (diff)
downloadandroid_bootable_recovery-de50c5f5528930b31aa7981d8891370d6ea4e77e.tar
android_bootable_recovery-de50c5f5528930b31aa7981d8891370d6ea4e77e.tar.gz
android_bootable_recovery-de50c5f5528930b31aa7981d8891370d6ea4e77e.tar.bz2
android_bootable_recovery-de50c5f5528930b31aa7981d8891370d6ea4e77e.tar.lz
android_bootable_recovery-de50c5f5528930b31aa7981d8891370d6ea4e77e.tar.xz
android_bootable_recovery-de50c5f5528930b31aa7981d8891370d6ea4e77e.tar.zst
android_bootable_recovery-de50c5f5528930b31aa7981d8891370d6ea4e77e.zip
Diffstat (limited to 'minui')
-rw-r--r--minui/Android.mk4
-rw-r--r--minui/graphics_overlay.c4
2 files changed, 8 insertions, 0 deletions
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);