commit fe81d3d78891b3b5025a6ca24736cad8d5bf9f25
author Andrew Hsieh <andrewhsieh@google.com> Mon Jul 02 16:58:14 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Mon Jul 02 16:58:14 2012 -0700
tree 90f7323ae86fb9e1d2364473b238bde90cce65f7
parent 2ee723b69a4538f5b7c77bb95294e27655778633
parent 942041c6ddf8d7f70573dec60aa9b713c325d5f0

Merge "[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