Merge remote-tracking branch 'upstream/master'

2026-07-03 14:05:24 +02:00 · 2023-03-04 23:37:32 -05:00
parent a33150e19d 1eb04a8bcb
commit c2618ccec2
3 changed files with 237 additions and 18 deletions
@@ -0,0 +1,171 @@
+{
+  "nodes": {
+    "android": {
+      "inputs": {
+        "devshell": "devshell",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1677615701,
+        "narHash": "sha256-htNurglzagPhlXTynUKXolUi8+G2gigZibaH7rdNIw4=",
+        "owner": "tadfisher",
+        "repo": "android-nixpkgs",
+        "rev": "3e68832f40fc9879daa764ba26772231594abafe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tadfisher",
+        "repo": "android-nixpkgs",
+        "type": "github"
+      }
+    },
+    "devshell": {
+      "inputs": {
+        "flake-utils": [
+          "android",
+          "nixpkgs"
+        ],
+        "nixpkgs": [
+          "android",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1677576895,
+        "narHash": "sha256-EtV2sOcIxqZUVijAb5HyCIq7Oft72bgQ3Me8YlKd5jE=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "05a1e4a4b02cb7bfc8d031064f9d5a2cc27c8847",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1677407201,
+        "narHash": "sha256-3blwdI9o1BAprkvlByHvtEm5HAIRn/XPjtcfiunpY7s=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "7f5639fa3b68054ca0b062866dc62b22c3f11505",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1677560409,
+        "narHash": "sha256-PIvUIsVNozPXe1FmNe9c6B8Febl3t9+51uBKMJ1Q8o0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9e56d6ec92c8fb4192f1392aa5c4101ad77f2070",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1665296151,
+        "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "android": "android",
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_2",
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1677551437,
+        "narHash": "sha256-KidNaM3fTvixGQwJPrbR4hon6FjT2Doil1Fq1GaeLpA=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "c1df023b1aaded1b65a1f4ad604a98a58ab4db97",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
@@ -0,0 +1,46 @@
+{
+  description = "Delta Chat for Android";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    rust-overlay.url = "github:oxalica/rust-overlay";
+    flake-utils.url = "github:numtide/flake-utils";
+    android.url = "github:tadfisher/android-nixpkgs";
+  };
+
+  outputs = { self, nixpkgs, rust-overlay, flake-utils, android }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        overlays = [ (import rust-overlay) ];
+        pkgs = import nixpkgs { inherit system overlays; };
+        android-sdk = android.sdk.${system} (sdkPkgs:
+          with sdkPkgs; [
+            build-tools-30-0-3
+            cmdline-tools-latest
+            ndk-bundle
+            platform-tools
+            platforms-android-32
+            ndk-23-2-8568313
+          ]);
+      in {
+        devShells.default = pkgs.mkShell {
+          ANDROID_SDK_ROOT = "${android-sdk}/share/android-sdk";
+          ANDROID_NDK_ROOT =
+            "${android-sdk}/share/android-sdk/ndk/23.2.8568313";
+	  shellHook = ''
+            export PATH="$ANDROID_SDK_ROOT/build-tools/30.0.3/:$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/:$PATH"
+	  '';
+          buildInputs = [
+            android-sdk
+            (pkgs.buildPackages.rust-bin.stable."1.64.0".minimal.override {
+              targets = [
+                "armv7-linux-androideabi"
+                "aarch64-linux-android"
+                "i686-linux-android"
+                "x86_64-linux-android"
+              ];
+            })
+          ];
+        };
+      });
+}
@@ -56,16 +56,18 @@ if test -z "$NDK_HOST_TAG"; then
    NDK_HOST_TAG="$KERNEL-$ARCH"
 fi

+unset RUSTFLAGS
+
 TOOLCHAIN="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/$NDK_HOST_TAG"
 export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="$TOOLCHAIN/bin/armv7a-linux-androideabi16-clang"
 export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/aarch64-linux-android21-clang"
 export CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/i686-linux-android16-clang"
 export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/x86_64-linux-android21-clang"

-RUSTUP_TOOLCHAIN=$(cat "$(dirname "$0")/rust-toolchain")
+export RUSTUP_TOOLCHAIN=$(cat "$(dirname "$0")/rust-toolchain")

 # Check if the argument is a correct architecture:
-if test $1 && echo "armeabi-v7a arm64-v8a x86 x86_64" | grep -vwq $1; then
+if test $1 && echo "armeabi-v7a arm64-v8a x86 x86_64" | grep -vwq -- $1; then
    echo "Architecture '$1' not known, possible values are armeabi-v7a, arm64-v8a, x86 and x86_64."
    exit
 fi
@@ -112,37 +114,37 @@ fi

 if test -z $1 || test $1 = armeabi-v7a; then
    echo "-- cross compiling to armv7-linux-androideabi (arm) --"
-    export CFLAGS=-D__ANDROID_API__=16
-    TARGET_CC=armv7a-linux-androideabi16-clang \
-    TARGET_AR=llvm-ar \
-    cargo "+$RUSTUP_TOOLCHAIN" rustc $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi -- -L "$TMPLIB"
+    TARGET_CC="$TOOLCHAIN/bin/armv7a-linux-androideabi16-clang" \
+    TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
+    TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
+    cargo rustc $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi -- -L "$TMPLIB"
    cp target/armv7-linux-androideabi/$RELEASE/libdeltachat.a $jnidir/armeabi-v7a
 fi

 if test -z $1 || test $1 = arm64-v8a; then
    echo "-- cross compiling to aarch64-linux-android (arm64) --"
-    export CFLAGS=-D__ANDROID_API__=21
-    TARGET_CC=aarch64-linux-android21-clang \
-    TARGET_AR=llvm-ar \
-    cargo "+$RUSTUP_TOOLCHAIN" rustc $RELEASEFLAG --target aarch64-linux-android -p deltachat_ffi -- -L "$TMPLIB"
+    TARGET_CC="$TOOLCHAIN/bin/aarch64-linux-android21-clang" \
+    TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
+    TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
+    cargo rustc $RELEASEFLAG --target aarch64-linux-android -p deltachat_ffi -- -L "$TMPLIB"
    cp target/aarch64-linux-android/$RELEASE/libdeltachat.a $jnidir/arm64-v8a
 fi

 if test -z $1 || test $1 = x86; then
    echo "-- cross compiling to i686-linux-android (x86) --"
-    export CFLAGS=-D__ANDROID_API__=16
-    TARGET_CC=i686-linux-android16-clang \
-    TARGET_AR=llvm-ar \
-    cargo "+$RUSTUP_TOOLCHAIN" rustc $RELEASEFLAG --target i686-linux-android -p deltachat_ffi -- -L "$TMPLIB"
+    TARGET_CC="$TOOLCHAIN/bin/i686-linux-android16-clang" \
+    TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
+    TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
+    cargo rustc $RELEASEFLAG --target i686-linux-android -p deltachat_ffi -- -L "$TMPLIB"
    cp target/i686-linux-android/$RELEASE/libdeltachat.a $jnidir/x86
 fi

 if test -z $1 || test $1 = x86_64; then
    echo "-- cross compiling to x86_64-linux-android (x86_64) --"
-    export CFLAGS=-D__ANDROID_API__=21
-    TARGET_CC=x86_64-linux-android21-clang \
-    TARGET_AR=llvm-ar \
-    cargo "+$RUSTUP_TOOLCHAIN" rustc $RELEASEFLAG --target x86_64-linux-android -p deltachat_ffi -- -L "$TMPLIB"
+    TARGET_CC="$TOOLCHAIN/bin/x86_64-linux-android21-clang" \
+    TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
+    TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
+    cargo rustc $RELEASEFLAG --target x86_64-linux-android -p deltachat_ffi -- -L "$TMPLIB"
    cp target/x86_64-linux-android/$RELEASE/libdeltachat.a $jnidir/x86_64
 fi