[droid] more bionic fun. sonames need to match filenames exactly

Author: theuni

configure.in

@@ -2340,7 +2340,8 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
       --enable-protocol=http \
       --enable-pthreads \
       --enable-runtime-cpudetect \
-      --custom-libname-with-major="\$(FULLNAME)-\$(LIBMAJOR)-${ARCH}\$(SLIBSUF)" \
+      `if test "$target_platform" = "target_android"; then echo '--custom-libname-with-major="\$(SLIBPREF)\$(FULLNAME)-\$(LIBMAJOR)-${ARCH}\$(SLIBSUF)"'; \
+       else echo '--custom-libname-with-major="\$(FULLNAME)-\$(LIBMAJOR)-${ARCH}\$(SLIBSUF)"'; fi` \
       `case $host_cpu in i?86*) echo --disable-pic ;; *) echo --enable-pic ;; esac` \
       --cc="$CC" &&
       sed -i -e "s#define HAVE_SYMVER 1#define HAVE_SYMVER 0#" config.h &&

lib/Makefile.in

@@ -6,13 +6,19 @@ CC=@CC@
 CXX=@CXX@
 SYSDIR=@abs_top_srcdir@/system/players/dvdplayer
 
-AVFORMAT_SO=avformat-53-$(ARCH).so
-AVCODEC_SO=avcodec-53-$(ARCH).so
-AVUTIL_SO=avutil-51-$(ARCH).so
-AVFILTER_SO=avfilter-2-$(ARCH).so
-SWSCALE_SO=swscale-2-$(ARCH).so
-POSTPROC_SO=postproc-52-$(ARCH).so
-SWRESAMPLE_SO=swresample-0-$(ARCH).so
+ifeq (@USE_ANDROID@,1)
+AVPREFIX=lib
+else
+AVPREFIX=
+endif
+
+AVFORMAT_SO=$(AVPREFIX)avformat-53-$(ARCH).so
+AVCODEC_SO=$(AVPREFIX)avcodec-53-$(ARCH).so
+AVUTIL_SO=$(AVPREFIX)avutil-51-$(ARCH).so
+AVFILTER_SO=$(AVPREFIX)avfilter-2-$(ARCH).so
+SWSCALE_SO=$(AVPREFIX)swscale-2-$(ARCH).so
+POSTPROC_SO=$(AVPREFIX)postproc-52-$(ARCH).so
+SWRESAMPLE_SO=$(AVPREFIX)swresample-0-$(ARCH).so
 
 DIRS=
 ifneq (@USE_EXTERNAL_FFMPEG@,1)