use dev-0.7

script/build-external-libs/android-openssl/build-all-arch.sh

@@ -8,7 +8,7 @@ set -e
 rm -rf prebuilt
 mkdir prebuilt
 
-archs=(arm arm64 x86_64)
+archs=(arm64 x86_64)
 
 for arch in ${archs[@]}; do
     xLIB="/lib"

script/build-external-libs/build-boost.sh

@@ -20,7 +20,7 @@ args="--build-type=minimal link=static runtime-link=static --with-chrono \
 --toolset=clang-android threading=multi threadapi=pthread target-os=android \
 "
 
-archs=(arm arm64 x86_64)
+archs=(arm64 x86_64)
 for arch in ${archs[@]}; do
     extra_build_flags=""
     case ${arch} in

script/build-external-libs/build-libsodium.sh

@@ -8,7 +8,7 @@ build_root=$EXTERNAL_LIBS_BUILD_ROOT
 cd $build_root/libsodium
 ./autogen.sh
 
-archs=(arm arm64 x86_64)
+archs=(arm64 x86_64)
 for arch in ${archs[@]}; do
     extra_cmake_flags=""
     case ${arch} in

script/build-external-libs/build-wownero.sh

@@ -13,7 +13,7 @@ build_root=$EXTERNAL_LIBS_BUILD_ROOT
 
 build_type=release # or debug
 
-archs=(arm arm64 x86_64)
+archs=(arm64 x86_64)
 
 for arch in ${archs[@]}; do
     ldflags=""

script/build-external-libs/collect.sh

@@ -4,9 +4,46 @@ set -e
 
 source script/build-external-libs/env.sh
 
+rm -rf external-libs
+mkdir external-libs
 cd external-libs
 
-find . -name "*.a" -exec rm {} \;
-find . -name "*.h" -exec rm {} \;
+orig_path=$PATH
+build_root=$EXTERNAL_LIBS_BUILD_ROOT
 
-./collect.sh
+packages=(boost openssl monero libsodium)
+archs=(arm64 x86_64)
+
+for arch in ${archs[@]}; do
+    case ${arch} in
+        "arm")
+                        xarch="armeabi-v7a"
+                        ;;
+        "arm64")
+                        xarch="arm64-v8a"
+            ;;
+        "x86")
+                        xarch="x86"
+            ;;
+        "x86_64")
+                        xarch="x86_64"
+            ;;
+        *)
+                        exit 16
+            ;;
+    esac
+
+        for package in ${packages[@]}; do
+                OUTPUT_DIR=`pwd`/$package/lib/$xarch
+                mkdir -p $OUTPUT_DIR
+                rm -f $OUTPUT_DIR/*.a
+                cp -a $build_root/build/$package/$arch/lib/*.a $OUTPUT_DIR
+
+                if [ $package = "monero" -a -d "$build_root/build/$package/include" ]; then
+                        rm -rf $OUTPUT_DIR/../../include
+                  cp -a $build_root/build/$package/include $OUTPUT_DIR/../..
+                fi
+
+        done
+done
+exit 0

script/build-external-libs/fetch-wownero.sh

@@ -10,10 +10,8 @@ cd $EXTERNAL_LIBS_BUILD_ROOT
 
 
 # url="$base_dir/vendor/wownero"
-# url="https://github.com/wownero/wownero"
 url="https://github.com/wownero/wownero"
-version="v0.6.1.1"
-# version="dev-v0.6"
+version="dev-v0.7.0"
 
 
 rm -rf wownero

script/build-external-libs/patch-wownero.sh

@@ -9,10 +9,6 @@ cd wownero
 
 sed -i 's/-Werror/-Wall/g' CMakeLists.txt
 sed -i 's/program_options locale/program_options/g' CMakeLists.txt
-sed -i 's/find_path(ZMQ_INCLUDE_PATH zmq.hpp)//g' CMakeLists.txt
-sed -i 's/find_library(ZMQ_LIB zmq)//g' CMakeLists.txt
-sed -i 's/message(FATAL_ERROR "Could not find required header zmq.hpp")//g' CMakeLists.txt
-sed -i 's/message(FATAL_ERROR "Could not find required libzmq")//g' CMakeLists.txt
 sed -i 's/bool create_address_file = false/bool create_address_file = true/g' src/wallet/wallet2.h
 
 sodium_pattern="find_library(SODIUM_LIBRARY sodium)"

script/build-external-libs/post-build-openssl.sh

@@ -9,7 +9,7 @@ build_root=$EXTERNAL_LIBS_BUILD_ROOT
 mkdir -p $build_root/build/openssl/
 cp -aL $build_root/android-openssl/openssl-OpenSSL_1_0_2l/include/openssl/ $build_root/build/openssl/include
 
-archs=(arm arm64 x86_64)
+archs=(arm64 x86_64)
 
 for arch in ${archs[@]}; do
     mkdir -p $build_root/build/openssl/$arch

script/build-external-libs/prep-toolchain.sh

@@ -8,7 +8,7 @@ build_root=$EXTERNAL_LIBS_BUILD_ROOT
 PATH=$ANDROID_NDK_ROOT/build/tools/:$PATH
 
 args="--api 23 --stl=libc++"
-archs=(arm arm64 x86_64)
+archs=(arm64 x86_64)
 
 for arch in ${archs[@]}; do
 

script/nix/shell.nix

@@ -94,8 +94,8 @@ with nixpkgs;
 
     export _JAVA_AWT_WM_NONREPARENTING=1
 
-    export app_version=1220
-    export gradle_app_version=2x6x1x1
+    export app_version=1230
+    export gradle_app_version=2x7x0x0
     export release_key=~/.android/fuwa-release-key.jks
 
     export USE_CCACHE=1