ensure that Android TH splice is expanded in native side of build

Assistant/WebApp/Configurators/Upgrade.hs

@@ -23,7 +23,7 @@ import Config
  - -}
 getConfigStartUpgradeR :: GitAnnexDistribution -> Handler Html
 getConfigStartUpgradeR d = do
-#ifdef __ANDROID__
+#ifdef ANDROID_SPLICES
 	let url = distributionUrl d
 	page "Upgrade" (Just Configuration) $
 		$(widgetFile "configurators/upgrade/android")

Makefile

@@ -173,7 +173,7 @@ ANDROID_FLAGS?=-f-XMPP
 # Uses https://github.com/neurocyte/ghc-android
 android: Build/EvilSplicer
 	echo "Running native build, to get TH splices.."
-	if [ ! -e dist/setup/setup ]; then $(CABAL) configure -f-Production -O0 $(ANDROID_FLAGS);  fi
+	if [ ! -e dist/setup/setup ]; then $(CABAL) configure -f-Production -O0 $(ANDROID_FLAGS) -fAndroidSplice;  fi
 	mkdir -p tmp
 	if ! $(CABAL) build --ghc-options=-ddump-splices 2> tmp/dump-splices; then tail tmp/dump-splices >&2; exit 1; fi
 	echo "Setting up Android build tree.."

git-annex.cabal

@@ -56,7 +56,11 @@ Flag Production
   Description: Enable production build (slower build; faster binary)
 
 Flag Android
-  Description: Building for Android
+  Description: Cross building for Android
+  Default: False
+
+Flag AndroidSplice
+  Description: Building to get TH splices for Android
   Default: False
 
 Flag TestSuite
@@ -155,7 +159,9 @@ Executable git-annex
   
   if flag(Android)
     Build-Depends: data-endian
-    CPP-Options: -D__ANDROID__
+    CPP-Options: -D__ANDROID__ -DANDROID_SPLICES
+  if flag(AndroidSplices)
+    CPP-Options: -DANDROID_SPLICES
 
   if flag(Webapp) && (! os(windows))
     Build-Depends: