Merge branch 'upgrade_greenbits' into 'master'

set JAVA_HOME for build script that requires it

This set's the JAVA_HOME for a build script that requires it to build a native library (w/ JNI headers) which then compiles and packages a jar.

See merge request !1675
This commit is contained in:
Boris Kraut 2016-09-12 11:05:47 +00:00
commit 13183d60e7

View file

@ -497,7 +497,7 @@ Build:1.87,87
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
scandelete=app/src/btctestnet/assets/checkpoints
build=./prepare_fdroid.sh
build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh
ndk=r12b
Maintainer Notes: