p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This reverts commit 6fb735b071.

Change-Id: I64b868cdfb3571de5e8b01e4257b5dfa9ee44d0d
This commit is contained in:
Christopher Ferris 2015-03-25 18:27:21 +00:00
parent 6fb735b071
commit c9d2952e1e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/combo/TARGET_linux-x86.mk
View File

@ -23,10 +23,10 @@ TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := x86
endif endif
# Decouple NDK library selection with platform compiler version # 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)),) 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 else
$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) $(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
endif endif

2
core/combo/TARGET_linux-x86_64.mk
View File

@ -26,7 +26,7 @@ endif
TARGET_NDK_GCC_VERSION := 4.9 TARGET_NDK_GCC_VERSION := 4.9
ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
TARGET_GCC_VERSION := 4.9 TARGET_GCC_VERSION := 4.8
else else
TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
endif endif