AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Build against the NDK for x86 and mips too.

Browse Source 
Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
This commit is contained in:
Ying Wang 2012-09-06 11:35:34 -07:00
parent b74eb3fc65
commit c991c16e92
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Android.mk
View File

@ -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 := \
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)