diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-28 19:41:50 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-28 19:41:50 +0000 |
| commit | ff9c63928f224d4795652d7986d70b3f5daacd7e (patch) | |
| tree | 950980b6eacacb403506efd0bdc76ee02f3bd95f /base/os_compat_android.cc | |
| parent | 3cd091f4e1245e820ebca49a8f6b0b227afd0bf2 (diff) | |
| download | chromium_src-ff9c63928f224d4795652d7986d70b3f5daacd7e.zip chromium_src-ff9c63928f224d4795652d7986d70b3f5daacd7e.tar.gz chromium_src-ff9c63928f224d4795652d7986d70b3f5daacd7e.tar.bz2 | |
Android WebView: don't define sincos.
The WebView builds as part of the system, which has sincos in the
versions we support; don't define it in Chromium as this causes a linker
warning.
BUG=157326
Review URL: https://chromiumcodereview.appspot.com/22877016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/os_compat_android.cc')
| -rw-r--r-- | base/os_compat_android.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/os_compat_android.cc b/base/os_compat_android.cc index 2643dc3..ec221e4 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, |