diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-07-29 14:49:18 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-07-29 14:49:18 +0200 |
| commit | 7ba43bff99c41a31e9369bc66fe9f8f0492816ad (patch) | |
| tree | f323d694d5edbdf70700386eb9b05bb63c7526a6 /android | |
| parent | 5f0c26b82705b603e91687d1bd6c50b7628b8fe5 (diff) | |
| parent | b58df5025c476146d6795bf1470de80937b1c722 (diff) | |
| download | mullvadvpn-7ba43bff99c41a31e9369bc66fe9f8f0492816ad.tar.xz mullvadvpn-7ba43bff99c41a31e9369bc66fe9f8f0492816ad.zip | |
Merge branch 'fix-ndk-not-found-fdroid'
Diffstat (limited to 'android')
| -rw-r--r-- | android/docs/BuildInstructions.macos.md | 4 | ||||
| -rw-r--r-- | android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml | 2 | ||||
| -rw-r--r-- | android/flake.lock | 18 | ||||
| -rw-r--r-- | android/gradle/libs.versions.toml | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/android/docs/BuildInstructions.macos.md b/android/docs/BuildInstructions.macos.md index 0538a2daaf..87208e7d0c 100644 --- a/android/docs/BuildInstructions.macos.md +++ b/android/docs/BuildInstructions.macos.md @@ -35,7 +35,7 @@ Open Android Studio -> Tools -> SDK Manager, and install `Android SDK Command-li Install the necessary Android SDK tools ```bash -~/Library/Android/sdk/cmdline-tools/latest/bin/sdkmanager "platforms;android-35" "build-tools;35.0.0" "platform-tools" "ndk;27.2.12479018" +~/Library/Android/sdk/cmdline-tools/latest/bin/sdkmanager "platforms;android-36" "build-tools;36.0.0" "platform-tools" "ndk;27.3.13750724" ``` Install Android targets @@ -47,7 +47,7 @@ Export the following environmental variables, and possibly store them for exampl `~/.zprofile` or `~/.zshrc` file: ```bash export ANDROID_HOME="$HOME/Library/Android/sdk" -export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/27.2.12479018" +export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/27.3.13750724" export NDK_TOOLCHAIN_DIR="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/bin" export AR_aarch64_linux_android="$NDK_TOOLCHAIN_DIR/llvm-ar" export AR_armv7_linux_androideabi="$NDK_TOOLCHAIN_DIR/llvm-ar" diff --git a/android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml b/android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml index e99d4b6889..0923dcc30a 100644 --- a/android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml +++ b/android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml @@ -47,7 +47,7 @@ Builds: - cargo install --force cbindgen --version "0.26.0" --locked - echo $NDK_TOOLCHAIN_DIR "$$NDK$$" - ../build.sh --fdroid - ndk: 27.2.12479018 + ndk: 27.3.13750724 AutoUpdateMode: Version UpdateCheckMode: Tags ^android/[0-9]{4}\.[0-9]+$ diff --git a/android/flake.lock b/android/flake.lock index a9ee199ccc..63e963fc21 100644 --- a/android/flake.lock +++ b/android/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1752524595, - "narHash": "sha256-BQw78e4yNYtzn0+CIvNCyWuh6Q1FHY8hebn+jv4kC6E=", + "lastModified": 1753647747, + "narHash": "sha256-Sh339Czv6XtpOmMDWqQhS2GEAlqevz3bfDqzrvIueD0=", "owner": "tadfisher", "repo": "android-nixpkgs", - "rev": "5b4a9a71371280b3d95263bf0fc8dcffedec0df8", + "rev": "d7eb36518bab45d29815a763965a0c5d9dff69e2", "type": "github" }, "original": { @@ -115,11 +115,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1753549186, + "narHash": "sha256-Znl7rzuxKg/Mdm6AhimcKynM7V3YeNDIcLjBuoBcmNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "17f6bd177404d6d43017595c5264756764444ab8", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1752547600, - "narHash": "sha256-0vUE42ji4mcCvQO8CI0Oy8LmC6u2G4qpYldZbZ26MLc=", + "lastModified": 1753671061, + "narHash": "sha256-IU4eBWfe9h2QejJYST+EAlhg8a1H6mh9gbcmWgZ2/mQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9127ca1f5a785b23a2fc1c74551a27d3e8b9a28b", + "rev": "40065d17ee4dbec3ded8ca61236132aede843fab", "type": "github" }, "original": { diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 61b3c16d7a..557c0d64a4 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -7,7 +7,7 @@ compile-sdk = "36" build-tools = "36.0.0" min-sdk = "26" target-sdk = "36" -ndk = "27.2.12479018" +ndk = "27.3.13750724" # Android # The android-gradle-aapt plugin version must be in sync with the android plugin version. |
