summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-21 19:10:23 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-21 19:10:23 -0400
commit3ce6a17e562a63aeb0e7b1624229bbef123c3d61 (patch)
tree7402a563a9d6645a6e8dee09b2295b20093b5323 /Makefile
parent2b3906b34cb1e384185f8fd9cdc57d4feb2973fd (diff)
got XMPP building for Android
Also enable local pairing, which also builds now thanks to WebDAV fixes to the haskell network library.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 76722179d..ec0891504 100644
--- a/Makefile
+++ b/Makefile
@@ -158,7 +158,7 @@ osxapp: Build/Standalone Build/OSXMkLibs
rm -f tmp/git-annex.dmg.bz2
bzip2 --fast tmp/git-annex.dmg
-ANDROID_FLAGS=Assistant -Pairing -XMPP
+ANDROID_FLAGS=
# Cross compile for Android.
# Uses https://github.com/neurocyte/ghc-android
android: Build/EvilSplicer