Commit bb045244 authored by Chih-Wei Huang's avatar Chih-Wei Huang Committed by Emil Velikov

Android: use bionic pthread_barrier_* if possible

The pthread_barrier_* functions were introduced to bionic
since Nougat.
Signed-off-by: Chih-Wei Huang's avatarChih-Wei Huang <cwhuang@linux.org.tw>
Acked-by: Tapani Pälli's avatarTapani Pälli <tapani.palli@intel.com>
Acked-by: default avatarEmil Velikov <emil.velikov@collabora.com>
parent 06f42519
......@@ -44,6 +44,7 @@ LOCAL_CFLAGS += \
# It's likely due to a bug elsewhere, but let's temporarily add them
# here to fix the radeonsi build.
LOCAL_CFLAGS += \
-DANDROID_API_LEVEL=$(PLATFORM_SDK_VERSION) \
-DENABLE_SHADER_CACHE \
-D__STDC_CONSTANT_MACROS \
-D__STDC_LIMIT_MACROS \
......
......@@ -75,7 +75,7 @@ __pipe_mutex_assert_locked(mtx_t *mutex)
* pipe_barrier
*/
#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HURD)) && !defined(PIPE_OS_ANDROID)
#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HURD)) && (!defined(PIPE_OS_ANDROID) || ANDROID_API_LEVEL >= 24)
typedef pthread_barrier_t pipe_barrier;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment