diff options
| author | Ying Wang <wangying@android.com> | 2015-03-25 21:08:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-25 21:08:24 +0000 |
| commit | 896a1cb0d99ab009c94245a72ac0507ad44ff74a (patch) | |
| tree | 1e166f1b151824bb82379d524620c8d05d7d1305 /core/combo | |
| parent | 30b5e49796ca69fcb15838b0d0cbf740da547b39 (diff) | |
| parent | 335b19180077bd56ae5db605a92f0034c25f679e (diff) | |
| download | build-896a1cb0d99ab009c94245a72ac0507ad44ff74a.zip build-896a1cb0d99ab009c94245a72ac0507ad44ff74a.tar.gz build-896a1cb0d99ab009c94245a72ac0507ad44ff74a.tar.bz2 | |
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.
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 4 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-x86_64.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index f17a514..d445ed7 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -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.8 +$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.9 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 $(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) endif diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index 2adb157..1f8fb88 100644 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -26,7 +26,7 @@ endif TARGET_NDK_GCC_VERSION := 4.9 ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) -TARGET_GCC_VERSION := 4.8 +TARGET_GCC_VERSION := 4.9 else TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) endif |