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

am 335b1918: am 5a8f7067: am e9b15e2c: Merge "Switch x86 and x86_64 to 4.9. Attempt #2." 

* commit '335b19180077bd56ae5db605a92f0034c25f679e':
  Switch x86 and x86_64 to 4.9. Attempt #2.
This commit is contained in:
Ying Wang 2015-03-25 21:08:24 +00:00 committed by Android Git Automerger
parent 30b5e49796 335b191800
commit 896a1cb0d9
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.8 $(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.9
ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) 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 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.8 TARGET_GCC_VERSION := 4.9
else else
TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
endif endif