Merge branch 'upgrade_greenbits' into 'master'

upgrade GreenBits to release tagged r1.87

Upgrade GreenBits to release tagged r1.87

In this version the app doesn't use submodules (it uses instead subtrees) and I have updated the ndk version used

See merge request !1663
This commit is contained in:
Boris Kraut 2016-09-05 22:04:50 +00:00
commit 45f38a9679

View file

@ -488,6 +488,16 @@ Build:1.84,84
build=./prepare_fdroid.sh
ndk=r11c
Build:1.87,87
commit=r1.87
subdir=app
gradle=production
prebuild=sed -i -e 's/enable true/enable false/g' build.gradle
scanignore=bitcoinj/core/src/main/resources/org/bitcoinj/crypto/cacerts,bitcoinj/core/src/test,bitcoinj/wallettemplate,app/src/production/assets/checkpoints
scandelete=app/scrypt,app/src/btctestnet/assets/checkpoints
build=./prepare_fdroid.sh
ndk=r12b
Maintainer Notes:
scandelete libscrypt.so - it is built by F-Droid via prepare_fdroid.sh,
but it is still in GreenAddress repo for users who don't want to use NDK,