shithub: openh264

Info  •  Files  •  Log  •  Branches

Use a less generic name for linking to STL when building the plugin for android

This matches the common naming scheme more closely for adding extra
flags to individual parts of the build.

Also deduplicate the static stlport lib name.

--- a/Makefile

+++ b/Makefile

@@ -181,7 +181,7 @@

 $(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIX): $(MODULE_OBJS) $(ENCODER_OBJS) $(DECODER_OBJS) $(PROCESSING_OBJS) $(COMMON_OBJS)

 	$(QUIET)rm -f $@

-	$(QUIET_CXX)$(CXX) $(SHARED) $(LDFLAGS) $(CXX_LINK_O) $+ $(SHLDFLAGS) $(LOCAL_LDLIBS)

+	$(QUIET_CXX)$(CXX) $(SHARED) $(LDFLAGS) $(CXX_LINK_O) $+ $(SHLDFLAGS) $(MODULE_LDFLAGS)

 install-headers:

 	mkdir -p $(PREFIX)/include/wels

--- a/build/platform-android.mk

+++ b/build/platform-android.mk

@@ -40,15 +40,16 @@

 LDFLAGS += --sysroot=$(SYSROOT)

 SHLDFLAGS = -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-soname,lib$(PROJECT_NAME).so

-LOCAL_LDLIBS := $(NDKROOT)/sources/cxx-stl/stlport/libs/$(APP_ABI)/libstlport_static.a 

 STL_INCLUDES = \

     -I$(NDKROOT)/sources/cxx-stl/stlport/stlport

+STL_LIB = \

+    $(NDKROOT)/sources/cxx-stl/stlport/libs/$(APP_ABI)/libstlport_static.a

 GTEST_INCLUDES = $(STL_INCLUDES)

 CODEC_UNITTEST_INCLUDES = $(STL_INCLUDES)

-CODEC_UNITTEST_LDFLAGS_SUFFIX = \

-    $(NDKROOT)/sources/cxx-stl/stlport/libs/$(APP_ABI)/libstlport_static.a

+CODEC_UNITTEST_LDFLAGS_SUFFIX = $(STL_LIB)

 MODULE_INCLUDES = $(STL_INCLUDES)

+MODULE_LDFLAGS = $(STL_LIB)

 binaries : decdemo encdemo