From: Daniel Martí Date: Tue, 17 Jun 2014 08:48:28 +0000 (+0000) Subject: Merge branch 'master' into 'master' X-Git-Tag: 0.2~22 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1c9ee1d3bf4f730c9cb4d1d856fb2ab924b13f88;p=fdroidserver.git Merge branch 'master' into 'master' run-tests: find current version of aapt in folder rather than in PATH The Jenkins server did not yet have 19.1.0 build-tools installed yet, so your fixed commits failed to build. This commit fixes the build: Not everyone adds the build-tools to their PATH, so this makes it so this script will find aapt in the most recent build-tools version that is installed on the local system. --- 1c9ee1d3bf4f730c9cb4d1d856fb2ab924b13f88