build: fix ODR violation
This commit fixes the regression introduced by b9df5331 that switched to the c++ static runtime and caused exceptions to be uncaught. As https://developer.android.com/ndk/guides/cpp-support.html#static_runtimes explains it, one process should *NEVER* link with more than one shared libraries that link with the c++ static library. To fix this issue: libmla and libvlc are now static and linked together as libvlcjni.so with the c++ static library.
Showing
- compile-libvlc.sh 48 additions, 59 deletionscompile-libvlc.sh
- libvlc/build.gradle 1 addition, 1 deletionlibvlc/build.gradle
- libvlc/jni/Android.mk 26 additions, 28 deletionslibvlc/jni/Android.mk
- libvlc/jni/dummy.cpp 0 additions, 1 deletionlibvlc/jni/dummy.cpp
- libvlc/jni/libvlcjni.c 4 additions, 17 deletionslibvlc/jni/libvlcjni.c
- libvlc/jni/loader/Android.mk 6 additions, 0 deletionslibvlc/jni/loader/Android.mk
- libvlc/jni/loader/jniloader.c 99 additions, 0 deletionslibvlc/jni/loader/jniloader.c
- libvlc/jni/loader/jniloader.h 36 additions, 0 deletionslibvlc/jni/loader/jniloader.h
- libvlc/src/org/videolan/libvlc/LibVLC.java 1 addition, 1 deletionlibvlc/src/org/videolan/libvlc/LibVLC.java
- medialibrary/jni/Android.mk 4 additions, 4 deletionsmedialibrary/jni/Android.mk
- medialibrary/jni/AndroidMediaLibrary.cpp 1 addition, 0 deletionsmedialibrary/jni/AndroidMediaLibrary.cpp
- medialibrary/jni/medialibrary.cpp 6 additions, 18 deletionsmedialibrary/jni/medialibrary.cpp
- medialibrary/jni/utils.h 0 additions, 2 deletionsmedialibrary/jni/utils.h
- medialibrary/src/org/videolan/medialibrary/Medialibrary.java 0 additions, 1 deletionmedialibrary/src/org/videolan/medialibrary/Medialibrary.java
Loading
-
mentioned in commit b69c0825
-
mentioned in commit 6ba71f4f
-
mentioned in issue #797 (closed)
Please register or sign in to comment