diff options
| author | Ying Wang <wangying@android.com> | 2015-03-25 18:11:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-25 18:11:54 +0000 |
| commit | e9b15e2ccd07bb148b7fd7642658b9b54c0f47d0 (patch) | |
| tree | 41839d9baae4def2838fef95bd484d56e5e31fad /core | |
| parent | 5d60719e42fdc0d007920d946f1c1bb440cedab7 (diff) | |
| parent | 6fb735b07132b613de1b5b64c5c31a36c4b9ac2d (diff) | |
| download | build-e9b15e2ccd07bb148b7fd7642658b9b54c0f47d0.zip build-e9b15e2ccd07bb148b7fd7642658b9b54c0f47d0.tar.gz build-e9b15e2ccd07bb148b7fd7642658b9b54c0f47d0.tar.bz2 | |
Merge "Switch x86 and x86_64 to 4.9. Attempt #2."
Diffstat (limited to 'core')
| -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 |