From c845edbf8777e0e97cfbfcb0fe20f46a4f1764e3 Mon Sep 17 00:00:00 2001 From: msiglreith Date: Mon, 1 Nov 2021 15:07:03 +0100 Subject: [PATCH] Android: Bump ndk/ndk-glue version --- CHANGELOG.md | 1 + Cargo.toml | 4 ++-- README.md | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fcbdae819..5b2dff989a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - On Wayland, implement `request_user_attention` with `xdg_activation_v1`. - On X11, emit missing `WindowEvent::ScaleFactorChanged` when the only monitor gets reconnected. - On X11, if RANDR based scale factor is higher than 20 reset it to 1 +- **Breaking:** On Android, bump `ndk` and `ndk-glue` to 0.4. # 0.25.0 (2021-05-15) diff --git a/Cargo.toml b/Cargo.toml index ee100d2d2a..12ef7b8909 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,9 +35,9 @@ image = "0.23.12" simple_logger = "1.9" [target.'cfg(target_os = "android")'.dependencies] -ndk = "0.3" +ndk = "0.4" ndk-sys = "0.2.0" -ndk-glue = "0.3" +ndk-glue = "0.4" [target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies] objc = "0.2.7" diff --git a/README.md b/README.md index 074e41ee0f..679ec79c5d 100644 --- a/README.md +++ b/README.md @@ -100,6 +100,7 @@ The `ndk_glue` version needs to match the version used by `winit`. Otherwise, th | :---: | :------------------: | | 0.24 | `ndk_glue = "0.2.0"` | | 0.25 | `ndk_glue = "0.3.0"` | +| 0.26 | `ndk_glue = "0.4.0"` | Running on an Android device needs a dynamic system library, add this to Cargo.toml: @@ -125,6 +126,6 @@ To ensure compatibility with older MacOS systems, winit links to CGDisplayCreateUUIDFromDisplayID through the CoreGraphics framework. However, under certain setups this function is only available to be linked through the newer ColorSync framework. So, winit provides the -`WINIT_LINK_COLORSYNC` environment variable which can be set to `1` or `true` +`WINIT_LINK_COLORSYNC` environment variable which can be set to `1` or `true` while compiling to enable linking via ColorSync.