diff options
| author | Christopher Ferris <cferris@google.com> | 2015-03-25 18:58:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-25 18:58:54 +0000 |
| commit | 9226f8fc3be69d6c3ba9ea583aa36845e91eb7e4 (patch) | |
| tree | 75aaec849ee081b0aa8291f248343ed1fe2706fc /core | |
| parent | 335b19180077bd56ae5db605a92f0034c25f679e (diff) | |
| parent | 07aa4c1feea3e16a99f082b71a631b20ddb8dddf (diff) | |
| download | build-9226f8fc3be69d6c3ba9ea583aa36845e91eb7e4.zip build-9226f8fc3be69d6c3ba9ea583aa36845e91eb7e4.tar.gz build-9226f8fc3be69d6c3ba9ea583aa36845e91eb7e4.tar.bz2 | |
am 07aa4c1f: am a45223b6: Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""
* commit '07aa4c1feea3e16a99f082b71a631b20ddb8dddf':
Revert "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 d445ed7..f17a514 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.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 diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index 1f8fb88..2adb157 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.9 +TARGET_GCC_VERSION := 4.8 else TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) endif |