Android WebView: don't define sincos.

base/base.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 739 matching lines @@
               ['include', '^sys_info_linux\\.cc$'],
               ['include', '^worker_pool_linux\\.cc$'],
             ],
           }],
           ['OS == "android" and _toolset == "host" and host_os == "linux"', {
             'sources/': [
               # Pull in specific files for host builds.
               ['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;

[brettw, 2013/08/16 19:50:05]

It sucks to have to define this thing as part of the build files. Is there no
existing define we can use to determine if we're building as part of the Android
system?

[Torne, 2013/08/19 10:25:49]

I intentionally haven't provided a global define for android_webview_build,
because we build the WebView code as part of the regular upstream Android build
as well (as a standalone apk for test purposes), and I don't want people to
accidentally #ifdef things that are intended to be WebView-specific because that
doesn't work, the code is only built once upstream.

There's one or two places that, like this, need to be different because of the
build environment differences, and right now we have site-specific defines for
them in this way.

So.. yeah, I've done it this way on purpose to make it hard for #ifdefs to
proliferate through the code. If you think that sucks, we could revisit this;
there's only a few occurrences, so it wouldn't be hard to change.

+               # 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
               # by file name rules).
               ['include', '^atomicops_internals_mac\\.'],
               ['include', '^base_paths_mac\\.'],
               ['include', '^file_util_mac\\.'],
               ['include', '^file_version_info_mac\\.'],
               ['include', '^mac/bundle_locations\\.'],
               ['include', '^mac/foundation_util\\.'],
@@ skipping 115 matching lines @@
           ['<(use_system_nspr)==1 and >(nacl_untrusted_build)==0', {
             'sources/': [
               ['exclude', '^third_party/nspr/'],
             ],
           }],
         ],
       }],
     ],
   },
 }