diff options
| author | Ben Cheng <bccheng@google.com> | 2014-04-11 17:10:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-11 17:10:37 +0000 |
| commit | 19b7c4d5c906523954e157a0efebf8197fdb1964 (patch) | |
| tree | 47d823e3eae189c6371a907a53ef117373744026 /core/combo/TARGET_linux-arm.mk | |
| parent | 6c277faccf37057d60526eb05a2f0d602278b533 (diff) | |
| parent | e4d787bfbbde83bc4b868ed804c94118c2ea0080 (diff) | |
| download | build-19b7c4d5c906523954e157a0efebf8197fdb1964.zip build-19b7c4d5c906523954e157a0efebf8197fdb1964.tar.gz build-19b7c4d5c906523954e157a0efebf8197fdb1964.tar.bz2 | |
am e4d787bf: am 7e793040: am eec11d97: Merge "Decouple platform compiler and NDK library versioning."
* commit 'e4d787bfbbde83bc4b868ed804c94118c2ea0080':
Decouple platform compiler and NDK library versioning.
Diffstat (limited to 'core/combo/TARGET_linux-arm.mk')
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index e4e656d..b8070de 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -34,6 +34,9 @@ ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),) TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := armv5te endif +# Decouple NDK library selection with platform compiler version +$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.8 + ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) $(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.8 else |