Merge "Fix build problems with gcc-4.6.x."

			-include $(android_config_h) \

			-I $(arch_include_dir)

# This warning causes dalvik not to build with gcc 4.6 and -Werror.

# This warning causes dalvik not to build with gcc 4.6.x and -Werror.

# We cannot turn it off blindly since the option is not available

# in gcc-4.4.x

ifneq ($(filter 4.6.0%, $(shell $(TARGET_CC) --version)),)

TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable

# in gcc-4.4.x.  We also want to disable sincos optimization globally

# by turning off the builtin sin function.

ifneq ($(filter 4.6.%, $(shell $(TARGET_CC) --version)),)

TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable -fno-builtin-sin

endif

# This is to avoid the dreaded warning compiler message: