diff options
| author | Albin <albin@mullvad.net> | 2024-08-15 11:14:48 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-08-15 11:14:48 +0200 |
| commit | 3ed7758ca1c5fc0c85a4e13b9c4b0b85e17c3dd1 (patch) | |
| tree | 02871115e8a5238eab792acda6f8f86896a64365 | |
| parent | 1d893cab635dcefd7203e5ee25565471f4a6f6da (diff) | |
| parent | e58d3b0bc212cf4f94ac9a2d679e8b163df6955a (diff) | |
| download | mullvadvpn-3ed7758ca1c5fc0c85a4e13b9c4b0b85e17c3dd1.tar.xz mullvadvpn-3ed7758ca1c5fc0c85a4e13b9c4b0b85e17c3dd1.zip | |
Merge branch 'update-android-build-instructions'
| -rw-r--r-- | android/BuildInstructions.md | 8 | ||||
| -rw-r--r-- | android/docs/BuildInstructions.macos.md | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/android/BuildInstructions.md b/android/BuildInstructions.md index 4f73c9721b..b6dc1defca 100644 --- a/android/BuildInstructions.md +++ b/android/BuildInstructions.md @@ -154,6 +154,9 @@ environment variables: rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android ``` +#### 6. Download wireguard-go-rs submodule +Run the following command to download wireguard-go-rs submodule: `git submodule update --init --recursive --depth=1 wireguard-go-rs` + ### Debug build Run the following command to build a debug build: ```bash @@ -196,10 +199,13 @@ This lockfile helps ensuring the integrity of the gradle dependencies in the pro When adding or updating dependencies, it's necessary to also update the lockfile. This can be done in the following way: -1. Run update script (requires `podman`): +1. Run update script: ```bash ./scripts/update-lockfile.sh ``` + + If you're on macOS make sure GNU sed is installed. Install with `brew install gnu-sed` and add it to your `PATH` so that it is used instead of the `sed` macOS ships with `PATH="$HOMEBREW_PREFIX/opt/gnu-sed/libexec/gnubin:$PATH"` + 2. Check diff before committing. ### Disable during development diff --git a/android/docs/BuildInstructions.macos.md b/android/docs/BuildInstructions.macos.md index 87d77fa78e..01546c570a 100644 --- a/android/docs/BuildInstructions.macos.md +++ b/android/docs/BuildInstructions.macos.md @@ -61,6 +61,13 @@ export CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$NDK_TOOLCHAIN_DIR/i686-linux-and export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$NDK_TOOLCHAIN_DIR/x86_64-linux-android26-clang" ``` +## 3. Checkout wireguard-go-rs submodule +wireguard-go-rs submodule need to be downloaded: + +```bash +git submodule update --init --recursive --depth=1 wireguard-go-rs +``` + ## 4. Debug build Run the build script in the root of the project to assemble all the native libraries and the app: |