ref: a127690884bd382f57b02fcfc1316479b8b08e64
parent: 38a3fada2456ab8480731f85fbeb01e01c6cb575
parent: 36ae8d9f6c562dde6b9f7c01270cdcde9e9dd025
author: volvet <[email protected]>
date: Fri Mar 7 11:51:19 EST 2014
Merge pull request #430 from licaiguo/android-use-stlport-for-ut use stlport to replace libgnuc++, this remove GCCVERSION variable
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -1,7 +1,6 @@
ARCH = arm
include build/platform-arch.mk
SHAREDLIBSUFFIX = so
-GCCVERSION = 4.8
NDKLEVEL = 12
ifeq ($(ARCH), arm)
CFLAGS += -march=armv7-a -mfloat-abi=softfp
@@ -37,13 +36,12 @@
SHLDFLAGS = -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-soname,libwels.so
STL_INCLUDES = \
- -I$(NDKROOT)/sources/cxx-stl/gnu-libstdc++/$(GCCVERSION)/include \
- -I$(NDKROOT)/sources/cxx-stl/gnu-libstdc++/$(GCCVERSION)/libs/$(APP_ABI)/include
+ -I$(NDKROOT)/sources/cxx-stl/stlport/stlport
GTEST_INCLUDES = $(STL_INCLUDES)
CODEC_UNITTEST_INCLUDES = $(STL_INCLUDES)
CODEC_UNITTEST_LDFLAGS_SUFFIX = \
- $(NDKROOT)/sources/cxx-stl/gnu-libstdc++/$(GCCVERSION)/libs/$(APP_ABI)/libgnustl_static.a
+ $(NDKROOT)/sources/cxx-stl/stlport/libs/$(APP_ABI)/libstlport_static.a
binaries : decdemo encdemo