chiark / gitweb /
~ianmdlvl / fdroidserver.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1fcf81b 35ea01c)
Merge branch 'master' into 'master'
authorDaniel Martí <mvdan@mvdan.cc>
Tue, 17 Jun 2014 08:48:28 +0000 (08:48 +0000)
committerDaniel Martí <mvdan@mvdan.cc>
Tue, 17 Jun 2014 08:48:28 +0000 (08:48 +0000)
commit1c9ee1d3bf4f730c9cb4d1d856fb2ab924b13f88
tree6d725570934daf6d84a1cf72649b0249e60cb0a0tree | snapshot
parent1fcf81b1f4db1efc74460d1c05cec380325ffa16commit | diff
parent35ea01cbd64097698bcc4e336e30dc1871f115fccommit | diff
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.
Unnamed repository; edit this file 'description' to name the repository.