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/base.gypi | |
| 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/base.gypi')
| -rw-r--r-- | base/base.gypi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/base/base.gypi b/base/base.gypi index fce37f6..02697b2 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -760,6 +760,13 @@ ['include', '^threading/platform_thread_linux\\.cc$'], ], }], + ['OS == "android" and <(android_webview_build)==1', { + 'defines': [ + # WebView builds as part of the system which already has sincos; + # avoid defining it again as it causes a linker warning. + 'ANDROID_SINCOS_PROVIDED', + ], + }], ['OS == "ios" and _toolset != "host"', { 'sources/': [ # Pull in specific Mac files for iOS (which have been filtered out |