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

Unified Diff: third_party/mesa/mesa.gyp

Issue 14860010: Android: Roll android_tools to b12d410c0ee23385da78e6c9f353d28fd992e0bd. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Not adding fno-builtin-sin for clang builds Created 7 years, 8 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 | « DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mesa/mesa.gyp
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp
index 1bd999d5a75377c8639df77e929701b2794099f0..7edfc16a24ef44883aa1e9e024ff61b0296fa32d 100644
--- a/third_party/mesa/mesa.gyp
+++ b/third_party/mesa/mesa.gyp
@@ -557,6 +557,14 @@
'-Wstring-conversion',
],
}],
+ ['OS=="android" and clang==0', {
+ # Disable sincos() optimization to avoid a linker error
+ # since Android's math library doesn't have sincos().
+ # Either -fno-builtin-sin or -fno-builtin-cos works.
+ 'cflags': [
+ '-fno-builtin-sin',
+ ],
+ }],
],
},
# Building this target will hide the native OpenGL shared library and
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698