Skip to content

P
protobuf
Commit c991c16e authored by Ying Wang's avatar Ying Wang
Browse files
Options

Build against the NDK for x86 and mips too. 

Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
parent b74eb3fc
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
Android.mk
View file @ c991c16e
...@@ -196,13 +196,14 @@ LOCAL_C_INCLUDES := \ ...@@ -196,13 +196,14 @@ LOCAL_C_INCLUDES := \
LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
ifeq ($(TARGET_ARCH),arm)
# These are the minimum versions and don't need to be update. # These are the minimum versions and don't need to be update.
ifeq ($(TARGET_ARCH),arm)
LOCAL_SDK_VERSION := 8 LOCAL_SDK_VERSION := 8
LOCAL_NDK_STL_VARIANT := stlport_static
else else
include external/stlport/libstlport.mk # x86/mips support only available from API 9.
LOCAL_SDK_VERSION := 9
endif endif
LOCAL_NDK_STL_VARIANT := stlport_static
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
...@@ -260,13 +261,14 @@ LOCAL_C_INCLUDES := \ ...@@ -260,13 +261,14 @@ LOCAL_C_INCLUDES := \
LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
ifeq ($(TARGET_ARCH),arm)
# These are the minimum versions and don't need to be update. # These are the minimum versions and don't need to be update.
ifeq ($(TARGET_ARCH),arm)
LOCAL_SDK_VERSION := 8 LOCAL_SDK_VERSION := 8
LOCAL_NDK_STL_VARIANT := stlport_static
else else
include external/stlport/libstlport.mk # x86/mips support only available from API 9.
LOCAL_SDK_VERSION := 9
endif endif
LOCAL_NDK_STL_VARIANT := stlport_static
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment