commit 534b7341a1d4b2972d373e5d5f10452b245a6c50
author Jean-Baptiste Queru <jbq@google.com> Fri Jan 07 10:30:41 2011 -0800
committer Android Code Review <code-review@android.com> Fri Jan 07 10:30:41 2011 -0800
tree a91e49d509cc71a165bc8f6c9a27af9c3416b7ba
parent 5611a6e8270af77759dc128749a5a92d3881cbea
parent 4de1c6fca8d02fc0250dd4bb75b2975130c9d563

Merge "Don't use stale NDK libraries for IA"

Android.mk

diff --git a/Android.mk b/Android.mk
index 79ee889..a86a796 100755
--- a/Android.mk
+++ b/Android.mk
@@ -51,8 +51,10 @@
 LOCAL_CFLAGS := $(libstlport_cflags)
 LOCAL_CPPFLAGS := $(libstlport_cppflags)
 
+ifneq ($(TARGET_ARCH),x86)
 LOCAL_NDK_VERSION := 4
 LOCAL_SDK_VERSION := 8
+endif
 
 include $(LOCAL_PATH)/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)
@@ -67,8 +69,10 @@
 LOCAL_CFLAGS := $(libstlport_cflags)
 LOCAL_CPPFLAGS := $(libstlport_cppflags)
 
+ifneq ($(TARGET_ARCH),x86)
 LOCAL_NDK_VERSION := 4
 LOCAL_SDK_VERSION := 8
+endif
 
 include $(LOCAL_PATH)/libstlport.mk
 include $(BUILD_STATIC_LIBRARY)