| Index: base/os_compat_android.cc
|
| diff --git a/base/os_compat_android.cc b/base/os_compat_android.cc
|
| index 2643dc30e1ed9cdea47f098b599bad3dd8fe3e7d..ec221e480dc9f54c175dda07c5fb0b8662ca39d8 100644
|
| --- a/base/os_compat_android.cc
|
| +++ b/base/os_compat_android.cc
|
| @@ -75,7 +75,8 @@ time_t timegm(struct tm* const t) {
|
| // for each function would simply end up calling itself, resulting in a
|
| // runtime crash due to stack overflow.
|
| //
|
| -#if defined(__GNUC__) && !defined(__clang__)
|
| +#if defined(__GNUC__) && !defined(__clang__) && \
|
| + !defined(ANDROID_SINCOS_PROVIDED)
|
|
|
| // For the record, Clang does not support the 'optimize' attribute.
|
| // In the unlikely event that it begins performing this optimization too,
|
|
|