commit 1a97c05380da59a44cb47336456ea9855b187910
author Christopher Ferris <cferris@google.com> Tue Mar 17 01:29:51 2015 +0000
committer Christopher Ferris <cferris@google.com> Mon Mar 16 18:32:54 2015 -0700
tree 8309c4fcdc4b693bb1f4eda9f4c3fcf50ff29d80
parent a9ee744457bf2f512726239c3e30f43642a397b2

Revert "Switch x86 and x86_64 build to use GCC 4.9"

This reverts commit 533c7aa6a293659541222f0dd89bee044ba71a2a.

(cherry picked from commit f123057f5e080687ce17e0e9c23a62954db53f39)

Change-Id: I6dd4ccb100341cf6ebf83829448b0ca7395d5468

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index d445ed7..f17a514 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -23,10 +23,10 @@
 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

diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk
index 1f8fb88..2adb157 100644
--- a/core/combo/TARGET_linux-x86_64.mk
+++ b/core/combo/TARGET_linux-x86_64.mk
@@ -26,7 +26,7 @@
 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