Merge branch 'master' into master

sovrin-foundation · Aug 28, 2018 · afebfb5 · afebfb5
2 parents 3ceee63 + 244f6c5
commit afebfb5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,7 @@ Cargo.lock
 **/*.rs.bk
 # builds
 libsovtoken/build_scripts/android/libsovtoken/android-dependencies/
-libsovtoken/build_scripts/android/libsovtoken/linux-android-ndk-r17b/
+libsovtoken/build_scripts/android/libsovtoken/linux-android-ndk-*/
 libsovtoken/build_scripts/android/libsovtoken/linux-arm/
 libsovtoken/build_scripts/android/libsovtoken/linux-arm64/
 libsovtoken/build_scripts/android/libsovtoken/linux-x86/

diff --git a/libsovtoken/build_scripts/android/libsovtoken/build.sh b/libsovtoken/build_scripts/android/libsovtoken/build.sh