chore: Re-enable android build, but without webservice.

.cirrus.yml

@@ -11,34 +11,34 @@ bazel-opt_task:
         --config=ci
         //hs-toxcore/...
 
-#android-aarch64_task:
-#  container:
-#    image: toktoknet/ghc-android:8.10.7.aarch64
-#    cpu: 2
-#    memory: 6G
-#  build_script:
-#    - android/build.sh
-#
-#android-arm_task:
-#  container:
-#    image: toktoknet/ghc-android:8.10.7.arm
-#    cpu: 2
-#    memory: 6G
-#  build_script:
-#    - android/build.sh
-#
-#android-i686_task:
-#  container:
-#    image: toktoknet/ghc-android:8.10.7.i686
-#    cpu: 2
-#    memory: 6G
-#  build_script:
-#    - android/build.sh
-#
-#android-x86_64_task:
-#  container:
-#    image: toktoknet/ghc-android:8.10.7.x86_64
-#    cpu: 2
-#    memory: 6G
-#  build_script:
-#    - android/build.sh
+android-aarch64_task:
+  container:
+    image: toktoknet/ghc-android:8.10.7.aarch64
+    cpu: 2
+    memory: 6G
+  build_script:
+    - android/build.sh
+
+android-arm_task:
+  container:
+    image: toktoknet/ghc-android:8.10.7.arm
+    cpu: 2
+    memory: 6G
+  build_script:
+    - android/build.sh
+
+android-i686_task:
+  container:
+    image: toktoknet/ghc-android:8.10.7.i686
+    cpu: 2
+    memory: 6G
+  build_script:
+    - android/build.sh
+
+android-x86_64_task:
+  container:
+    image: toktoknet/ghc-android:8.10.7.x86_64
+    cpu: 2
+    memory: 6G
+  build_script:
+    - android/build.sh

android/build.sh

@@ -14,4 +14,4 @@ export PKG_CONFIG_PATH="$NDK_ADDON_PREFIX/lib/pkgconfig"
 
 (cd network-3.1.1.1 && patch -p1 <../android/patches/hs-network-ffi.patch)
 
-"$NDK_TARGET-cabal" new-install -j4 --with-happy="$GHC_HOST/bin/happy" --ghc-option="-fPIC"
+"$NDK_TARGET-cabal" new-install -j4 --with-happy="$GHC_HOST/bin/happy" --ghc-option="-fPIC" -f-webservice

toxcore.cabal

@@ -20,6 +20,10 @@ flag library-only
   description: Build only library, no executables or tests.
   default:     False
 
+flag webservice
+  description: Build the toxsave parser webservice.
+  default:     True
+
 library
   default-language: Haskell2010
   hs-source-dirs:   src
@@ -123,7 +127,7 @@ executable webservice
   default-language: Haskell2010
   other-modules:    Network.Tox.App
 
-  if flag(library-only)
+  if flag(library-only) || !flag(webservice)
     buildable: False
 
   build-depends: