diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 7284562..8933c76 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -127,9 +127,9 @@ add_library(epee STATIC IMPORTED) set_target_properties(epee PROPERTIES IMPORTED_LOCATION ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libepee.a) -add_library(blocks STATIC IMPORTED) -set_target_properties(blocks PROPERTIES IMPORTED_LOCATION - ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libblocks.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 @@ -173,7 +173,7 @@ target_link_libraries( monerujo easylogging unbound epee - blocks + device_trezor checkpoints device multisig diff --git a/app/build.gradle b/app/build.gradle index b354599..3c63b61 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdkVersion 23 targetSdkVersion 28 versionCode 1140 - versionName '2.4.0.1' + versionName '2.5.0.0' // testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { diff --git a/script/nix/shell.nix b/script/nix/shell.nix index 6adea37..6bf0d5a 100644 --- a/script/nix/shell.nix +++ b/script/nix/shell.nix @@ -96,7 +96,7 @@ with nixpkgs; export _JAVA_AWT_WM_NONREPARENTING=1 export app_version=1140 - export gradle_app_version=2x4x0x1 + export gradle_app_version=2x5x0x0 export release_key=~/.android/fuwa-release-key.jks export USE_CCACHE=1