diff options
| author | Ben Cheng <bccheng@google.com> | 2013-08-28 18:26:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-08-28 18:26:58 +0000 |
| commit | d58df2de78b798f8fc301afcfeb61f574629b8ce (patch) | |
| tree | 8b5d372f8fec724b1b7c18e513e11c6f8214838b | |
| parent | d7a9f708870ebd82bc57e478541068bb7ed987c4 (diff) | |
| parent | 85ccf735e2d261b5b302635505ea1db85975c597 (diff) | |
| download | build-d58df2de78b798f8fc301afcfeb61f574629b8ce.tar.gz | |
Merge "Re-tighten default compiler options."
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index c31fe59385..48f48981ce 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -109,14 +109,13 @@ android_config_h := $(call select-android-config-h,linux-arm) TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h)) TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS) -# This warning causes dalvik not to build with gcc 4.6+ and -Werror. -# We cannot turn it off blindly since the option is not available -# in gcc-4.4.x. We also want to disable sincos optimization globally -# by turning off the builtin sin function. +# The "-Wunused-but-set-variable" option often breaks projects that enable +# "-Wall -Werror" due to a commom idiom "ALOGV(mesg)" where ALOGV is turned +# into no-op in some builds while mesg is defined earlier. So we explicitly +# disable "-Wunused-but-set-variable" here. ifneq ($(filter 4.6 4.6.% 4.7 4.7.% 4.8, $(TARGET_GCC_VERSION)),) TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable -fno-builtin-sin \ - -fno-strict-volatile-bitfields \ - -Wno-unused-parameter -Wno-unused-but-set-parameter + -fno-strict-volatile-bitfields endif # This is to avoid the dreaded warning compiler message: |