Merge branch 'fix_greenbits_branch_update_ndk' into 'master'

fix GreenBits release branch, update ndk

See merge request !1932
This commit is contained in:
Boris Kraut 2017-01-04 10:39:58 +00:00
commit e34e6729c3
2 changed files with 4 additions and 2 deletions

View file

@ -105,6 +105,7 @@ Build:1.93_testnet,93
Build:1.94_testnet,94
commit=r1.94
subdir=app
init=git checkout release_1.94
gradle=btctestnet
forcevercode=yes
prebuild=sed -i -e 's/enable true/enable false/g' build.gradle && \
@ -112,7 +113,7 @@ Build:1.94_testnet,94
scanignore=bitcoinj/core/src/main/resources/org/bitcoinj/crypto/cacerts,bitcoinj/core/src/test,app/src/btctestnet/assets/checkpoints
scandelete=app/src/production/assets/checkpoints
build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh
ndk=r12b
ndk=r13b
Auto Update Mode:None
Update Check Mode:Tags

View file

@ -563,6 +563,7 @@ Build:1.93,93
Build:1.94,94
commit=r1.94
subdir=app
init=git checkout release_1.94
gradle=production
forcevercode=yes
prebuild=sed -i -e 's/enable true/enable false/g' build.gradle && \
@ -570,7 +571,7 @@ Build:1.94,94
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
build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh
ndk=r12b
ndk=r13b
Maintainer Notes:
Watch prepare_fdroid.sh for changes on new builds.