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 | db9ab02c090cdc5d2b31399867a4052351b8793d (patch) | |
| tree | 85b6e02ce75ee97239780c92191854633722a81a | |
| parent | a6d94785fc7c80c33de99b5a65e6a5e3a2e93fb3 (diff) | |
| download | platform_external_protobuf-jb-mr1-dev.tar.gz platform_external_protobuf-jb-mr1-dev.tar.bz2 platform_external_protobuf-jb-mr1-dev.zip | |
Build against the NDK for x86 and mips too.android-cts-4.2_r2android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-dev
Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk index 5ec5a7056..889764dd2 100644 --- a/Android.mk +++ b/Android.mk @@ -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) |