From: Matt Corallo <git@bluematt.me>
Date: Tue, 28 Sep 2021 01:29:18 +0000 (+0000)
Subject: Try new paths for Android NDK library search
X-Git-Tag: v0.0.101.2^0
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=4293f9a5c5eab8fc8767a85320d717421633fb2e;p=ldk-java

Try new paths for Android NDK library search

I'm not sure where these paths came from to begin with, but [1]
seems to indicate they're wrong, so let's try new ones.

[1] https://developer.android.com/ndk/guides/abis#sa
---

diff --git a/android-build.sh b/android-build.sh
index fe90de72..b31b0c71 100755
--- a/android-build.sh
+++ b/android-build.sh
@@ -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