ref: 2966abd937478cf60e7d0a82185f2a80cda586de
parent: 72990e129070a8fa44608467900085c1eb151f87
parent: 2f02bf9626ab3168dc0089c61a84ee5495a836cf
author: Ethan Hugg <[email protected]>
date: Mon Feb 24 02:45:13 EST 2014
Merge pull request #350 from mstorsjo/android-unittest Link codec_unittest to the static android STL
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@
H264ENC_LDFLAGS = -L. $(call LINK_LIB,encoder) $(call LINK_LIB,processing) $(call LINK_LIB,common)
H264ENC_DEPS = $(LIBPREFIX)encoder.$(LIBSUFFIX) $(LIBPREFIX)processing.$(LIBSUFFIX) $(LIBPREFIX)common.$(LIBSUFFIX)
-CODEC_UNITTEST_LDFLAGS = -L. $(call LINK_LIB,gtest) $(call LINK_LIB,decoder) $(call LINK_LIB,encoder) $(call LINK_LIB,processing) $(call LINK_LIB,common)
+CODEC_UNITTEST_LDFLAGS = -L. $(call LINK_LIB,gtest) $(call LINK_LIB,decoder) $(call LINK_LIB,encoder) $(call LINK_LIB,processing) $(call LINK_LIB,common) $(CODEC_UNITTEST_LDFLAGS_SUFFIX)
CODEC_UNITTEST_DEPS = $(LIBPREFIX)gtest.$(LIBSUFFIX) $(LIBPREFIX)decoder.$(LIBSUFFIX) $(LIBPREFIX)encoder.$(LIBSUFFIX) $(LIBPREFIX)processing.$(LIBSUFFIX) $(LIBPREFIX)common.$(LIBSUFFIX)
.PHONY: test gtest-bootstrap clean
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -50,6 +50,8 @@
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
binaries : decdemo encdemo