Skip to content
Commit b69c0825 authored by Thomas Guillem's avatar Thomas Guillem
Browse files

build: restore c++_shared usage

This is a partial revert of the following commits
 - b775dbba "build: fix ODR violation"
 - b9df5331 "Use libc++ as static library"

UnsatisfiedLinkError with c++_shared should be fixed since we now use the last
NDK version and we dropped old android versions that triggered this crash.

This commit remove the ugly jniloader hack.

Here are the list of .so that are now shipped within the APK:
 - c++_shared.so (from the NDK)
 - libvlc.so (all VLC modules, VLC/LibVLC symbols) => link with c++_shared.so
 - libvlcjni.so (all JNI symbols) => link with libvlc.so
 - libmla.so (medialibrary, optional)  => link with libvlc.so and c++_shared.so

The APK size won't change with this commit (the difference of .so sizes is
negligible).
parent c1d909dd
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment