commit 21005a9cd59a472acaf579b24a2ad26059ac2fb4
author torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Aug 29 04:41:50 2013 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 15:09:17 2020 +0900
tree d01abe146f830f91461ab14aa19c41023c647a6b
parent dd004f65dfe306433e5d4e71db526ce4c9bfaa6f

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


CrOS-Libchrome-Original-Commit: ff9c63928f224d4795652d7986d70b3f5daacd7e

base/os_compat_android.cc

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 @@
 // 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,