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

Commit 07aa4c1f authored Mar 25, 2015 by Christopher Ferris Committed by Android Git Automerger Mar 25, 2015

am a45223b6: Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""

* commit 'a45223b6':
  Revert "Switch x86 and x86_64 to 4.9. Attempt #2."

parents 5a8f7067 a45223b6

core/combo/TARGET_linux-x86.mk

+2 −2

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

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

		ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
		$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.9
		$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.8
		else
		$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
		endif

core/combo/TARGET_linux-x86_64.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ endif
		TARGET_NDK_GCC_VERSION := 4.9

		ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
		TARGET_GCC_VERSION := 4.9
		TARGET_GCC_VERSION := 4.8
		else
		TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
		endif