1830530 - Don't use pthread_condattr_setclock hack on Android 6 32bit

Status: RESOLVED FIXED

(Core :: mozglue, defect)

Description

[Makoto Kato [:m_kato]]

https://searchfox.org/mozilla-central/rev/566f69826b829767d0373169eef6c50cc7d2241b/mozglue/misc/ConditionVariable_posix.cpp#23-28

Even if Android 32-bit, when minimal API is 21, this causes the following build error.

 0:01.07 /mozilla/mobile-aarch64/mozglue/misc/ConditionVariable_posix.cpp:144:7: error: use of undeclared identifier 'pthread_cond_timedwait_relative_np'; did you mean 'pthread_cond_timedwait_monotonic_np'?
 0:01.07   r = pthread_cond_timedwait_relative_np(ptCond, ptMutex, &rel_ts);
 0:01.08       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 0:01.08       pthread_cond_timedwait_monotonic_np
 0:01.08 /home/makoto/.mozbuild/android-ndk-r23c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/pthread.h:162:5: note: 'pthread_cond_timedwait_monotonic_np' declared here
 0:01.08 int pthread_cond_timedwait_monotonic_np(pthread_cond_t* __cond, pthread_mutex_t* __mutex,
 0:01.08     ^
 0:01.08 1 error generated.

Comment 1

[Makoto Kato [:m_kato]]

Attachment: Bug 1830530 - Set CV_USE_CLOCK_API if Android API is 21+. r=glandium

From pthread.h in NDK r25c

#if __ANDROID_API__ < 21
...
  int pthread_cond_timedwait_relative_np(pthread_cond_t* __cond, pthread_mutex_t* __mutex, const struct timespec* __relative_timeout);
#endif

So we should use ANDROID_API instead of LP64.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/30db77f29d82
Set CV_USE_CLOCK_API if Android API is 21+. r=glandium

Comment 3

[Noemi Erli[:noemi_erli]]

https://hg.mozilla.org/mozilla-central/rev/30db77f29d82