diff options
| -rw-r--r-- | android/BuildInstructions.md | 2 | ||||
| -rw-r--r-- | android/docker/Dockerfile | 7 | ||||
| -rw-r--r-- | android/docs/BuildInstructions.macos.md | 5 |
3 files changed, 0 insertions, 14 deletions
diff --git a/android/BuildInstructions.md b/android/BuildInstructions.md index cfff1b3d73..8c63957847 100644 --- a/android/BuildInstructions.md +++ b/android/BuildInstructions.md @@ -128,8 +128,6 @@ Linux distro: #### 5. Install and configure Rust toolchain - Get the latest **stable** Rust toolchain via [rustup.rs](https://rustup.rs/). - Also install `cbindgen` which is required to build `wireguard-go-rs`: - `cargo install --force cbindgen` - Configure Android cross-compilation targets and set up linker and archiver. This can be done by setting the following environment variables: diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 3635fc55c0..705c0d1ed0 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -117,11 +117,4 @@ RUN patch -p1 -f -N -r- -d /usr/local/go < /tmp/goruntime-boottime-over-monotoni # Add rust targets RUN rustup target add x86_64-linux-android i686-linux-android aarch64-linux-android armv7-linux-androideabi -# Install cbindgen to address maybenot.h (checked in) sometimes needing to be -# re-generated due to how `make` looks at last-modifications while git neither -# stores nor consistently sets modification metadata on file checkout. -# This is an intermediate solution that will be further improved as part of -# issue: DROID-1328. -RUN cargo install --force cbindgen --version "0.26.0" && rm -rf ~/.cargo/registry - WORKDIR /build diff --git a/android/docs/BuildInstructions.macos.md b/android/docs/BuildInstructions.macos.md index 0368c1e917..18feb1b4cb 100644 --- a/android/docs/BuildInstructions.macos.md +++ b/android/docs/BuildInstructions.macos.md @@ -28,11 +28,6 @@ Finish the install of `rustup`: rustup-init ``` -Install `cbindgen` which is required to build `wireguard-go-rs`: -```bash -cargo install --force cbindgen -``` - ## 2. Install SDK Tools and Android NDK Toolchain Open Android Studio -> Tools -> SDK Manager, and install `Android SDK Command-line Tools (latest)`. |