Merge branch 'upgrade_greenbits' into 'master'

fix GreenBits build for 1.87 by avoding versionCode update with abi



See merge request !1668
This commit is contained in:
Boris Kraut 2016-09-07 17:00:44 +00:00
commit 729b65a1f1

View file

@ -489,12 +489,12 @@ Build:1.84,84
ndk=r11c ndk=r11c
Build:1.87,87 Build:1.87,87
disable=wrong vercode due multiabi
commit=r1.87 commit=r1.87
subdir=app subdir=app
gradle=production gradle=production
forcevercode=yes forcevercode=yes
prebuild=sed -i -e 's/enable true/enable false/g' build.gradle prebuild=sed -i -e 's/enable true/enable false/g' build.gradle && \
sed -i -e 's/output.versionCodeOverride =/0 + /g' build.gradle
scanignore=bitcoinj/core/src/main/resources/org/bitcoinj/crypto/cacerts,bitcoinj/core/src/test,app/src/production/assets/checkpoints scanignore=bitcoinj/core/src/main/resources/org/bitcoinj/crypto/cacerts,bitcoinj/core/src/test,app/src/production/assets/checkpoints
scandelete=app/src/btctestnet/assets/checkpoints scandelete=app/src/btctestnet/assets/checkpoints
build=./prepare_fdroid.sh build=./prepare_fdroid.sh