Merge "Upgrade gcc compiler for arm build from 4.8 to 4.9" (37979c57) · Commits · e / os / android_build

core/combo/TARGET_linux-arm.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -35,10 +35,10 @@ TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := armv5te
		endif

		# Decouple NDK library selection with platform compiler version
		$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.8
		$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.9

		ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
		$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.8
		$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.9
		else
		$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
		endif
		@@ -114,7 +114,7 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
		# "-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, $($(combo_2nd_arch_prefix)TARGET_GCC_VERSION)),)
		ifneq ($(filter 4.6 4.6.% 4.7 4.7.% 4.8 4.9, $($(combo_2nd_arch_prefix)TARGET_GCC_VERSION)),)
		$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -fno-builtin-sin \
		-fno-strict-volatile-bitfields
		endif