From 5f4df548956ae8d2a25805fc15ef7009fe5199a1 Mon Sep 17 00:00:00 2001 From: Markus Siglreithmaier Date: Tue, 2 Nov 2021 18:54:59 +0100 Subject: [PATCH] Android: Bump ndk/ndk-glue version (#2047) --- 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 5b432817..5571d31b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - 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 - On Wayland, add an enabled-by-default feature called `wayland-dlopen` so users can opt out of using `dlopen` to load system libraries. +- **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 55d17e81..557d3c39 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,9 +36,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 074e41ee..679ec79c 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.