Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1935)

Unified Diff: base/base.gypi

Issue 22877016: Android WebView: don't define sincos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix variable expansion for target_conditions Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/os_compat_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index fce37f6f4cce44195f00918d89babfbb70d01e62..02697b2133fd802d3b01e47d8f117520fd462a6f 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
« no previous file with comments | « no previous file | base/os_compat_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698