diff options
| author | Chih-Wei Huang <[email protected]> | 2017-06-04 12:53:01 +0800 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-06-05 14:06:35 +0100 |
| commit | bb0452442a77570fce529cbb3d9fd99a94f3b50e (patch) | |
| tree | ba2dceef2ac2c957290c19be5bcd125e4f2d0239 | |
| parent | 06f4251925af65d7f8d7e2f6041ab3a0a9f4c0dd (diff) | |
Android: use bionic pthread_barrier_* if possible
The pthread_barrier_* functions were introduced to bionic
since Nougat.
Signed-off-by: Chih-Wei Huang <[email protected]>
Acked-by: Tapani Pälli <[email protected]>
Acked-by: Emil Velikov <[email protected]>
| -rw-r--r-- | Android.common.mk | 1 | ||||
| -rw-r--r-- | src/gallium/auxiliary/os/os_thread.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Android.common.mk b/Android.common.mk index 57c31fc7e99..44ad97b6be2 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -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 \ diff --git a/src/gallium/auxiliary/os/os_thread.h b/src/gallium/auxiliary/os/os_thread.h index b6e0698da61..0a238e57493 100644 --- a/src/gallium/auxiliary/os/os_thread.h +++ b/src/gallium/auxiliary/os/os_thread.h @@ -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; |