Skip to content
This repository
Browse code

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

  • Loading branch information...
commit d6e95464b2453ffb3fe9fc7122e43c78887e5071 1 parent 175acf6
theuni authored

Showing 2 changed files with 15 additions and 8 deletions. Show diff stats Hide diff stats

  1. +2 1  configure.in
  2. +13 7 lib/Makefile.in
3  configure.in
@@ -2340,7 +2340,8 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
2340 2340 --enable-protocol=http \
2341 2341 --enable-pthreads \
2342 2342 --enable-runtime-cpudetect \
2343   - --custom-libname-with-major="\$(FULLNAME)-\$(LIBMAJOR)-${ARCH}\$(SLIBSUF)" \
  2343 + `if test "$target_platform" = "target_android"; then echo '--custom-libname-with-major="\$(SLIBPREF)\$(FULLNAME)-\$(LIBMAJOR)-${ARCH}\$(SLIBSUF)"'; \
  2344 + else echo '--custom-libname-with-major="\$(FULLNAME)-\$(LIBMAJOR)-${ARCH}\$(SLIBSUF)"'; fi` \
2344 2345 `case $host_cpu in i?86*) echo --disable-pic ;; *) echo --enable-pic ;; esac` \
2345 2346 --cc="$CC" &&
2346 2347 sed -i -e "s#define HAVE_SYMVER 1#define HAVE_SYMVER 0#" config.h &&
20 lib/Makefile.in
@@ -6,13 +6,19 @@ CC=@CC@
6 6 CXX=@CXX@
7 7 SYSDIR=@abs_top_srcdir@/system/players/dvdplayer
8 8
9   -AVFORMAT_SO=avformat-53-$(ARCH).so
10   -AVCODEC_SO=avcodec-53-$(ARCH).so
11   -AVUTIL_SO=avutil-51-$(ARCH).so
12   -AVFILTER_SO=avfilter-2-$(ARCH).so
13   -SWSCALE_SO=swscale-2-$(ARCH).so
14   -POSTPROC_SO=postproc-52-$(ARCH).so
15   -SWRESAMPLE_SO=swresample-0-$(ARCH).so
  9 +ifeq (@USE_ANDROID@,1)
  10 +AVPREFIX=lib
  11 +else
  12 +AVPREFIX=
  13 +endif
  14 +
  15 +AVFORMAT_SO=$(AVPREFIX)avformat-53-$(ARCH).so
  16 +AVCODEC_SO=$(AVPREFIX)avcodec-53-$(ARCH).so
  17 +AVUTIL_SO=$(AVPREFIX)avutil-51-$(ARCH).so
  18 +AVFILTER_SO=$(AVPREFIX)avfilter-2-$(ARCH).so
  19 +SWSCALE_SO=$(AVPREFIX)swscale-2-$(ARCH).so
  20 +POSTPROC_SO=$(AVPREFIX)postproc-52-$(ARCH).so
  21 +SWRESAMPLE_SO=$(AVPREFIX)swresample-0-$(ARCH).so
16 22
17 23 DIRS=
18 24 ifneq (@USE_EXTERNAL_FFMPEG@,1)

0 comments on commit d6e9546

Please sign in to comment.
Something went wrong with that request. Please try again.