commit e8b0018c39921940d59bbd4c25bc781304789506
author Andrew Hsieh <andrewhsieh@google.com> Tue Jul 03 09:25:52 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 03 09:25:52 2012 -0700
tree f12ba8806230cba8715992b04bb707bbca3cd287
parent 3a4b39608b6912150c73a9c3eccfc344bb8f6aa5
parent fe81d3d78891b3b5025a6ca24736cad8d5bf9f25

am fe81d3d7: Merge "[MIPS] Use NDK libs for ARM builds only"

* commit 'fe81d3d78891b3b5025a6ca24736cad8d5bf9f25':
  [MIPS] Use NDK libs for ARM builds only

Android.mk

diff --git a/Android.mk b/Android.mk
index 049a2ab..b157044 100755
--- a/Android.mk
+++ b/Android.mk
@@ -52,7 +52,7 @@
 LOCAL_CFLAGS := $(libstlport_cflags)
 LOCAL_CPPFLAGS := $(libstlport_cppflags)
 
-ifneq ($(TARGET_ARCH),x86)
+ifeq ($(TARGET_ARCH),arm)
 LOCAL_NDK_VERSION := 4
 LOCAL_SDK_VERSION := 8
 endif
@@ -70,7 +70,7 @@
 LOCAL_CFLAGS := $(libstlport_cflags)
 LOCAL_CPPFLAGS := $(libstlport_cppflags)
 
-ifneq ($(TARGET_ARCH),x86)
+ifeq ($(TARGET_ARCH),arm)
 LOCAL_NDK_VERSION := 4
 LOCAL_SDK_VERSION := 8
 endif