Merge pull request scottyab#12 from biddster/master

Fix for issue scottyab#10, missing jni libs in aar
bineanzhou · Mar 14, 2016 · 2d62e95 · 2d62e95
2 parents 03f20a1 + 9bc50ad
commit 2d62e95
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/rootbeerlib/jni/build.sh b/rootbeerlib/jni/build.sh
@@ -1,8 +1,14 @@
 #!/bin/bash
 # build.sh uses the android ndk to compile and then copies the shared object into the correct place
 # written by Matthew Rollings 2015
-ndk-build 
-cp ../libs/armeabi/libtool-checker.so ../src/main/jniLibs/armeabi/libtool-checker.so
-cp ../libs/armeabi-v7a/libtool-checker.so ../src/main/jniLibs/armeabi-v7a/libtool-checker.so
-cp ../libs/mips/libtool-checker.so ../src/main/jniLibs/mips/libtool-checker.so
-cp ../libs/x86/libtool-checker.so ../src/main/jniLibs/x86/libtool-checker.so
+ndk-build
+
+pushd ../libs &> /dev/null
+for arch in `ls -d -- *`; do
+    dest="../src/main/jniLibs/${arch}"
+    mkdir -p "${dest}"
+    cp "${arch}/libtool-checker.so" "${dest}/libtool-checker.so"
+    echo "Copied ${arch} lib to ${dest}"
+done
+popd &> /dev/null
+
diff --git a/rootbeerlib/src/main/jniLibs/arm64-v8a/libtool-checker.so b/rootbeerlib/src/main/jniLibs/arm64-v8a/libtool-checker.so
diff --git a/rootbeerlib/src/main/jniLibs/mips64/libtool-checker.so b/rootbeerlib/src/main/jniLibs/mips64/libtool-checker.so
diff --git a/rootbeerlib/src/main/jniLibs/x86_64/libtool-checker.so b/rootbeerlib/src/main/jniLibs/x86_64/libtool-checker.so