From 14df9e5cb2e9f2de4adf9b979e8ef33de37b80bd Mon Sep 17 00:00:00 2001 From: Ignacio Etcheverry Date: Mon, 20 May 2019 18:34:35 +0200 Subject: Android build and export for the mono module --- .../fix-mono-android-pthread_mutexattr_setprotocol.diff | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 modules/mono/build_scripts/patches/fix-mono-android-pthread_mutexattr_setprotocol.diff (limited to 'modules/mono/build_scripts/patches/fix-mono-android-pthread_mutexattr_setprotocol.diff') diff --git a/modules/mono/build_scripts/patches/fix-mono-android-pthread_mutexattr_setprotocol.diff b/modules/mono/build_scripts/patches/fix-mono-android-pthread_mutexattr_setprotocol.diff new file mode 100644 index 0000000000..21cb1a0cf8 --- /dev/null +++ b/modules/mono/build_scripts/patches/fix-mono-android-pthread_mutexattr_setprotocol.diff @@ -0,0 +1,13 @@ +diff --git a/mono/utils/mono-os-mutex.h b/mono/utils/mono-os-mutex.h +index e8039bf4094..ee39c0330b3 100644 +--- a/mono/utils/mono-os-mutex.h ++++ b/mono/utils/mono-os-mutex.h +@@ -57,7 +57,7 @@ mono_os_mutex_init_type (mono_mutex_t *mutex, int type) + if (G_UNLIKELY (res != 0)) + g_error ("%s: pthread_mutexattr_settype failed with \"%s\" (%d)", __func__, g_strerror (res), res); + +-#ifdef PTHREAD_PRIO_INHERIT ++#if defined(PTHREAD_PRIO_INHERIT) && __ANDROID_API__ >= 28 + /* use PTHREAD_PRIO_INHERIT if possible */ + res = pthread_mutexattr_setprotocol (&attr, PTHREAD_PRIO_INHERIT); + if (G_UNLIKELY (res != 0 && res != ENOTSUP)) -- cgit v1.2.3