diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 18:02:58 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 18:02:58 +0000 |
| commit | 31476c3ba5043732e95acd0282f5b75eb51a9226 (patch) | |
| tree | 6645480cc36fd528fca9067dac93467f2e15325d /third_party/mesa | |
| parent | 0edce6af5cefdb4d9f5a06f61e58f7e4c6bc640f (diff) | |
| download | chromium_src-31476c3ba5043732e95acd0282f5b75eb51a9226.zip chromium_src-31476c3ba5043732e95acd0282f5b75eb51a9226.tar.gz chromium_src-31476c3ba5043732e95acd0282f5b75eb51a9226.tar.bz2 | |
Android: Roll android_tools to b12d410c0ee23385da78e6c9f353d28fd992e0bd.
This change updates the ndk sources and toolchain to r8e
http://developer.android.com/tools/sdk/ndk/index.html
Also patching in https://chromiumcodereview.appspot.com/14840008/ to disable sincos optimization in third_party/mesa/
BUG=
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/14860010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mesa')
| -rw-r--r-- | third_party/mesa/mesa.gyp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp index 1bd999d..7edfc16 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 |