* make android ABIS list configurable

* fix android ci jizz, correct typo, upload generated assets

.drone.jsonnet

@@ -243,7 +243,7 @@ local mac_builder(name,
                     ],
                     jobs=4),
     // android apk builder
-    apk_builder("android apk", "registry.oxen.rocks/lokinet-ci-android", extra_cmds=['UPLOAD_OS=anrdoid ./contrib/ci/drone-static-upload.sh']),
+    apk_builder("android apk", "registry.oxen.rocks/lokinet-ci-android", extra_cmds=['UPLOAD_OS=android ./contrib/ci/drone-static-upload.sh']),
 
     // Windows builds (x64)
     windows_cross_pipeline("Windows (amd64)", docker_base+'debian-win32-cross',

contrib/android.sh

@@ -1,13 +1,22 @@
 #!/bin/bash
 set -e
-set -x
-test x$NDK = x  && exit 1
+set +x
+
+default_abis="armeabi-v7a arm64-v8a x86 x86_64"
+build_abis=${ABIS:-$default_abis}
+
+test x$NDK = x && echo "NDK env var not set"
+test x$NDK = x && exit 1
+
+echo "building abis: $build_abis"
+
 root="$(readlink -f $(dirname $0)/../)"
 out=$root/lokinet-android-$(git describe)
 mkdir -p $out
 mkdir -p $root/build-android
 cd $root/build-android
-for abi in armeabi-v7a arm64-v8a x86 x86_64 ; do
+
+for abi in $build_abis; do
     mkdir -p build-$abi $out/$abi
     cd build-$abi
     cmake \
@@ -36,4 +45,7 @@ for abi in armeabi-v7a arm64-v8a x86 x86_64 ; do
     cp jni/liblokinet-android.so $out/$abi/liblokinet-android.so
     cd -
 done
-tar -cvf $out $out.tar.xz
+
+
+echo
+echo "build artifacts outputted to $out"

contrib/ci/drone-static-upload.sh

@@ -42,9 +42,11 @@ if [ -e daemon/lokinet.exe ]; then
 elif [ -e build-android ] ; then
     # android af ngl
     archive="$base.tar.xz"
-    cp -av build-android/lokinet-android-*.tar.xz "$archive"
+    cp -av lokinet-android-* "$base"
+    archive="$base.tar.xz"
+    tar cJvf "$archive" "$base"
 else
-    cp -av daemon/lokinet daemon/lokinet-vpn ../lokinet-bootstrap "$base"
+    cp -av daemon/lokinet daemon/lokinet-vpn daemon/lokinet-bootstrap "$base"
     # tar dat shiz up yo
     archive="$base.tar.xz"
     tar cJvf "$archive" "$base"