From 5bfc6cb53a3923cccbcba439a859fcf42d44fa9f Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Mon, 21 Sep 2015 16:50:45 +0200 Subject: [PATCH] Revert "Android: Enable C99 mode instead of C89 (default)." This reverts commit 7bff85c2bc741102b41b259752269f9ecd398d68. It was partially reverted in https://codereview.webrtc.org/1354163002. This reverts the rest. BUG=webrtc:4960, webrtc:5016 TBR=andrew@webrtc.org Review URL: https://codereview.webrtc.org/1343263004 . Cr-Commit-Position: refs/heads/master@{#10003} --- webrtc/BUILD.gn | 8 ++------ webrtc/build/common.gypi | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index 56d06cf129..40368597b2 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -154,18 +154,14 @@ config("common_config") { } if (is_android && !is_clang) { + # The Android NDK doesn"t provide optimized versions of these + # functions. Ensure they are disabled for all compilers. cflags += [ - # The Android NDK doesn't provide optimized versions of these - # functions. Ensure they are disabled for all compilers. "-fno-builtin-cos", "-fno-builtin-sin", "-fno-builtin-cosf", "-fno-builtin-sinf", ] - cflags_c = [ - # Use C99 mode instead of C89 (default). - "-std=c99", - ] } } diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index be1451d643..5caa6cc10c 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -373,18 +373,14 @@ ], 'conditions': [ ['clang==0', { + # The Android NDK doesn't provide optimized versions of these + # functions. Ensure they are disabled for all compilers. 'cflags': [ - # The Android NDK doesn't provide optimized versions of these - # functions. Ensure they are disabled for all compilers. '-fno-builtin-cos', '-fno-builtin-sin', '-fno-builtin-cosf', '-fno-builtin-sinf', ], - 'cflags_c': [ - # Use C99 mode instead of C89 (default). - '-std=c99', - ] }], ], }],