update

2 files changed, 13 insertions, 23 deletions

diff --git a/doc/design/assistant.mdwn b/doc/design/assistant.mdwn
index 4e2a222ca..ad1c6abd1 100644
--- a/doc/design/assistant.mdwn
+++ b/doc/design/assistant.mdwn
@@ -11,11 +11,11 @@ and use cases to add. Feel free to chip in with comments! --[[Joey]]
 * Month 4 "cloud": [[!traillink cloud]] [[!traillink transfer_control]]
 * Month 5 "cloud continued": [[!traillink xmpp]] [[!traillink more_cloud_providers]]
 * Month 6 "9k bonus round": [[!traillink desymlink]]
+* Month 7: user-driven features and polishing; 
+  [presentation at LCA2013](http://mirror.linux.org.au/linux.conf.au/2013/mp4/gitannex.mp4)
 
 We are, approximately, here:
 
-* Month 7: user-driven features and polishing; 
-  [presentation at LCA2013](https://lca2013.linux.org.au/schedule/30059/view_talk)
 * Month 8: [[!traillink Android]]
 * Months 9-11: more user-driven features and polishing (see remaining TODO items in all pages above)
 * Month 12: "Windows purgatory" [[Windows]]
@@ -23,6 +23,8 @@ We are, approximately, here:
 ## porting
 
 * [[OSX]] port is in fairly good shape, but still has some room for improvement
+* [[android]] port is just getting started
+* Windows port does not exist yet
 
 ## not yet on the map:
 
diff --git a/doc/design/assistant/android.mdwn b/doc/design/assistant/android.mdwn
index 06d6b9b1f..1a2ba8dd8 100644
--- a/doc/design/assistant/android.mdwn
+++ b/doc/design/assistant/android.mdwn
@@ -1,7 +1,13 @@
-Porting git-annex to Android will use the Android native SDK.
+## goals
 
-A hopefully small Java app will be developed, which runs the webapp
-daemon, and a web browser to display it.
+1. Get git-annex working at the command line in Android,
+   along with all the programs it needs.
+2. Get the webapp and assistant working. A hopefully small Java app will be
+   developed, which runs the webapp daemon, and a web browser to display it.
+
+Current status: git-annex can be built for Android, with `make android`.
+You need <https://github.com/neurocyte/ghc-android> installed first,
+and also have to `cabal install` all necessary dependencies.
 
 ### programs to port
 
@@ -14,24 +20,6 @@ available in the App Store.
 * git (not all git commands are needed,
   but core plumbing and a few like `git-add` are.)
 
-## GHC Android?
-
-Android's native SDK does not use glibc. GHC's runtime links with glibc.
-This could be an enormous problem. Other people want to see GHC able to
-target Android, of course, so someone may solve it before I get stuck on
-it.
-
-References:
-
-* <http://stackoverflow.com/questions/5151858/running-a-haskell-program-on-the-android-os>
-* <http://www.reddit.com/r/haskell/comments/ful84/haskell_on_android/>
-
-I've heard anecdoally that ipwnstudios not only has an IPhone GHC port,
-but also Android. Need to get in touch with them.
-<http://ipwnstudios.com/>
-
-Update: This looks likely: <https://github.com/neurocyte/ghc-android>
-
 ### Android specific features
 
 The app should be aware of power status, and avoid expensive background