Added some support for NDK r5, commented out cin/cout/cerr in built-in STLPort bercause they keep crashing
This commit is contained in:
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := stlport
|
||||
|
||||
ifneq ($(CRYSTAX_TOOLCHAIN),)
|
||||
ifneq ($(CRYSTAX_TOOLCHAIN)$(NDK_R5_TOOLCHAIN),)
|
||||
LOCAL_CPP_EXTENSION := .cpp
|
||||
LOCAL_SRC_FILES := dummy.c
|
||||
else
|
||||
@@ -14,3 +14,12 @@ LOCAL_SRC_FILES := $(addprefix src/,$(notdir $(wildcard $(LOCAL_PATH)/src/*.cpp
|
||||
endif
|
||||
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
ifeq ($(NDK_R5_TOOLCHAIN),)
|
||||
# Dummy stlport_shared to use the same Java code for all NDKs
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := stlport_shared
|
||||
LOCAL_CPP_EXTENSION := .cpp
|
||||
LOCAL_SRC_FILES := dummy.c
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user