commit 4de1c6fca8d02fc0250dd4bb75b2975130c9d563
author Bruce Beare <bruce.j.beare@intel.com> Mon Dec 27 12:10:22 2010 -0800
committer Bruce Beare <bruce.j.beare@intel.com> Wed Dec 29 12:57:23 2010 -0800
tree a91e49d509cc71a165bc8f6c9a27af9c3416b7ba
parent 5611a6e8270af77759dc128749a5a92d3881cbea

Don't use stale NDK libraries for IA

IA builds will break (due to the bionic _dso_handle bug) if stale libraries are
used. For now, just guard the defns against IA builds.
Change-Id: I03eac990299fce98f467c65707423a9880203f8b
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>

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)