miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Disabled STLPort built into NDK in favor of my own STLPort, disabled cin/cout/cerr in my STLPort"

Browse Source 
Probably I'll need that commit someday, so I can pull it from Git history now

This reverts commit a3106f9048.
This commit is contained in:
pelya
2010-12-20 14:37:32 +00:00
parent a3106f9048
commit 4a02eeeded
13 changed files with 47 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
project/jni/stlport/Android.mk
View File

@@ -4,13 +4,22 @@ 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
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/stlport -I$(LOCAL_PATH)/src -DANDROID_NO_COUT=1
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/stlport -I$(LOCAL_PATH)/src
LOCAL_CPP_EXTENSION := .cpp
LOCAL_SRC_FILES := $(addprefix src/,$(notdir $(wildcard $(LOCAL_PATH)/src/*.cpp $(LOCAL_PATH)/src/*.c)))
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