Merge pull request #11 from zoedberg/android_lib_fix

Actually fixed android integration
RGB-WG · Oct 26, 2020 · 4e8ec34 · 4e8ec34
2 parents 2c86e8b + 113e8e1
commit 4e8ec34
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/ffi/android/build_rust.sh b/ffi/android/build_rust.sh
@@ -26,13 +26,17 @@ swig -java -c++ -package "org.lnpbp.rgbnode_autogen" -outdir library/src/main/ja
 mkdir -p $JNILIBS/arm64-v8a $JNILIBS/x86_64 $JNILIBS/armeabi-v7a $JNILIBS/x86
 
 aarch64-linux-android21-clang++ -shared swig_wrap.cxx -L$RUSTLIB/target/aarch64-linux-android/debug/ -lrgb -o $JNILIBS/arm64-v8a/librgb_node.so -fPIC
+cp -v $RUSTLIB/target/aarch64-linux-android/debug/librgb.so $JNILIBS/arm64-v8a/
 cp -v $NDK_HOME/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so $JNILIBS/arm64-v8a/
 
 x86_64-linux-android21-clang++ -shared swig_wrap.cxx -L$RUSTLIB/target/x86_64-linux-android/debug/ -lrgb -o $JNILIBS/x86_64/librgb_node.so -fPIC
+cp -v $RUSTLIB/target/x86_64-linux-android/debug/librgb.so $JNILIBS/x86_64/
 cp -v $NDK_HOME/sources/cxx-stl/llvm-libc++/libs/x86_64/libc++_shared.so $JNILIBS/x86_64/
 
 armv7a-linux-androideabi21-clang++ -shared swig_wrap.cxx -L$RUSTLIB/target/armv7-linux-androideabi/debug/ -lrgb -o $JNILIBS/armeabi-v7a/librgb_node.so -fPIC
+cp -v $RUSTLIB/target/armv7-linux-androideabi/debug/librgb.so $JNILIBS/armeabi-v7a/
 cp -v $NDK_HOME/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so $JNILIBS/armeabi-v7a/
 
 i686-linux-android21-clang++ -shared swig_wrap.cxx -L$RUSTLIB/target/i686-linux-android/debug/ -lrgb -o $JNILIBS/x86/librgb_node.so -fPIC
+cp -v $RUSTLIB/target/i686-linux-android/debug/librgb.so $JNILIBS/x86/
 cp -v $NDK_HOME/sources/cxx-stl/llvm-libc++/libs/x86/libc++_shared.so $JNILIBS/x86/