commit 082bf44e4b6c03be4970d461912d1d74adbb4cff
author Ying Wang <wangying@google.com> Thu Sep 06 11:35:34 2012 -0700
committer Ying Wang <wangying@google.com> Fri Sep 07 09:30:03 2012 -0700
tree 85b6e02ce75ee97239780c92191854633722a81a
parent 0e637a107438c37fff84cc89a79ba9fd1bed4a26

Build against the NDK for x86 and mips too.

Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f

Android.mk

diff --git a/Android.mk b/Android.mk
index 5ec5a70..889764d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -196,13 +196,14 @@
 
 LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
 
-ifeq ($(TARGET_ARCH),arm)
 # These are the minimum versions and don't need to be update.
+ifeq ($(TARGET_ARCH),arm)
 LOCAL_SDK_VERSION := 8
-LOCAL_NDK_STL_VARIANT := stlport_static
 else
-include external/stlport/libstlport.mk
+# x86/mips support only available from API 9.
+LOCAL_SDK_VERSION := 9
 endif
+LOCAL_NDK_STL_VARIANT := stlport_static
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -260,13 +261,14 @@
 
 LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
 
-ifeq ($(TARGET_ARCH),arm)
 # These are the minimum versions and don't need to be update.
+ifeq ($(TARGET_ARCH),arm)
 LOCAL_SDK_VERSION := 8
-LOCAL_NDK_STL_VARIANT := stlport_static
 else
-include external/stlport/libstlport.mk
+# x86/mips support only available from API 9.
+LOCAL_SDK_VERSION := 9
 endif
+LOCAL_NDK_STL_VARIANT := stlport_static
 
 include $(BUILD_STATIC_LIBRARY)