Android: bump ndk versions (#1708)

* Bump ndk versions * Update README for new ndk proc attribute * android: add CHANGELOG entry to ndk vesion bump
rust-windowing · Sep 18, 2020 · 386ead1 · 386ead1
1 parent 83c95e7
commit 386ead1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@
 - **Breaking:** `primary_monitor` now returns `Option<MonitorHandle>`.
 - On macOS, updated core-* dependencies and cocoa.
 - Bump `parking_lot` to 0.11
+- On Android, bump `ndk`, `ndk-sys` and `ndk-glue` to 0.2. Checkout the new ndk-glue main proc attribute.
 
 # 0.22.2 (2020-05-16)
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -37,9 +37,9 @@ image = "0.23"
 simple_logger = "1.9"
 
 [target.'cfg(target_os = "android")'.dependencies]
-ndk = "0.1.0"
-ndk-sys = "0.1.0"
-ndk-glue = "0.1.0"
+ndk = "0.2.0"
+ndk-sys = "0.2.0"
+ndk-glue = "0.2.0"
 
 [target.'cfg(target_os = "ios")'.dependencies]
 objc = "0.2.3"

diff --git a/README.md b/README.md
@@ -92,8 +92,10 @@ crate-type = ["cdylib"]
 
 And add this to the example file to add the native activity glue:
 ```rust
-#[cfg(target_os = "android")]
-ndk_glue::ndk_glue!(main);
+#[cfg_attr(target_os = "android", ndk_glue::main(backtrace = "on"))]
+fn main() {
+    ...
+}
 ```
 
 And run the application with `cargo apk run --example request_redraw_threaded`