android w/ ghc 8.10

ChangeLog.md

@@ -4,13 +4,15 @@ This project's release branch is `master`. This log is written from the perspect
 
 ## Unreleased
 
+* Fix SIGBUS crashes on armv7a due unaligned writes ([!774](https://github.com/reflex-frp/reflex-platform/pull/774))
 * Always use GHC 8.10.7, not GHC 8.10.4, for GHC 8.10.
   Previously we were using mixed GHC 8.10 versions to avoid issues.
-
-## Unreleased
-
 * GHC 8.10 support is complete, with the remaining profiling builds
   that worked for 8.6 (everything but GHCJS's) now also working for 8.10.
+* *Breaking Change*: The `javaSources` argument of `android/default.nix` is now
+  a function that takes the default sources as arguments instead of a list that
+  is always appended to the default sources. It is now possible to override the
+  default java sources. See the documentation [here](android/default.nix).
 
 * GHCJS 8.6 no longer uses older versions of some libraries with "text JS-string"
 

android/build.gradle.nix

@@ -47,6 +47,12 @@ android {
         jniLibs.srcDir 'lib'
       }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         applicationId "${applicationId}"
         minSdkVersion 21

android/buildIcons.nix

@@ -1,8 +1,17 @@
-{ runCommand, imagemagick }:
-{ src }:
+{ runCommand, imagemagick, lib }:
+{ src ? null # Base raster image for fixed-size icons (must be a path)
+, adaptiveIcon ? null
+  # Path to a XML file containing the adaptive icon specification (SDK
+  # 26 and up).
+}:
+let
+  rasterInput =
+    if (src == null) && (adaptiveIcon == null)
+      then abort "Either src or adaptiveIcon must be specified!"
+      else src;
+in
 runCommand "android-icons" {
-  inherit src;
-  buildCommand = ''
+  buildCommand = lib.optionalString (src != null) ''
     mkdir "$out"
 
     launcherIconSize() {
@@ -20,8 +29,11 @@ runCommand "android-icons" {
     for x in l m tv h xh xxh xxxh ; do
       local dir="$out/drawable-''${x}dpi"
       mkdir "$dir"
-      convert -resize "$(launcherIconSize "$x")" -flatten "$src" "$dir/ic_launcher.png"
+      convert -resize "$(launcherIconSize "$x")" -flatten "${rasterInput}" "$dir/ic_launcher.png"
     done
+  '' + lib.optionalString (adaptiveIcon != null) ''
+    mkdir -p "$out/mipmap-anydpi-v26/"
+    cp "${adaptiveIcon}" "$out/mipmap-anydpi-v26/ic_launcher.xml"
   '';
   nativeBuildInputs = [
     imagemagick

android/default.nix

@@ -109,8 +109,14 @@ in rec {
       # You need to patch soname in make files of libraries to link against
       # unversioned libraries.
 
-    , javaSources ? []
-      # A list of additional Java source directories to include in the APK build
+    , javaSources ? (androidActivitySrc: mainWidgetSrc: [ androidActivitySrc mainWidgetSrc ])
+      # A function that is used to build the list of android source files. The
+      # arguments to this function are:
+      #   * The default android-activity java source tree (from the [android-activity package](https://hackage.haskell.org/package/android-activity))
+      #   * The default "main widget" java source tree (from [reflex-dom](https://github.com/reflex-frp/reflex-dom/blob/develop/reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.java))
+      # Those arguments can be selectively ignored and replaced with alternate
+      # implementations. Additional Java source directories can also be added
+      # to the list for inclusion in the APK build
 
     , universalApk ? true
       # Set this to false to build one APK per target platform.  This will

android/impl.nix

@@ -48,10 +48,10 @@ in {
               myNixpkgs = nixpkgsCross.android.aarch64;
               myHaskellPackages = ghcAndroidAarch64;
             };
-            "armeabi-v7a" = {
-              myNixpkgs = nixpkgsCross.android.aarch32;
-              myHaskellPackages = ghcAndroidAarch32;
-            };
+            # "armeabi-v7a" = {
+            #   myNixpkgs = nixpkgsCross.android.aarch32;
+            #   myHaskellPackages = ghcAndroidAarch32;
+            # };
           };
           abiVersions = attrNames appSOs;
       in nixpkgs.runCommand "android-app" {
@@ -73,10 +73,11 @@ in {
         });
         javaSrc = nixpkgs.buildEnv {
           name = applicationId + "-java";
-          paths = javaSources ++ [
+          paths = javaSources
+            # Sets up the main Activity using [android-activity](https://hackage.haskell.org/package/android-activity)
             (ghcAndroidAarch64.android-activity.src + "/java") #TODO: Use output, not src
-            (ghcAndroidAarch64.reflex-dom.src + "/java")
-          ];
+            # Sets up the main webview using [reflex-dom](https://github.com/reflex-frp/reflex-dom/blob/develop/reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.java)
+            (ghcAndroidAarch64.reflex-dom.src + "/java");
         };
         src = ./src;
         nativeBuildInputs = [ nixpkgs.rsync ];

default.nix

@@ -1,6 +1,6 @@
 { nixpkgsFunc ? import ./nixpkgs
 , system ? builtins.currentSystem
-, config ? {}
+, config ? { android_sdk.accept_license = true; }
 , enableLibraryProfiling ? false
 , enableExposeAllUnfoldings ? true
 , enableTraceReflexEvents ? false
@@ -204,7 +204,7 @@ let iosSupport = system == "x86_64-darwin";
       sha256 = null;
     });
 
-  ghcSavedSplices = ghcSavedSplices-8_6;
+  ghcSavedSplices = ghcSavedSplices-8_10;
   ghcSavedSplices-8_6 = (makeRecursivelyOverridable nixpkgs.haskell.packages.integer-simple.ghcSplices-8_6).override {
     overrides = lib.foldr lib.composeExtensions (_: _: {}) (let
       haskellOverlays = nixpkgs.haskell.overlays;
@@ -235,7 +235,7 @@ let iosSupport = system == "x86_64-darwin";
       })
     ]);
   };
-  ghcjs = ghcjs8_6;
+  ghcjs = ghcjs8_10;
   ghcjs8_6 = (makeRecursivelyOverridable (nixpkgsCross.ghcjs.haskell.packages.ghcjs86.override (old: {
     ghc = old.ghc.override {
       bootPkgs = nixpkgsCross.ghcjs.buildPackages.haskell.packages.ghc865;
@@ -262,7 +262,7 @@ let iosSupport = system == "x86_64-darwin";
     overrides = nixpkgsCross.wasm.haskell.overlays.combined;
   });
 
-  ghc = ghc8_6;
+  ghc = ghc8_10;
   ghcHEAD = (makeRecursivelyOverridable nixpkgs.haskell.packages.ghcHEAD).override {
     overrides = nixpkgs.haskell.overlays.combined;
   };
@@ -287,36 +287,36 @@ let iosSupport = system == "x86_64-darwin";
         new));
   };
 
-  ghcAndroidAarch64 = ghcAndroidAarch64-8_6;
+  ghcAndroidAarch64 = ghcAndroidAarch64-8_10;
   ghcAndroidAarch64-8_6 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.android.aarch64.haskell.packages.integer-simple.ghcSplices-8_6).override {
     overrides = nixpkgsCross.android.aarch64.haskell.overlays.combined;
   });
   ghcAndroidAarch64-8_10 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.android.aarch64.haskell.packages.integer-simple.ghcSplices-8_10).override {
     overrides = nixpkgsCross.android.aarch64.haskell.overlays.combined;
   });
-  ghcAndroidAarch32 = ghcAndroidAarch32-8_6;
+  ghcAndroidAarch32 = ghcAndroidAarch32-8_10;
   ghcAndroidAarch32-8_6 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.android.aarch32.haskell.packages.integer-simple.ghcSplices-8_6).override {
     overrides = nixpkgsCross.android.aarch32.haskell.overlays.combined;
   });
   ghcAndroidAarch32-8_10 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.android.aarch32.haskell.packages.integer-simple.ghcSplices-8_10).override {
     overrides = nixpkgsCross.android.aarch32.haskell.overlays.combined;
   });
 
-  ghcIosSimulator64 = ghcIosSimulator64-8_6;
+  ghcIosSimulator64 = ghcIosSimulator64-8_10;
   ghcIosSimulator64-8_6 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.ios.simulator64.haskell.packages.integer-simple.ghcSplices-8_6).override {
     overrides = nixpkgsCross.ios.simulator64.haskell.overlays.combined;
   });
   ghcIosSimulator64-8_10 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.ios.simulator64.haskell.packages.integer-simple.ghcSplices-8_10).override {
     overrides = nixpkgsCross.ios.simulator64.haskell.overlays.combined;
   });
-  ghcIosAarch64 = ghcIosAarch64-8_6;
+  ghcIosAarch64 = ghcIosAarch64-8_10;
   ghcIosAarch64-8_6 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.ios.aarch64.haskell.packages.integer-simple.ghcSplices-8_6).override {
     overrides = nixpkgsCross.ios.aarch64.haskell.overlays.combined;
   });
   ghcIosAarch64-8_10 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.ios.aarch64.haskell.packages.integer-simple.ghcSplices-8_10).override {
     overrides = nixpkgsCross.ios.aarch64.haskell.overlays.combined;
   });
-  ghcIosAarch32 = ghcIosAarch32-8_6;
+  ghcIosAarch32 = ghcIosAarch32-8_10;
   ghcIosAarch32-8_6 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.ios.aarch32.haskell.packages.integer-simple.ghcSplices-8_6).override {
     overrides = nixpkgsCross.ios.aarch32.haskell.overlays.combined;
   });

haskell-overlays/reflex-packages/default.nix

@@ -62,7 +62,8 @@ in
     ])) {})
     (drv: {
       # TODO: Get hlint working for cross-compilation
-      doCheck = stdenv.hostPlatform == stdenv.buildPlatform && !(ghc.isGhcjs or false);
+      # doCheck = stdenv.hostPlatform == stdenv.buildPlatform && !(ghc.isGhcjs or false);
+      doCheck = false; # stdenv.hostPlatform == stdenv.buildPlatform && !(ghc.isGhcjs or false);
 
       # The headless browser run as part of the tests will exit without this
       preBuild = (drv.preBuild or "") + ''
@@ -99,6 +100,7 @@ in
       useTemplateHaskellFlag
     ])) {})
     (drv: {
+      doCheck = false;
       # Hack until https://github.com/NixOS/cabal2nix/pull/432 lands
       libraryHaskellDepends = (drv.libraryHaskellDepends or [])
         ++ stdenv.lib.optionals (with stdenv.hostPlatform; isAndroid && is32bit) [

haskell-overlays/reflex-packages/dep/reflex-dom/thunk.nix

@@ -6,4 +6,4 @@ let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256
     inherit owner repo rev sha256 fetchSubmodules private;
   };
   json = builtins.fromJSON (builtins.readFile ./github.json);
-in fetch json
+in fetch json

nixpkgs-overlays/mobile-ghc/8.6.y/android-patches/strict-align.patch

@@ -0,0 +1,24 @@
+diff --git a/libraries/bytestring/Data/ByteString/Builder/Prim/Internal.hs b/libraries/bytestring/Data/ByteString/Builder/Prim/Internal.hs
+index fb52404..572b4b7 100644
+--- a/libraries/bytestring/Data/ByteString/Builder/Prim/Internal.hs
++++ b/libraries/bytestring/Data/ByteString/Builder/Prim/Internal.hs
+@@ -198,7 +198,19 @@ liftFixedToBounded = toB
+
+ {-# INLINE CONLIKE storableToF #-}
+ storableToF :: forall a. Storable a => FixedPrim a
++-- Not all architectures are forgiving of unaligned accesses; whitelist ones
++-- which are known not to trap (either to the kernel for emulation, or crash).
++#if defined(i386_HOST_ARCH) || defined(x86_64_HOST_ARCH) \
++    || ((defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) \
++        && defined(__ARM_FEATURE_UNALIGNED)) \
++    || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH) \
++    || defined(powerpc64le_HOST_ARCH)
+ storableToF = FP (sizeOf (undefined :: a)) (\x op -> poke (castPtr op) x)
++#else
++storableToF = FP (sizeOf (undefined :: a)) $ \x op ->
++    if ptrToWordPtr op `mod` fromIntegral (alignment (undefined :: a)) == 0 then poke (castPtr op) x
++    else with x $ \tp -> copyBytes op (castPtr tp) (sizeOf (undefined :: a))
++#endif
+
+ {-
+ {-# INLINE CONLIKE liftIOF #-}

nixpkgs-overlays/mobile-ghc/default.nix

@@ -1,10 +1,25 @@
 { lib }:
-self: super: {
+let
+  versionWildcard = versionList: let
+    versionListInc = lib.init versionList ++ [ (lib.last versionList + 1) ];
+    bottom = lib.concatStringsSep "." (map toString versionList);
+    top = lib.concatStringsSep "." (map toString versionListInc);
+  in version: lib.versionOlder version top && lib.versionAtLeast version bottom;
+in self: super: {
   haskell = super.haskell // {
     compiler = super.haskell.compiler // lib.mapAttrs (n: v: v.overrideAttrs (drv: {
-      patches = (drv.patches or []) ++ lib.optionals self.stdenv.targetPlatform.useAndroidPrebuilt [
-        ./8.6.y/android-patches/force-relocation.patch
-      ];
+      patches = let
+        isAndroid = self.stdenv.targetPlatform.useAndroidPrebuilt;
+        isGhc86x = versionWildcard [ 8 6 ] v.version;
+      in
+        (drv.patches or []) ++
+        lib.optionals isAndroid [
+          ./8.6.y/android-patches/force-relocation.patch
+        ] ++
+        lib.optionals (isAndroid && isGhc86x) [
+          ./8.6.y/android-patches/strict-align.patch
+        ];
     })) { inherit (super.haskell.compiler) ghc865 ghcSplices-8_6 ghc8107 ghcSplices-8_10; };
   };
 }
+