Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cea0755 authored by Ben Cheng's avatar Ben Cheng
Browse files

Re-tighten default compiler options.

Remove "-Wno-unused-parameter -Wno-unused-but-set-parameter" added for
GCC 4.8 experiment.

BUG: 10495043
Change-Id: I774deb09c782fe79eb473fdefd471725a1f97fd5
parent 287bd644
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -109,14 +109,13 @@ TARGET_GLOBAL_CFLAGS += \
			-include $(android_config_h) \
			-I $(dir $(android_config_h))

# 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: