From ab07bc34d5d0fb0f089c790b1973e6e35edcf641 Mon Sep 17 00:00:00 2001 From: fuwa Date: Tue, 12 Mar 2019 12:54:11 +0800 Subject: [PATCH 01/13] use wownero 0.5.1.0 --- app/build.gradle | 4 ++-- script/build-external-libs/fetch-wownero.sh | 2 +- script/nix/shell.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 47e9534..a09665b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { // https://source.android.com/security/bulletin/2018-03-01 minSdkVersion 23 targetSdkVersion 28 - versionCode 1180 - versionName '2.5.0.4' + versionCode 1190 + versionName '2.5.1.0' // testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { diff --git a/script/build-external-libs/fetch-wownero.sh b/script/build-external-libs/fetch-wownero.sh index 60d7bd7..c62ca52 100755 --- a/script/build-external-libs/fetch-wownero.sh +++ b/script/build-external-libs/fetch-wownero.sh @@ -12,7 +12,7 @@ cd $EXTERNAL_LIBS_BUILD_ROOT # url="$base_dir/vendor/wownero" url="https://github.com/wownero/wownero" # url="https://github.com/wowario/wownero" -version="v0.5.0.2" +version="v0.5.1.0" # version="1b5cefa" diff --git a/script/nix/shell.nix b/script/nix/shell.nix index 7db3902..dfd1541 100644 --- a/script/nix/shell.nix +++ b/script/nix/shell.nix @@ -96,8 +96,8 @@ with nixpkgs; export _JAVA_AWT_WM_NONREPARENTING=1 - export app_version=1180 - export gradle_app_version=2x5x0x4 + export app_version=1190 + export gradle_app_version=2x5x1x0 export release_key=~/.android/fuwa-release-key.jks export USE_CCACHE=1 From 0af1f413dfc55663dd2a7647295ebf2d37897a84 Mon Sep 17 00:00:00 2001 From: fuwa Date: Tue, 12 Mar 2019 13:28:33 +0800 Subject: [PATCH 02/13] remove trezor in app/CMakelists --- app/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 8933c76..c2bf9b7 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -127,10 +127,6 @@ add_library(epee STATIC IMPORTED) set_target_properties(epee PROPERTIES IMPORTED_LOCATION ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libepee.a) -add_library(device_trezor STATIC IMPORTED) -set_target_properties(device_trezor PROPERTIES IMPORTED_LOCATION - ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libdevice_trezor.a) - add_library(checkpoints STATIC IMPORTED) set_target_properties(checkpoints PROPERTIES IMPORTED_LOCATION ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcheckpoints.a) @@ -173,7 +169,6 @@ target_link_libraries( monerujo easylogging unbound epee - device_trezor checkpoints device multisig From 181d4d3178aad93b44dbe0d2bd8ecefed43ed2a7 Mon Sep 17 00:00:00 2001 From: fuwa Date: Wed, 13 Mar 2019 13:20:41 +0800 Subject: [PATCH 03/13] fix cmake D syntax --- script/build-external-libs/build-wownero.sh | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/script/build-external-libs/build-wownero.sh b/script/build-external-libs/build-wownero.sh index b7903b8..1638874 100755 --- a/script/build-external-libs/build-wownero.sh +++ b/script/build-external-libs/build-wownero.sh @@ -50,23 +50,23 @@ for arch in ${archs[@]}; do CC=clang CXX=clang++ \ CMAKE_LIBRARY_PATH=$build_root/build/libsodium/$arch/lib \ cmake \ - -D ANDROID=true \ - -D ARCH="$xarch" \ - -D BOOST_LIBRARYDIR=$build_root/build/boost/$arch/lib \ - -D BOOST_ROOT=$build_root/build/boost/$arch \ - -D BUILD_64=$sixtyfour \ - -D BUILD_GUI_DEPS=1 \ - -D BUILD_TAG="android" \ - -D BUILD_TESTS=OFF \ - -D CMAKE_BUILD_TYPE=$build_type \ - -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true \ - -D FORCE_USE_HEAP=1 \ - -D OPENSSL_CRYPTO_LIBRARY=$build_root/build/openssl/$arch/lib/libcrypto.so \ - -D OPENSSL_INCLUDE_DIR=$build_root/build/openssl/$arch/include \ - -D OPENSSL_ROOT_DIR=$build_root/build/openssl/$arch \ - -D OPENSSL_SSL_LIBRARY=$build_root/build/openssl/$arch/lib/libssl.so \ - -D LIBSODIUM_INCLUDE_DIR=$build_root/build/libsodium/$arch/include \ - -D STATIC=ON \ + -DANDROID=true \ + -DARCH="$xarch" \ + -DBOOST_LIBRARYDIR=$build_root/build/boost/$arch/lib \ + -DBOOST_ROOT=$build_root/build/boost/$arch \ + -DBUILD_64=$sixtyfour \ + -DBUILD_GUI_DEPS=1 \ + -DBUILD_TAG="android" \ + -DBUILD_TESTS=OFF \ + -DCMAKE_BUILD_TYPE=$build_type \ + -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true \ + -DFORCE_USE_HEAP=1 \ + -DOPENSSL_CRYPTO_LIBRARY=$build_root/build/openssl/$arch/lib/libcrypto.so \ + -DOPENSSL_INCLUDE_DIR=$build_root/build/openssl/$arch/include \ + -DOPENSSL_ROOT_DIR=$build_root/build/openssl/$arch \ + -DOPENSSL_SSL_LIBRARY=$build_root/build/openssl/$arch/lib/libssl.so \ + -DLIBSODIUM_INCLUDE_DIR=$build_root/build/libsodium/$arch/include \ + -DSTATIC=ON \ $extra_cmake_flags \ ../.. From 7f03d178ea7fc3e089498abb9719aee247c932f2 Mon Sep 17 00:00:00 2001 From: fuwa Date: Thu, 4 Apr 2019 01:55:26 +0800 Subject: [PATCH 04/13] update SDK path in shell --- script/nix/shell.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/script/nix/shell.nix b/script/nix/shell.nix index dfd1541..f607027 100644 --- a/script/nix/shell.nix +++ b/script/nix/shell.nix @@ -84,13 +84,11 @@ with nixpkgs; ]) ; profile = '' - export ANDROID_HOME=~/Android/Sdk + export ANDROID_HOME=~/SDK/Android/Sdk - # export ANDROID_NDK_ROOT=$ANDROID_HOME/ndk-bundle + export ANDROID_NDK_ROOT=~/SDK/Android/ndk-archive/android-ndk-r17c - export ANDROID_NDK_ROOT=~/Android/ndk-archive/android-ndk-r17c - - PATH=~/sdk/android/android-studio/bin/:$PATH + PATH=~/SDK/Android/android-studio/bin/:$PATH PATH=$ANDROID_NDK_ROOT/build/tools/:$PATH export PATH From 7cf4123a248e129cfa4c342f8d10e9bcc62bc1be Mon Sep 17 00:00:00 2001 From: fuwa Date: Sat, 18 May 2019 23:53:18 +0800 Subject: [PATCH 05/13] fix cmake build args for randomx --- script/build-external-libs/build-wownero.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/script/build-external-libs/build-wownero.sh b/script/build-external-libs/build-wownero.sh index 1638874..1cf586b 100755 --- a/script/build-external-libs/build-wownero.sh +++ b/script/build-external-libs/build-wownero.sh @@ -59,6 +59,7 @@ for arch in ${archs[@]}; do -DBUILD_TAG="android" \ -DBUILD_TESTS=OFF \ -DCMAKE_BUILD_TYPE=$build_type \ + -DCMAKE_CXX_STANDARD=11 \ -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true \ -DFORCE_USE_HEAP=1 \ -DOPENSSL_CRYPTO_LIBRARY=$build_root/build/openssl/$arch/lib/libcrypto.so \ From b3773b7fb6c23ba3a77621b6509ba8b852dda56d Mon Sep 17 00:00:00 2001 From: fuwa Date: Sat, 18 May 2019 23:57:11 +0800 Subject: [PATCH 06/13] add randomx to cmakelists --- app/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index c2bf9b7..3dc183b 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -143,6 +143,10 @@ add_library(version STATIC IMPORTED) set_target_properties(version PROPERTIES IMPORTED_LOCATION ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libversion.a) +add_library(randomx STATIC IMPORTED) +set_target_properties(randomx PROPERTIES IMPORTED_LOCATION + ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/librandomx.a) + ############# # System ############# @@ -173,6 +177,7 @@ target_link_libraries( monerujo device multisig version + randomx boost_chrono boost_date_time From bb3d738710704ae569b5c4662de8984046d229c5 Mon Sep 17 00:00:00 2001 From: fuwa Date: Sat, 18 May 2019 16:16:47 +0000 Subject: [PATCH 07/13] Revert "remove trezor in app/CMakelists" This reverts commit 0af1f413dfc55663dd2a7647295ebf2d37897a84. --- app/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 3dc183b..ef7d745 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -127,6 +127,10 @@ add_library(epee STATIC IMPORTED) set_target_properties(epee PROPERTIES IMPORTED_LOCATION ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libepee.a) +add_library(device_trezor STATIC IMPORTED) +set_target_properties(device_trezor PROPERTIES IMPORTED_LOCATION + ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libdevice_trezor.a) + add_library(checkpoints STATIC IMPORTED) set_target_properties(checkpoints PROPERTIES IMPORTED_LOCATION ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcheckpoints.a) @@ -173,6 +177,7 @@ target_link_libraries( monerujo easylogging unbound epee + device_trezor checkpoints device multisig From 44f46fee02834b51f8a285409bee120f0a3d06fd Mon Sep 17 00:00:00 2001 From: fuwa Date: Sun, 19 May 2019 16:14:41 +0800 Subject: [PATCH 08/13] update gradle --- .idea/gradle.xml | 3 +++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7ac24c7..f43d428 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,6 +3,9 @@