From b119369cdc26b1b593b808d51eb0e6eeafef86d3 Mon Sep 17 00:00:00 2001 From: "wjia@webrtc.org" Date: Sat, 12 Jan 2013 01:52:07 +0000 Subject: [PATCH] Fix android clang build. no-builtin-cos|sin|cosf|sinf are not used for some files (g711.c, g711_interface.c, g722_encode.c, g722_decode.c, g722_interface.c, pcm16b.c). Review URL: https://webrtc-codereview.appspot.com/1032006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3369 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/build/common.gypi | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index b420b09f2a..a3fc14a9f1 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -236,20 +236,22 @@ 'WEBRTC_CLOCK_TYPE_REALTIME', 'WEBRTC_THREAD_RR', ], - # The Android NDK doesn't provide optimized versions of these - # functions. Ensure they are disabled for all compilers. - 'cflags': [ - '-fno-builtin-cos', - '-fno-builtin-sin', - '-fno-builtin-cosf', - '-fno-builtin-sinf', - ], 'conditions': [ ['enable_android_opensl==1', { 'defines': [ 'WEBRTC_ANDROID_OPENSLES', ], }], + ['clang!=1', { + # The Android NDK doesn't provide optimized versions of these + # functions. Ensure they are disabled for all compilers. + 'cflags': [ + '-fno-builtin-cos', + '-fno-builtin-sin', + '-fno-builtin-cosf', + '-fno-builtin-sinf', + ], + }], ], }], ], # conditions