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}
This commit is contained in:
Henrik Kjellander 2015-09-21 16:50:45 +02:00
parent 275a2f16fd
commit 5bfc6cb53a
2 changed files with 4 additions and 12 deletions

View File

@ -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",
]
}
}

View File

@ -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',
]
}],
],
}],