From: Tapani Pälli <tapani.palli@intel.com>
Date: Tue, 20 Aug 2019 05:59:23 +0000 (+0300)
Subject: util: fix os_create_anonymous_file on android
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ce8fd042a5b0130cc5c62981828b122127711712;p=mesa.git

util: fix os_create_anonymous_file on android

Commit fixes current crashes with Vulkan applications on Android.

Fixes: c0376a123418 "util: add anon_file.h for all memfd/temp file usage"
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---

diff --git a/src/util/anon_file.c b/src/util/anon_file.c
index 2780c74a680..e36800482fc 100644
--- a/src/util/anon_file.c
+++ b/src/util/anon_file.c
@@ -36,15 +36,16 @@
 
 #ifdef __FreeBSD__
 #include <sys/mman.h>
-#elif defined(HAVE_MEMFD_CREATE)
+#elif defined(HAVE_MEMFD_CREATE) || defined(ANDROID)
 #include <sys/syscall.h>
 #include <linux/memfd.h>
+#include <stdlib.h>
 #else
 #include <stdio.h>
 #include <stdlib.h>
 #endif
 
-#if !(defined(__FreeBSD__) || defined(HAVE_MEMFD_CREATE) || defined(HAVE_MKOSTEMP))
+#if !(defined(__FreeBSD__) || defined(HAVE_MEMFD_CREATE) || defined(HAVE_MKOSTEMP) || defined(ANDROID))
 static int
 set_cloexec_or_close(int fd)
 {
@@ -68,7 +69,7 @@ err:
 }
 #endif
 
-#if !(defined(__FreeBSD__) || defined(HAVE_MEMFD_CREATE))
+#if !(defined(__FreeBSD__) || defined(HAVE_MEMFD_CREATE) || defined(ANDROID))
 static int
 create_tmpfile_cloexec(char *tmpname)
 {
@@ -118,7 +119,7 @@ os_create_anonymous_file(off_t size, const char *debug_name)
 #ifdef __FreeBSD__
    (void*)debug_name;
    fd = shm_open(SHM_ANON, O_CREAT | O_RDWR | O_CLOEXEC, 0600);
-#elif defined(HAVE_MEMFD_CREATE)
+#elif defined(HAVE_MEMFD_CREATE) || defined(ANDROID)
    if (!debug_name)
       debug_name = "mesa-shared";
    fd = syscall(SYS_memfd_create, debug_name, MFD_CLOEXEC);