diff options
| author | Ying Wang <wangying@google.com> | 2012-09-06 11:35:34 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-12-14 18:19:15 -0800 |
| commit | c991c16e92fb3ddb7d072f37665cf1ad25b9c4bc (patch) | |
| tree | fbdab87fdf3229b3cab84b4d8a2d2054a0dbf814 | |
| parent | b74eb3fc65db645cf1c52552e77127e073c93685 (diff) | |
| download | protobuf-c991c16e92fb3ddb7d072f37665cf1ad25b9c4bc.tar.gz protobuf-c991c16e92fb3ddb7d072f37665cf1ad25b9c4bc.tar.bz2 protobuf-c991c16e92fb3ddb7d072f37665cf1ad25b9c4bc.zip | |
Build against the NDK for x86 and mips too.
Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -196,13 +196,14 @@ LOCAL_C_INCLUDES := \ 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_C_INCLUDES := \ 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) |