wownero
/
wownerujo
Archived
4
0
Fork 0
Code Releases 19 Activity

use dev-0.7

Browse Source
pull/27/head
fuwa 5 years ago
parent 7e09221226
commit 8e67f224dd
13 changed files with 72 additions and 25 deletions
Show Stats Download Patch File Download Diff File

16
app/CMakeLists.txt
Unescape View File

@ -155,6 +155,18 @@ add_library(net STATIC IMPORTED)
set_target_properties(net PROPERTIES IMPORTED_LOCATION
${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libnet.a)
add_library(hardforks STATIC IMPORTED)
set_target_properties(hardforks PROPERTIES IMPORTED_LOCATION
${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libhardforks.a)
add_library(rpc_base STATIC IMPORTED)
set_target_properties(rpc_base PROPERTIES IMPORTED_LOCATION
${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/librpc_base.a)
add_library(blocks STATIC IMPORTED)
set_target_properties(blocks PROPERTIES IMPORTED_LOCATION
${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libblocks.a)
#############
# System
#############
@ -189,6 +201,10 @@ target_link_libraries( monerujo
multisig
version
randomx
hardforks
rpc_base
blocks
boost_chrono
boost_date_time

12
app/build.gradle
Unescape View File

@ -10,8 +10,8 @@ android {
// https://source.android.com/security/bulletin/2018-03-01
minSdkVersion 23
targetSdkVersion 28
versionCode 1220
versionName '2.6.1.1'
versionCode 1230
versionName '2.7.0.0'
// testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
externalNativeBuild {
cmake {
@ -50,13 +50,13 @@ android {
}
}
// def abiCodes = ['arm64-v8a': 2]
def abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86_64': 4]
def abiCodes = ['arm64-v8a': 2, 'x86_64': 4]
splits {
abi {
enable true
reset()
// include 'arm64-v8a'
include 'armeabi-v7a', 'arm64-v8a', 'x86_64'
include 'arm64-v8a', 'x86_64'
universalApk true
}
}
@ -68,12 +68,12 @@ android {
// abi {
// enable true
// reset()
// include 'armeabi-v7a', 'arm64-v8a', 'x86_64'
// include 'arm64-v8a', 'x86_64'
// universalApk true
// }
// }
//
// abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86_64': 4]
// abiCodes = ['arm64-v8a': 2, 'x86_64': 4]
// }
}
// Map for the version code that gives each ABI a value.

2
external-libs/collect.sh
Unescape View File

@ -8,7 +8,7 @@ orig_path=$PATH
build_root=$EXTERNAL_LIBS_BUILD_ROOT
packages=(boost openssl monero libsodium)
archs=(arm arm64 x86_64)
archs=(arm64 x86_64)
for arch in ${archs[@]}; do
case ${arch} in

2
script/build-external-libs/android-openssl/build-all-arch.sh
Unescape View File

@ -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"

2
script/build-external-libs/build-boost.sh
Unescape View File

@ -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

2
script/build-external-libs/build-libsodium.sh
Unescape View File

@ -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

2
script/build-external-libs/build-wownero.sh
Unescape View File

@ -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=""

43
script/build-external-libs/collect.sh
Unescape View File

@ -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

4
script/build-external-libs/fetch-wownero.sh
Unescape View File

@ -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

4
script/build-external-libs/patch-wownero.sh
Unescape View File

@ -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)"

2
script/build-external-libs/post-build-openssl.sh
Unescape View File

@ -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

2
script/build-external-libs/prep-toolchain.sh
Unescape View File

@ -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

4
script/nix/shell.nix
Unescape View File

@ -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