1 files changed, 21 insertions, 15 deletions

diff --git a/doc/install/Android.mdwn b/doc/install/Android.mdwn
index dbd0c0198..537f6d518 100644
--- a/doc/install/Android.mdwn
+++ b/doc/install/Android.mdwn
@@ -7,25 +7,31 @@ Now git-annex can be used on Android!
 First, ensure your Android device is configured to allow installation
 of the app. Go to Setup -> Security, and enable "Unknown Sources".
 
-[Download the git-annex.apk](http://downloads.kitenet.net/git-annex/android/current/)
-onto your Android device, and open it to install.
+Then download the git-annex.apk for your version of Android, and 
+open it to install.
+
+* [Android 4.4 and 4.3 git-annex.apk](http://downloads.kitenet.net/git-annex/android/current/4.3/git-annex.apk)
+* [Android 4.0 to 4.2 git-annex.apk](http://downloads.kitenet.net/git-annex/android/current/4.0/git-annex.apk)
 
 ## autobuilds
 
-A daily build is also available.
+A daily build is also available, thanks to Mesar Hameed and the University
+of Bath CS department.
 
-* [download apk](http://downloads.kitenet.net/git-annex/autobuild/android/git-annex.apk) ([build logs](http://downloads.kitenet.net/git-annex/autobuild/android/))
+* [Android 4.4 and 4.3 git-annex.apk](http://downloads.kitenet.net/git-annex/autobuild/android/4.3/git-annex.apk)
+* [Android 4.0 to 4.2 git-annex.apk](http://downloads.kitenet.net/git-annex/autobuild/android/4.0/git-annex.apk)
+* [build logs](http://downloads.kitenet.net/git-annex/autobuild/android/)
 
 ## building it yourself
 
-git-annex can be built for Android, with `make android`. It's not an easy
-process:
-
-* First, install <https://github.com/neurocyte/ghc-android>.
-* You will need to have the Android SDK and NDK installed; see
-  `standalone/android/Makefile` to configure the paths to them. You'll also
-  need ant, and the JDK.
-* In `standalone/android/`, run `install-haskell-packages native`
-* You also need to install git and all the utilities listed on [[fromscratch]],
-  on the system doing the building.
-* Then to build the full Android app bundle, use `make androidapp`
+git-annex can be built from source for Android.
+
+1. Run `standalone/android/buildchroot` as root (requires debootstrap).
+   This builds a chroot with an `androidbuilder` user.
+   The rest of the build will run in this chroot as that user.
+2. Then run `standalone/android/install-haskell-packages`
+   Note that this will break from time to time as new versions of packages
+   are released, and the patches it applies have to be updated when
+   this happens.
+3. Finally, once the chroot is set up, you can build an Android binary
+   with `make android`, and `make androidapp` will build the complete APK.