commit e685e849c02bb75bf0d9c871e87556472c4fca73
author Dan Albert <danalbert@google.com> Fri Mar 13 23:21:24 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 13 23:21:24 2015 +0000
tree a9f8d50a1465dc43eb90f19e92e4d973c130f58f
parent b478d625f2f72440f239ec538fae167ede45f49e
parent 8de543fdec61cae9eef8e3b3f7a0e5cc4cd0aa70

am 8de543fd: Merge "Switch NDK libraries to 4.9 for x86_64 and mips64"

* commit '8de543fdec61cae9eef8e3b3f7a0e5cc4cd0aa70':
  Switch NDK libraries to 4.9 for x86_64 and mips64

core/combo/TARGET_linux-x86_64.mk

diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk
index 89e42f9..2adb157 100644
--- a/core/combo/TARGET_linux-x86_64.mk
+++ b/core/combo/TARGET_linux-x86_64.mk
@@ -23,7 +23,7 @@
 endif
 
 # Decouple NDK library selection with platform compiler version
-TARGET_NDK_GCC_VERSION := 4.8
+TARGET_NDK_GCC_VERSION := 4.9
 
 ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
 TARGET_GCC_VERSION := 4.8