From c0c7d2e1ef1deebde1578cd6fea6512ba2d73c45 Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Mon, 7 Sep 2015 12:57:42 +0200 Subject: [PATCH] GN: Fix invalid configuration for Android GCC build. The disabling of the sin,cos,sinf,cosf functions had the wrong condition for GN. This fixes that and also makes the condition in common.gypi a bit more readable. BUG= R=pbos@webrtc.org Review URL: https://codereview.webrtc.org/1307633008 . Cr-Commit-Position: refs/heads/master@{#9871} --- webrtc/BUILD.gn | 5 +---- webrtc/build/common.gypi | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index 05e2e19306..40368597b2 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -153,10 +153,7 @@ config("common_config") { } } - # TODO(kjellander): Handle warnings on Windows where WebRTC differ from the - # default warnings set in build/config/compiler/BUILD.gn. - - if (is_android && is_clang) { + if (is_android && !is_clang) { # The Android NDK doesn"t provide optimized versions of these # functions. Ensure they are disabled for all compilers. cflags += [ diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index 9335d35e06..5caa6cc10c 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -372,7 +372,7 @@ 'WEBRTC_ANDROID', ], 'conditions': [ - ['clang!=1', { + ['clang==0', { # The Android NDK doesn't provide optimized versions of these # functions. Ensure they are disabled for all compilers. 'cflags': [