X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=android-build.sh;h=06cca5de1dd96983eb975c16e1cbdb17e325dff5;hb=6700d1496b231c4b27d91a66be0d5efdb741662c;hp=fe90de72ac1e8edc135249b38e856b50db2b8f0f;hpb=002b08ee30f4d78b3d56e381b08faca78e1e1533;p=ldk-java

diff --git a/android-build.sh b/android-build.sh
index fe90de72..06cca5de 100755
--- a/android-build.sh
+++ b/android-build.sh
@@ -26,7 +26,7 @@ LDK_C_BINDINGS="$(realpath $2)"
 RUST_LIGHTNING="$(realpath $1)"
 pushd "$2"
 export LDK_C_BINDINGS_EXTRA_TARGETS="x86_64-linux-android i686-linux-android armv7-linux-androideabi aarch64-linux-android"
-export LDK_C_BINDINGS_EXTRA_TARGET_CCS="x86_64-linux-android21-clang i686-linux-android21-clang armv7a-linux-androideabi21-clang aarch64-linux-android21-clang"
+export LDK_C_BINDINGS_EXTRA_TARGET_CCS="x86_64-linux-android24-clang i686-linux-android24-clang armv7a-linux-androideabi24-clang aarch64-linux-android24-clang"
 ./genbindings.sh "$RUST_LIGHTNING" true
 popd
 
@@ -49,7 +49,7 @@ for IDX in ${!EXTRA_TARGETS[@]}; do
 	${STRIPS[$IDX]} liblightningjni_release_${LDK_TARGET}.so
 done
 
-export LANG=C
+export LC_ALL=C
 
 echo "Need local deterministic ldk-java-classes.jar"
 ls ldk-java-classes.jar
@@ -57,10 +57,10 @@ ls ldk-java-classes.jar
 rm -rf aar
 mkdir aar
 cp -r "$3/"* ./aar/
-mkdir -p ./aar/jni/{arm64,armeabi,x86,x86_64}
+mkdir -p ./aar/jni/{armeabi-v7a,arm64-v8a,x86,x86_64}
 
-cp liblightningjni_release_aarch64-linux-android.so ./aar/jni/arm64/liblightningjni.so
-cp liblightningjni_release_armv7-linux-androideabi.so ./aar/jni/armeabi/liblightningjni.so
+cp liblightningjni_release_aarch64-linux-android.so ./aar/jni/arm64-v8a/liblightningjni.so
+cp liblightningjni_release_armv7-linux-androideabi.so ./aar/jni/armeabi-v7a/liblightningjni.so
 cp liblightningjni_release_i686-linux-android.so ./aar/jni/x86/liblightningjni.so
 cp liblightningjni_release_x86_64-linux-android.so ./aar/jni/x86_64/liblightningjni.so
 cp ldk-java-classes.jar ./aar/classes.jar