commit c9d2952e1e09ec4ad0097d1057de7f9bbc329c3f
author Christopher Ferris <cferris@google.com> Wed Mar 25 18:27:21 2015 +0000
committer Christopher Ferris <cferris@google.com> Wed Mar 25 18:27:21 2015 +0000
tree 4e651ab1f729753aaf6e7a9b31e84cd0232fed9c
parent 6fb735b07132b613de1b5b64c5c31a36c4b9ac2d

Revert "Switch x86 and x86_64 to 4.9. Attempt #2."

This reverts commit 6fb735b07132b613de1b5b64c5c31a36c4b9ac2d.

Change-Id: I64b868cdfb3571de5e8b01e4257b5dfa9ee44d0d

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