From 049e6602199e27a81bddf28c209a3e028efee907 Mon Sep 17 00:00:00 2001
From: kukie <kukiebox@gmail.com>
Date: Tue, 23 May 2023 15:43:03 +0300
Subject: [PATCH 01/93] fix: pointer_index always returns 0

---
 android-activity/src/game_activity/input.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-activity/src/game_activity/input.rs b/android-activity/src/game_activity/input.rs
index ac951be..0f29a42 100644
--- a/android-activity/src/game_activity/input.rs
+++ b/android-activity/src/game_activity/input.rs
@@ -332,7 +332,7 @@ impl<'a> MotionEvent<'a> {
     /// or [`PointerDown`](MotionAction::PointerDown).
     #[inline]
     pub fn pointer_index(&self) -> usize {
-        let action = self.action as u32 & ndk_sys::AMOTION_EVENT_ACTION_MASK;
+        let action = self.action as u32;
         let index = (action & ndk_sys::AMOTION_EVENT_ACTION_POINTER_INDEX_MASK)
             >> ndk_sys::AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
         index as usize

From 3843a7cfaa04c3981c1e655db6bfa6e603924ebd Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Thu, 27 Apr 2023 22:00:43 +0100
Subject: [PATCH 02/93] Call Activity.finish() when android_main returns

Calling Activity.finish() is what ensures the Activity will get
gracefully destroyed, including calling the Activity's onDestroy
method.

Fixes: #67
---
 android-activity/CHANGELOG.md                |  2 +
 android-activity/src/game_activity/mod.rs    | 73 ++++++++++++--------
 android-activity/src/native_activity/glue.rs | 37 +++++++---
 android-activity/src/util.rs                 | 40 +++++------
 4 files changed, 95 insertions(+), 57 deletions(-)

diff --git a/android-activity/CHANGELOG.md b/android-activity/CHANGELOG.md
index 6ddb0e1..6124643 100644
--- a/android-activity/CHANGELOG.md
+++ b/android-activity/CHANGELOG.md
@@ -3,6 +3,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- The `Activity.finish()` method is now called when `android_main` returns so the `Activity` will be destroyed ([#67](https://github.com/rust-mobile/android-activity/issues/67))
 
 ## [0.4.1] - 2022-02-16
 ### Added
diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index 82bc3e3..d43dc6e 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -6,6 +6,7 @@ use std::io::{BufRead, BufReader};
 use std::marker::PhantomData;
 use std::ops::Deref;
 use std::os::unix::prelude::*;
+use std::panic::catch_unwind;
 use std::ptr::NonNull;
 use std::sync::{Arc, RwLock};
 use std::time::Duration;
@@ -23,7 +24,7 @@ use ndk::asset::AssetManager;
 use ndk::configuration::Configuration;
 use ndk::native_window::NativeWindow;
 
-use crate::util::{abort_on_panic, android_log};
+use crate::util::{abort_on_panic, android_log, log_panic};
 use crate::{
     util, AndroidApp, ConfigurationRef, InputStatus, MainEvent, PollEvent, Rect, WindowManagerFlags,
 };
@@ -603,7 +604,8 @@ extern "Rust" {
 // `app_main` function. This is run on a dedicated thread spawned
 // by android_native_app_glue.
 #[no_mangle]
-pub unsafe extern "C" fn _rust_glue_entry(app: *mut ffi::android_app) {
+#[allow(unused_unsafe)] // Otherwise rust 1.64 moans about using unsafe{} in unsafe functions
+pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
     abort_on_panic(|| {
         // Maybe make this stdout/stderr redirection an optional / opt-in feature?...
         let mut logpipe: [RawFd; 2] = Default::default();
@@ -627,34 +629,51 @@ pub unsafe extern "C" fn _rust_glue_entry(app: *mut ffi::android_app) {
             }
         });
 
-        let jvm: *mut JavaVM = (*(*app).activity).vm;
-        let activity: jobject = (*(*app).activity).javaGameActivity;
-        ndk_context::initialize_android_context(jvm.cast(), activity.cast());
+        let jvm = unsafe {
+            let jvm = (*(*native_app).activity).vm;
+            let activity: jobject = (*(*native_app).activity).javaGameActivity;
+            ndk_context::initialize_android_context(jvm.cast(), activity.cast());
+
+            // Since this is a newly spawned thread then the JVM hasn't been attached
+            // to the thread yet. Attach before calling the applications main function
+            // so they can safely make JNI calls
+            let mut jenv_out: *mut core::ffi::c_void = std::ptr::null_mut();
+            if let Some(attach_current_thread) = (*(*jvm)).AttachCurrentThread {
+                attach_current_thread(jvm, &mut jenv_out, std::ptr::null_mut());
+            }
 
-        let app = AndroidApp::from_ptr(NonNull::new(app).unwrap());
+            jvm
+        };
 
-        // Since this is a newly spawned thread then the JVM hasn't been attached
-        // to the thread yet. Attach before calling the applications main function
-        // so they can safely make JNI calls
-        let mut jenv_out: *mut core::ffi::c_void = std::ptr::null_mut();
-        if let Some(attach_current_thread) = (*(*jvm)).AttachCurrentThread {
-            attach_current_thread(jvm, &mut jenv_out, std::ptr::null_mut());
-        }
+        unsafe {
+            let app = AndroidApp::from_ptr(NonNull::new(native_app).unwrap());
+
+            // We want to specifically catch any panic from the application's android_main
+            // so we can finish + destroy the Activity gracefully via the JVM
+            catch_unwind(|| {
+                // XXX: If we were in control of the Java Activity subclass then
+                // we could potentially run the android_main function via a Java native method
+                // springboard (e.g. call an Activity subclass method that calls a jni native
+                // method that then just calls android_main()) that would make sure there was
+                // a Java frame at the base of our call stack which would then be recognised
+                // when calling FindClass to lookup a suitable classLoader, instead of
+                // defaulting to the system loader. Without this then it's difficult for native
+                // code to look up non-standard Java classes.
+                android_main(app);
+            })
+            .unwrap_or_else(|panic| log_panic(panic));
+
+            // Let JVM know that our Activity can be destroyed before detaching from the JVM
+            //
+            // "Note that this method can be called from any thread; it will send a message
+            //  to the main thread of the process where the Java finish call will take place"
+            ffi::GameActivity_finish((*native_app).activity);
 
-        // XXX: If we were in control of the Java Activity subclass then
-        // we could potentially run the android_main function via a Java native method
-        // springboard (e.g. call an Activity subclass method that calls a jni native
-        // method that then just calls android_main()) that would make sure there was
-        // a Java frame at the base of our call stack which would then be recognised
-        // when calling FindClass to lookup a suitable classLoader, instead of
-        // defaulting to the system loader. Without this then it's difficult for native
-        // code to look up non-standard Java classes.
-        android_main(app);
-
-        if let Some(detach_current_thread) = (*(*jvm)).DetachCurrentThread {
-            detach_current_thread(jvm);
-        }
+            if let Some(detach_current_thread) = (*(*jvm)).DetachCurrentThread {
+                detach_current_thread(jvm);
+            }
 
-        ndk_context::release_android_context();
+            ndk_context::release_android_context();
+        }
     })
 }
diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index 6af66af..64df108 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -8,6 +8,7 @@ use std::{
     io::{BufRead, BufReader},
     ops::Deref,
     os::unix::prelude::{FromRawFd, RawFd},
+    panic::catch_unwind,
     ptr::{self, NonNull},
     sync::{Arc, Condvar, Mutex, Weak},
 };
@@ -15,7 +16,11 @@ use std::{
 use log::Level;
 use ndk::{configuration::Configuration, input_queue::InputQueue, native_window::NativeWindow};
 
-use crate::{util::abort_on_panic, util::android_log, ConfigurationRef};
+use crate::{
+    util::android_log,
+    util::{abort_on_panic, log_panic},
+    ConfigurationRef,
+};
 
 use super::{AndroidApp, Rect};
 
@@ -803,6 +808,7 @@ unsafe extern "C" fn on_content_rect_changed(
 
 /// This is the native entrypoint for our cdylib library that `ANativeActivity` will look for via `dlsym`
 #[no_mangle]
+#[allow(unused_unsafe)] // Otherwise rust 1.64 moans about using unsafe{} in unsafe functions
 extern "C" fn ANativeActivity_onCreate(
     activity: *mut ndk_sys::ANativeActivity,
     saved_state: *const libc::c_void,
@@ -874,15 +880,26 @@ extern "C" fn ANativeActivity_onCreate(
             rust_glue.notify_main_thread_running();
 
             unsafe {
-                // XXX: If we were in control of the Java Activity subclass then
-                // we could potentially run the android_main function via a Java native method
-                // springboard (e.g. call an Activity subclass method that calls a jni native
-                // method that then just calls android_main()) that would make sure there was
-                // a Java frame at the base of our call stack which would then be recognised
-                // when calling FindClass to lookup a suitable classLoader, instead of
-                // defaulting to the system loader. Without this then it's difficult for native
-                // code to look up non-standard Java classes.
-                android_main(app);
+                // We want to specifically catch any panic from the application's android_main
+                // so we can finish + destroy the Activity gracefully via the JVM
+                catch_unwind(|| {
+                    // XXX: If we were in control of the Java Activity subclass then
+                    // we could potentially run the android_main function via a Java native method
+                    // springboard (e.g. call an Activity subclass method that calls a jni native
+                    // method that then just calls android_main()) that would make sure there was
+                    // a Java frame at the base of our call stack which would then be recognised
+                    // when calling FindClass to lookup a suitable classLoader, instead of
+                    // defaulting to the system loader. Without this then it's difficult for native
+                    // code to look up non-standard Java classes.
+                    android_main(app);
+                })
+                .unwrap_or_else(|panic| log_panic(panic));
+
+                // Let JVM know that our Activity can be destroyed before detaching from the JVM
+                //
+                // "Note that this method can be called from any thread; it will send a message
+                //  to the main thread of the process where the Java finish call will take place"
+                ndk_sys::ANativeActivity_finish(activity);
 
                 if let Some(detach_current_thread) = (*(*jvm)).DetachCurrentThread {
                     detach_current_thread(jvm);
diff --git a/android-activity/src/util.rs b/android-activity/src/util.rs
index c115328..6e04758 100644
--- a/android-activity/src/util.rs
+++ b/android-activity/src/util.rs
@@ -31,6 +31,25 @@ pub(crate) fn android_log(level: Level, tag: &CStr, msg: &CStr) {
     }
 }
 
+pub(crate) fn log_panic(panic: Box<dyn std::any::Any + Send>) {
+    let rust_panic = unsafe { CStr::from_bytes_with_nul_unchecked(b"RustPanic\0") };
+
+    if let Some(panic) = panic.downcast_ref::<String>() {
+        if let Ok(msg) = CString::new(panic.clone()) {
+            android_log(Level::Error, rust_panic, &msg);
+        }
+    } else if let Ok(panic) = panic.downcast::<&str>() {
+        if let Ok(msg) = CString::new(*panic) {
+            android_log(Level::Error, rust_panic, &msg);
+        }
+    } else {
+        let unknown_panic = unsafe { CStr::from_bytes_with_nul_unchecked(b"UnknownPanic\0") };
+        android_log(Level::Error, unknown_panic, unsafe {
+            CStr::from_bytes_with_nul_unchecked(b"\0")
+        });
+    }
+}
+
 /// Run a closure and abort the program if it panics.
 ///
 /// This is generally used to ensure Rust callbacks won't unwind past the JNI boundary, which leads
@@ -45,26 +64,7 @@ pub(crate) fn abort_on_panic<R>(f: impl FnOnce() -> R) -> R {
         //
         // Just in case our attempt to log a panic could itself cause a panic we use a
         // second catch_unwind here.
-        let _ = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
-            // Try logging the panic, but abort if that fails.
-            let rust_panic = unsafe { CStr::from_bytes_with_nul_unchecked(b"RustPanic\0") };
-
-            if let Some(panic) = panic.downcast_ref::<String>() {
-                if let Ok(msg) = CString::new(panic.clone()) {
-                    android_log(Level::Error, rust_panic, &msg);
-                }
-            } else if let Ok(panic) = panic.downcast::<&str>() {
-                if let Ok(msg) = CString::new(*panic) {
-                    android_log(Level::Error, rust_panic, &msg);
-                }
-            } else {
-                let unknown_panic =
-                    unsafe { CStr::from_bytes_with_nul_unchecked(b"UnknownPanic\0") };
-                android_log(Level::Error, unknown_panic, unsafe {
-                    CStr::from_bytes_with_nul_unchecked(b"\0")
-                });
-            }
-        }));
+        let _ = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| log_panic(panic)));
         std::process::abort();
     })
 }

From 4a4efd871a62a1519ea628c599a116a321b0babc Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Fri, 16 Jun 2023 17:35:53 +0200
Subject: [PATCH 03/93] README: Add badges to CI, crates.io, docs.rs and show
 the MSRV

I was trying to quickly get to the documentation of this crate and had
the GitHub page open... but there was no link on the front-page: let's
fix that.
---
 README.md                     | 39 +++++++++++++++++++++--------------
 android-activity/src/input.rs |  2 +-
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index b2d0dc0..7c49732 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,11 @@
-# Overview
+# `android-activity`
+
+[![ci](https://github.com/rust-mobile/android-activity/actions/workflows/ci.yml/badge.svg)](https://github.com/rust-mobile/android-activity/actions/workflows/ci.yml)
+[![crates.io](https://img.shields.io/crates/v/android-activity.svg)](https://crates.io/crates/android-activity)
+[![Docs](https://docs.rs/android-activity/badge.svg)](https://docs.rs/android-activity)
+[![MSRV](https://img.shields.io/badge/rustc-1.64.0+-ab6000.svg)](https://blog.rust-lang.org/2022/09/22/Rust-1.64.0.html)
+
+## Overview
 
 `android-activity` provides a "glue" layer for building native Rust
 applications on Android, supporting multiple [`Activity`] base classes.
@@ -22,10 +29,11 @@ applications.
 [ndk-glue]: https://crates.io/crates/ndk-glue
 [agdk]: https://developer.android.com/games/agdk
 
-# Example
+## Example
 
 Cargo.toml
-```
+
+```toml
 [dependencies]
 log = "0.4"
 android_logger = "0.11"
@@ -38,6 +46,7 @@ crate_type = ["cdylib"]
 _Note: that you will need to either specify the **"native-activity"** feature or **"game-activity"** feature to identify which `Activity` base class your application is based on_
 
 lib.rs
+
 ```rust
 use android_activity::{AndroidApp, InputStatus, MainEvent, PollEvent};
 
@@ -69,14 +78,14 @@ fn android_main(app: AndroidApp) {
 }
 ```
 
-```
+```sh
 rustup target add aarch64-linux-android
 cargo install cargo-apk
 cargo apk run
 adb logcat example:V *:S
 ```
 
-# Full Examples
+## Full Examples
 
 See [this collection of examples](https://github.com/rust-mobile/rust-android-examples) (based on both `GameActivity` and `NativeActivity`).
 
@@ -84,7 +93,7 @@ Each example is a standalone project that may also be a convenient templates for
 
 For the examples based on middleware frameworks (Winit and or Egui) they also aim to demonstrate how it's possible to write portable code that will run on Android and other systems.
 
-# Should I use NativeActivity or GameActivity?
+## Should I use NativeActivity or GameActivity?
 
 To learn more about the `NativeActivity` class that's shipped with Android see [here](https://developer.android.com/ndk/guides/concepts#naa).
 
@@ -96,22 +105,23 @@ It's expected that the `GameActivity` backend will gain more sophisticated input
 
 Even if you start out using `NativeActivity` for the convenience, it's likely that most moderately complex applications will eventually need to define their own `Activity` subclass (either subclassing `NativeActivity` or `GameActivity`) which will require compiling at least a small amount of Java or Kotlin code. This is generally due to Android's design which directs numerous events via the `Activity` class which can only be processed by overloading some associated Activity method.
 
-# Switching from ndk-glue to android-activity
+## Switching from ndk-glue to android-activity
+
+### Winit-based applications
 
-## Winit-based applications
 Firstly; if you have a [Winit](https://crates.io/crates/winit) based application and also have an explicit dependency on `ndk-glue` your application will need to remove its dependency on `ndk-glue` for the 0.28 release of Winit which will be based on android-activity (Since glue crates, due to their nature, can't be compatible with alternative glue crates).
 
 Winit-based applications can follow the [Android README](https://github.com/rust-windowing/winit#android) guidance for advice on how to switch over. Most Winit-based applications should aim to remove any explicit dependency on a specific glue crate (so not depend directly on `ndk-glue` or `android-activity` and instead rely on Winit to pull in the right glue crate). The main practical change will then be to add a `#[no_mangle]fn android_main(app: AndroidApp)` entry point.
 
 See the [Android README](https://github.com/rust-windowing/winit#android) for more details and also see the [Winit-based examples here](https://github.com/rust-mobile/rust-android-examples).
 
-## Middleware crates (i.e. not applications)
+### Middleware crates (i.e. not applications)
 
 If you have a crate that would be considered a middleware library (for example using JNI to support access to Bluetooth, or Android's Camera APIs) then the crate should almost certainly remove any dependence on a specific glue crate because this imposes a strict compatibility constraint that means the crate can only be used by applications that use that exact same glue crate version.
 
 Middleware libraries can instead look at using the [ndk-context](https://crates.io/crates/ndk-context) crate as a means for being able to use JNI without making any assumptions about the applications overall architecture. This way a middleware crate can work with alternative glue crates (including `ndk-glue` and `android-activity`) as well as work with embedded use cases (i.e. non-native applications that may just embed a dynamic library written in Rust to implement certain native functions).
 
-## Other, non-Winit-based applications
+### Other, non-Winit-based applications
 
 The steps to switch a simple standalone application over from `ndk-glue` to `android-activity` (still based on `NativeActivity`) should be:
 
@@ -120,7 +130,7 @@ The steps to switch a simple standalone application over from `ndk-glue` to `and
 3. Optionally add a dependency on `android_logger = "0.11.0"`
 4. Update the `main` entry point to look like this:
 
-```
+```rust
 use android_activity::AndroidApp;
 
 #[no_mangle]
@@ -133,8 +143,7 @@ See this minimal [NativeActivity Mainloop](https://github.com/rust-mobile/androi
 
 There is is no `#[ndk_glue::main]` replacement considering that `android_main()` entry point needs to be passed an `AndroidApp` argument which isn't compatible with a traditional `main()` function. Having an Android specific entry point also gives a place to initialize Android logging and handle other Android specific details (such as building an event loop based on the `app` argument)
 
-
-## Design Summary / Motivation behind android-activity
+### Design Summary / Motivation behind android-activity
 
 Prior to working on android-activity, the existing glue crates available for building standalone Rust applications on Android were found to have a number of technical limitations that this crate aimed to solve:
 
@@ -142,12 +151,10 @@ Prior to working on android-activity, the existing glue crates available for bui
 2. **Encapsulate IPC + synchronization between the native thread and the JVM thread**: For example with `ndk-glue` the application itself needs to avoid race conditions between the native and Java thread by following a locking convention) and it wasn't clear how this would extend to support other requests (like state saving) that also require synchronization.
 3. **Avoid static global state**: Keeping in mind the possibility of supporting applications with multiple native activities there was interest in having an API that didn't rely on global statics to track top-level state. Instead of having global getters for state then `android-activity` passes an explicit `app: AndroidApp` argument to the entry point that encapsulates the state connected with a single `Activity`.
 
-
 [`GameTextInput`]: https://developer.android.com/games/agdk/add-support-for-text-input
 [`AppCompatActivity`]: https://developer.android.com/reference/androidx/appcompat/app/AppCompatActivity
 
-
-# MSRV
+## MSRV
 
 We aim to (at least) support stable releases of Rust from the last three months. Rust has a 6 week release cycle which means we will support the last three stable releases.
 For example, when Rust 1.69 is released we would limit our `rust_version` to 1.67.
diff --git a/android-activity/src/input.rs b/android-activity/src/input.rs
index 3653260..f28d1a9 100644
--- a/android-activity/src/input.rs
+++ b/android-activity/src/input.rs
@@ -63,7 +63,7 @@ pub enum Class {
 
 impl From<u32> for Class {
     fn from(source: u32) -> Self {
-        let class = SourceFlags::from_bits_truncate(source as u32);
+        let class = SourceFlags::from_bits_truncate(source);
         match class {
             SourceFlags::BUTTON => Class::Button,
             SourceFlags::POINTER => Class::Pointer,

From ca0d2eb3aa6e91116b00b5a8dd9be3fb92cfade0 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Sat, 24 Jun 2023 00:43:14 +0200
Subject: [PATCH 04/93] cargo: Fix `rust_version` -> `rust-version` property
 typo

Cargo complains:

    warning: android-activity/Cargo.toml: unused manifest key: package.rust_version

Solve this by replacing the underscore with a hyphen.
---
 android-activity/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 764c8e6..db3f4ff 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/rust-mobile/android-activity"
 documentation = "https://docs.rs/android-activity"
 description = "Glue for building Rust applications on Android with NativeActivity or GameActivity"
 license = "MIT OR Apache-2.0"
-rust_version = "1.64"
+rust-version = "1.64"
 
 [features]
 # Note: we don't enable any backend by default since features

From cd814206385639e433ed1d43ec0f67e28d434139 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Sun, 25 Jun 2023 23:45:32 +0100
Subject: [PATCH 05/93] Update agdk-mainloop

---
 examples/agdk-mainloop/Cargo.toml             |  2 ++
 examples/agdk-mainloop/app/build.gradle       |  2 ++
 .../app/src/main/AndroidManifest.xml          |  3 +-
 examples/agdk-mainloop/build.gradle           |  4 +--
 examples/agdk-mainloop/gradle.properties      |  4 ++-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 examples/agdk-mainloop/src/lib.rs             | 31 ++++++++++++++++---
 7 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/examples/agdk-mainloop/Cargo.toml b/examples/agdk-mainloop/Cargo.toml
index 47d30a3..6971468 100644
--- a/examples/agdk-mainloop/Cargo.toml
+++ b/examples/agdk-mainloop/Cargo.toml
@@ -9,6 +9,8 @@ edition = "2021"
 log = "0.4"
 android_logger = "0.11.0"
 android-activity = { path="../../android-activity", features = ["game-activity"] }
+ndk-sys = "0.4"
+ndk = "0.7"
 
 [lib]
 name="main"
diff --git a/examples/agdk-mainloop/app/build.gradle b/examples/agdk-mainloop/app/build.gradle
index 77c1a85..cce660e 100644
--- a/examples/agdk-mainloop/app/build.gradle
+++ b/examples/agdk-mainloop/app/build.gradle
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+    ndkVersion "25.2.9519653"
     compileSdk 31
 
     defaultConfig {
@@ -32,6 +33,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'co.realfit.agdkmainloop'
 }
 
 dependencies {
diff --git a/examples/agdk-mainloop/app/src/main/AndroidManifest.xml b/examples/agdk-mainloop/app/src/main/AndroidManifest.xml
index 7b99a0b..b9d7563 100644
--- a/examples/agdk-mainloop/app/src/main/AndroidManifest.xml
+++ b/examples/agdk-mainloop/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.realfit.agdkmainloop">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/examples/agdk-mainloop/build.gradle b/examples/agdk-mainloop/build.gradle
index dfdcb16..8ba8ae9 100644
--- a/examples/agdk-mainloop/build.gradle
+++ b/examples/agdk-mainloop/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.1.2' apply false
-    id 'com.android.library' version '7.1.2' apply false
+    id 'com.android.application' version '8.0.0' apply false
+    id 'com.android.library' version '8.0.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/examples/agdk-mainloop/gradle.properties b/examples/agdk-mainloop/gradle.properties
index dab7c28..ec63151 100644
--- a/examples/agdk-mainloop/gradle.properties
+++ b/examples/agdk-mainloop/gradle.properties
@@ -18,4 +18,6 @@ android.useAndroidX=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/examples/agdk-mainloop/gradle/wrapper/gradle-wrapper.properties b/examples/agdk-mainloop/gradle/wrapper/gradle-wrapper.properties
index 0460660..5538f03 100644
--- a/examples/agdk-mainloop/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/agdk-mainloop/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon May 02 15:39:12 BST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/agdk-mainloop/src/lib.rs b/examples/agdk-mainloop/src/lib.rs
index b043f87..166ee69 100644
--- a/examples/agdk-mainloop/src/lib.rs
+++ b/examples/agdk-mainloop/src/lib.rs
@@ -7,7 +7,7 @@ fn android_main(app: AndroidApp) {
 
     let mut quit = false;
     let mut redraw_pending = true;
-    let mut render_state: Option<()> = Default::default();
+    let mut native_window: Option<ndk::native_window::NativeWindow> = None;
 
     while !quit {
         app.poll_events(
@@ -37,11 +37,11 @@ fn android_main(app: AndroidApp) {
                                 }
                             }
                             MainEvent::InitWindow { .. } => {
-                                render_state = Some(());
+                                native_window = app.native_window();
                                 redraw_pending = true;
                             }
                             MainEvent::TerminateWindow { .. } => {
-                                render_state = None;
+                                native_window = None;
                             }
                             MainEvent::WindowResized { .. } => {
                                 redraw_pending = true;
@@ -65,7 +65,7 @@ fn android_main(app: AndroidApp) {
                 }
 
                 if redraw_pending {
-                    if let Some(_rs) = render_state {
+                    if let Some(native_window) = &native_window {
                         redraw_pending = false;
 
                         // Handle input
@@ -75,9 +75,32 @@ fn android_main(app: AndroidApp) {
                         });
 
                         info!("Render...");
+                        dummy_render(native_window);
                     }
                 }
             },
         );
     }
 }
+
+/// Post a NOP frame to the window
+///
+/// Since this is a bare minimum test app we don't depend
+/// on any GPU graphics APIs but we do need to at least
+/// convince Android that we're drawing something and are
+/// responsive, otherwise it will stop delivering input
+/// events to us.
+fn dummy_render(native_window: &ndk::native_window::NativeWindow) {
+    unsafe {
+        let mut buf: ndk_sys::ANativeWindow_Buffer = std::mem::zeroed();
+        let mut rect: ndk_sys::ARect = std::mem::zeroed();
+        ndk_sys::ANativeWindow_lock(
+            native_window.ptr().as_ptr() as _,
+            &mut buf as _,
+            &mut rect as _,
+        );
+        // Note: we don't try and touch the buffer since that
+        // also requires us to handle various buffer formats
+        ndk_sys::ANativeWindow_unlockAndPost(native_window.ptr().as_ptr() as _);
+    }
+}

From 230035526b5127b93c2d120c5b7f5aa8418852b3 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Sun, 25 Jun 2023 23:45:42 +0100
Subject: [PATCH 06/93] Update na-mainloop

---
 examples/na-mainloop/Cargo.toml               |  2 ++
 examples/na-mainloop/app/build.gradle         |  2 ++
 .../app/src/main/AndroidManifest.xml          |  3 +-
 examples/na-mainloop/build.gradle             |  4 +--
 examples/na-mainloop/gradle.properties        |  4 ++-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 examples/na-mainloop/src/lib.rs               | 31 ++++++++++++++++---
 7 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/examples/na-mainloop/Cargo.toml b/examples/na-mainloop/Cargo.toml
index 6280913..93da1d9 100644
--- a/examples/na-mainloop/Cargo.toml
+++ b/examples/na-mainloop/Cargo.toml
@@ -9,6 +9,8 @@ edition = "2021"
 log = "0.4"
 android_logger = "0.11.0"
 android-activity = { path="../../android-activity", features = [ "native-activity" ] }
+ndk-sys = "0.4"
+ndk = "0.7"
 
 [lib]
 #name="na_mainloop"
diff --git a/examples/na-mainloop/app/build.gradle b/examples/na-mainloop/app/build.gradle
index c17a5d3..dd102cc 100644
--- a/examples/na-mainloop/app/build.gradle
+++ b/examples/na-mainloop/app/build.gradle
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+    ndkVersion "25.2.9519653"
     compileSdk 31
 
     defaultConfig {
@@ -32,6 +33,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'co.realfit.namainloop'
 }
 
 dependencies {
diff --git a/examples/na-mainloop/app/src/main/AndroidManifest.xml b/examples/na-mainloop/app/src/main/AndroidManifest.xml
index 56fe639..d104641 100644
--- a/examples/na-mainloop/app/src/main/AndroidManifest.xml
+++ b/examples/na-mainloop/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.realfit.namainloop">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/examples/na-mainloop/build.gradle b/examples/na-mainloop/build.gradle
index dfdcb16..8ba8ae9 100644
--- a/examples/na-mainloop/build.gradle
+++ b/examples/na-mainloop/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.1.2' apply false
-    id 'com.android.library' version '7.1.2' apply false
+    id 'com.android.application' version '8.0.0' apply false
+    id 'com.android.library' version '8.0.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/examples/na-mainloop/gradle.properties b/examples/na-mainloop/gradle.properties
index dab7c28..ec63151 100644
--- a/examples/na-mainloop/gradle.properties
+++ b/examples/na-mainloop/gradle.properties
@@ -18,4 +18,6 @@ android.useAndroidX=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/examples/na-mainloop/gradle/wrapper/gradle-wrapper.properties b/examples/na-mainloop/gradle/wrapper/gradle-wrapper.properties
index 0460660..5538f03 100644
--- a/examples/na-mainloop/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/na-mainloop/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon May 02 15:39:12 BST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/na-mainloop/src/lib.rs b/examples/na-mainloop/src/lib.rs
index b043f87..166ee69 100644
--- a/examples/na-mainloop/src/lib.rs
+++ b/examples/na-mainloop/src/lib.rs
@@ -7,7 +7,7 @@ fn android_main(app: AndroidApp) {
 
     let mut quit = false;
     let mut redraw_pending = true;
-    let mut render_state: Option<()> = Default::default();
+    let mut native_window: Option<ndk::native_window::NativeWindow> = None;
 
     while !quit {
         app.poll_events(
@@ -37,11 +37,11 @@ fn android_main(app: AndroidApp) {
                                 }
                             }
                             MainEvent::InitWindow { .. } => {
-                                render_state = Some(());
+                                native_window = app.native_window();
                                 redraw_pending = true;
                             }
                             MainEvent::TerminateWindow { .. } => {
-                                render_state = None;
+                                native_window = None;
                             }
                             MainEvent::WindowResized { .. } => {
                                 redraw_pending = true;
@@ -65,7 +65,7 @@ fn android_main(app: AndroidApp) {
                 }
 
                 if redraw_pending {
-                    if let Some(_rs) = render_state {
+                    if let Some(native_window) = &native_window {
                         redraw_pending = false;
 
                         // Handle input
@@ -75,9 +75,32 @@ fn android_main(app: AndroidApp) {
                         });
 
                         info!("Render...");
+                        dummy_render(native_window);
                     }
                 }
             },
         );
     }
 }
+
+/// Post a NOP frame to the window
+///
+/// Since this is a bare minimum test app we don't depend
+/// on any GPU graphics APIs but we do need to at least
+/// convince Android that we're drawing something and are
+/// responsive, otherwise it will stop delivering input
+/// events to us.
+fn dummy_render(native_window: &ndk::native_window::NativeWindow) {
+    unsafe {
+        let mut buf: ndk_sys::ANativeWindow_Buffer = std::mem::zeroed();
+        let mut rect: ndk_sys::ARect = std::mem::zeroed();
+        ndk_sys::ANativeWindow_lock(
+            native_window.ptr().as_ptr() as _,
+            &mut buf as _,
+            &mut rect as _,
+        );
+        // Note: we don't try and touch the buffer since that
+        // also requires us to handle various buffer formats
+        ndk_sys::ANativeWindow_unlockAndPost(native_window.ptr().as_ptr() as _);
+    }
+}

From 9a713c823d0ff8fc70cee722ffed909f65543ad6 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Sun, 25 Jun 2023 23:46:32 +0100
Subject: [PATCH 07/93] Release 0.4.2

---
 android-activity/CHANGELOG.md | 6 ++++++
 android-activity/Cargo.toml   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/android-activity/CHANGELOG.md b/android-activity/CHANGELOG.md
index 6124643..ca4be1f 100644
--- a/android-activity/CHANGELOG.md
+++ b/android-activity/CHANGELOG.md
@@ -3,8 +3,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+
+## [0.4.2] - 2022-02-16
 ### Changed
 - The `Activity.finish()` method is now called when `android_main` returns so the `Activity` will be destroyed ([#67](https://github.com/rust-mobile/android-activity/issues/67))
+- The `native-activity` backend now propagates `NativeWindow` redraw/resize and `ContentRectChanged` callbacks to main loop ([#70](https://github.com/rust-mobile/android-activity/pull/70))
+- The `game-activity` implementation of `pointer_index()` was fixed to not always return `0` ([#80](https://github.com/rust-mobile/android-activity/pull/84))
+- Added `panic` guards around application's `android_main()` and native code that could potentially unwind across a Java FFI boundary ([#68](https://github.com/rust-mobile/android-activity/pull/68))
 
 ## [0.4.1] - 2022-02-16
 ### Added
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index db3f4ff..ed6a1b0 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "android-activity"
-version = "0.4.1"
+version = "0.4.2"
 edition = "2021"
 keywords = ["android", "ndk"]
 readme = "../README.md"

From a9e91f4308ce711d1b1900dbc172240f4fbd16ac Mon Sep 17 00:00:00 2001
From: "Stephen M. Coakley" <me@stephencoakley.com>
Date: Mon, 17 Jul 2023 21:39:47 -0500
Subject: [PATCH 08/93] Fix deadlock on activity onDestroy

Fix a deadlock that occurs when an activity is destroyed without process
termination, such as when an activity is destroyed and recreated due to
a configuration change.

The deadlock occurs because `notify_destroyed` blocks until `destroyed`
is set to `true`. This only occurs when `WaitableNativeActivityState` is
dropped, but the `WaitableNativeActivityState` instance is the very
thing being used to await for destruction, resulting in a deadlock.

Instead of waiting for the `WaitableNativeActivityState` to be dropped
we now wait until the native `android_main` thread has stopped.

So we can tell the difference between the thread not running because it
hasn't started or because it has finished (in case `android_main`
returns immediately) this replaces the `running` boolean with a
tri-state enum.

Co-authored-by: Robert Bragg <robert@sixbynine.org>
---
 android-activity/src/native_activity/glue.rs | 39 ++++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index 64df108..6682857 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -199,6 +199,18 @@ impl NativeActivityGlue {
     }
 }
 
+/// The status of the native thread that's created to run
+/// `android_main`
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub enum NativeThreadState {
+    /// The `android_main` thread hasn't been created yet
+    Init,
+    /// The `android_main` thread has been spawned and started running
+    Running,
+    /// The `android_main` thread has finished
+    Stopped,
+}
+
 #[derive(Debug)]
 pub struct NativeActivityState {
     pub msg_read: libc::c_int,
@@ -210,8 +222,11 @@ pub struct NativeActivityState {
     pub content_rect: ndk_sys::ARect,
     pub activity_state: State,
     pub destroy_requested: bool,
-    pub running: bool,
+    pub thread_state: NativeThreadState,
     pub app_has_saved_state: bool,
+
+    /// Set as soon as the Java main thread notifies us of an
+    /// `onDestroyed` callback.
     pub destroyed: bool,
     pub redraw_needed: bool,
     pub pending_input_queue: *mut ndk_sys::AInputQueue,
@@ -303,8 +318,6 @@ impl Drop for WaitableNativeActivityState {
         unsafe {
             let mut guard = self.mutex.lock().unwrap();
             guard.detach_input_queue_from_looper();
-            guard.destroyed = true;
-            self.cond.notify_one();
         }
     }
 }
@@ -356,7 +369,7 @@ impl WaitableNativeActivityState {
                 content_rect: Rect::empty().into(),
                 activity_state: State::Init,
                 destroy_requested: false,
-                running: false,
+                thread_state: NativeThreadState::Init,
                 app_has_saved_state: false,
                 destroyed: false,
                 redraw_needed: false,
@@ -369,10 +382,11 @@ impl WaitableNativeActivityState {
 
     pub fn notify_destroyed(&self) {
         let mut guard = self.mutex.lock().unwrap();
+        guard.destroyed = true;
 
         unsafe {
             guard.write_cmd(AppCmd::Destroy);
-            while !guard.destroyed {
+            while guard.thread_state != NativeThreadState::Stopped {
                 guard = self.cond.wait(guard).unwrap();
             }
 
@@ -541,7 +555,13 @@ impl WaitableNativeActivityState {
 
     pub fn notify_main_thread_running(&self) {
         let mut guard = self.mutex.lock().unwrap();
-        guard.running = true;
+        guard.thread_state = NativeThreadState::Running;
+        self.cond.notify_one();
+    }
+
+    pub fn notify_main_thread_stopped_running(&self) {
+        let mut guard = self.mutex.lock().unwrap();
+        guard.thread_state = NativeThreadState::Stopped;
         self.cond.notify_one();
     }
 
@@ -907,11 +927,16 @@ extern "C" fn ANativeActivity_onCreate(
 
                 ndk_context::release_android_context();
             }
+
+            rust_glue.notify_main_thread_stopped_running();
         });
 
         // Wait for thread to start.
         let mut guard = jvm_glue.mutex.lock().unwrap();
-        while !guard.running {
+
+        // Don't specifically wait for `Running` just in case `android_main` returns
+        // immediately and the state is set to `Stopped`
+        while guard.thread_state == NativeThreadState::Init {
             guard = jvm_glue.cond.wait(guard).unwrap();
         }
     })

From ab2606a73d85b00ec86ff2eafae28c1516aea86b Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Sat, 22 Jul 2023 18:09:18 +0100
Subject: [PATCH 09/93] build.rs: emit rerun-if-changed lines for compiled
 C/C++ code

---
 android-activity/build.rs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/android-activity/build.rs b/android-activity/build.rs
index 6b08f62..110859b 100644
--- a/android-activity/build.rs
+++ b/android-activity/build.rs
@@ -1,6 +1,12 @@
 #![allow(dead_code)]
 
 fn build_glue_for_game_activity() {
+    for f in [
+        "GameActivity.h",
+        "GameActivity.cpp",
+    ] {
+        println!("cargo:rerun-if-changed=game-activity-csrc/game-activity/{f}");
+    }
     cc::Build::new()
         .cpp(true)
         .include("game-activity-csrc")
@@ -8,12 +14,20 @@ fn build_glue_for_game_activity() {
         .extra_warnings(false)
         .cpp_link_stdlib("c++_static")
         .compile("libgame_activity.a");
+
+    for f in ["gamecommon.h", "gametextinput.h", "gametextinput.cpp"] {
+        println!("cargo:rerun-if-changed=game-activity-csrc/game-text-input/{f}");
+    }
     cc::Build::new()
         .cpp(true)
         .include("game-activity-csrc")
         .file("game-activity-csrc/game-text-input/gametextinput.cpp")
         .cpp_link_stdlib("c++_static")
         .compile("libgame_text_input.a");
+
+    for f in ["android_native_app_glue.h", "android_native_app_glue.c"] {
+        println!("cargo:rerun-if-changed=game-activity-csrc/native_app_glue/{f}");
+    }
     cc::Build::new()
         .include("game-activity-csrc")
         .include("game-activity-csrc/game-activity/native_app_glue")

From c10a2fb67accd0a4983ede6e021c13518b5ed00c Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Fri, 28 Jul 2023 22:18:24 +0100
Subject: [PATCH 10/93] GameActivity PATH: fix deadlocks in java callbacks
 after app destroyed

This ensures that any java Activity callbacks take into account the
possibility that the `android_app` may have already been marked
destroyed if `android_main` has returned - and so they mustn't block
and wait for a thread that is no longer running.
---
 android-activity/build.rs                     |  5 +-
 .../native_app_glue/android_native_app_glue.c | 63 +++++++++++++++++--
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/android-activity/build.rs b/android-activity/build.rs
index 110859b..305b6ba 100644
--- a/android-activity/build.rs
+++ b/android-activity/build.rs
@@ -1,10 +1,7 @@
 #![allow(dead_code)]
 
 fn build_glue_for_game_activity() {
-    for f in [
-        "GameActivity.h",
-        "GameActivity.cpp",
-    ] {
+    for f in ["GameActivity.h", "GameActivity.cpp"] {
         println!("cargo:rerun-if-changed=game-activity-csrc/game-activity/{f}");
     }
     cc::Build::new()
diff --git a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
index 5fd3eb8..0a52bd0 100644
--- a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
+++ b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
@@ -308,6 +308,15 @@ static void android_app_set_window(struct android_app* android_app,
                                    ANativeWindow* window) {
     LOGV("android_app_set_window called");
     pthread_mutex_lock(&android_app->mutex);
+
+    // NB: we have to consider that the native thread could have already
+    // (gracefully) exit (setting android_app->destroyed) and so we need
+    // to be careful to avoid a deadlock waiting for a thread that's
+    // already exit.
+    if (android_app->destroyed) {
+        pthread_mutex_unlock(&android_app->mutex);
+        return;
+    }
     if (android_app->pendingWindow != NULL) {
         android_app_write_cmd(android_app, APP_CMD_TERM_WINDOW);
     }
@@ -324,15 +333,30 @@ static void android_app_set_window(struct android_app* android_app,
 static void android_app_set_activity_state(struct android_app* android_app,
                                            int8_t cmd) {
     pthread_mutex_lock(&android_app->mutex);
-    android_app_write_cmd(android_app, cmd);
-    while (android_app->activityState != cmd) {
-        pthread_cond_wait(&android_app->cond, &android_app->mutex);
+
+    // NB: we have to consider that the native thread could have already
+    // (gracefully) exit (setting android_app->destroyed) and so we need
+    // to be careful to avoid a deadlock waiting for a thread that's
+    // already exit.
+    if (!android_app->destroyed) {
+        android_app_write_cmd(android_app, cmd);
+        while (android_app->activityState != cmd) {
+            pthread_cond_wait(&android_app->cond, &android_app->mutex);
+        }
     }
     pthread_mutex_unlock(&android_app->mutex);
 }
 
 static void android_app_free(struct android_app* android_app) {
     pthread_mutex_lock(&android_app->mutex);
+
+    // It's possible that onDestroy is called after we have already 'destroyed'
+    // the app (via `android_app_destroy` due to `android_main` returning.
+    //
+    // In this case `->destroyed` will already be set (so we won't deadlock in
+    // the loop below) but we still need to close the messaging fds and finish
+    // freeing the android_app
+
     android_app_write_cmd(android_app, APP_CMD_DESTROY);
     while (!android_app->destroyed) {
         pthread_cond_wait(&android_app->cond, &android_app->mutex);
@@ -372,6 +396,16 @@ static void onSaveInstanceState(GameActivity* activity,
 
     struct android_app* android_app = ToApp(activity);
     pthread_mutex_lock(&android_app->mutex);
+
+    // NB: we have to consider that the native thread could have already
+    // (gracefully) exit (setting android_app->destroyed) and so we need
+    // to be careful to avoid a deadlock waiting for a thread that's
+    // already exit.
+    if (android_app->destroyed) {
+        pthread_mutex_unlock(&android_app->mutex);
+        return;
+    }
+
     android_app->stateSaved = 0;
     android_app_write_cmd(android_app, APP_CMD_SAVE_STATE);
     while (!android_app->stateSaved) {
@@ -481,6 +515,15 @@ static bool onTouchEvent(GameActivity* activity,
     struct android_app* android_app = ToApp(activity);
     pthread_mutex_lock(&android_app->mutex);
 
+    // NB: we have to consider that the native thread could have already
+    // (gracefully) exit (setting android_app->destroyed) and so we need
+    // to be careful to avoid a deadlock waiting for a thread that's
+    // already exit.
+    if (android_app->destroyed) {
+        pthread_mutex_unlock(&android_app->mutex);
+        return false;
+    }
+
     if (android_app->motionEventFilter != NULL &&
         !android_app->motionEventFilter(event)) {
         pthread_mutex_unlock(&android_app->mutex);
@@ -563,6 +606,15 @@ static bool onKey(GameActivity* activity, const GameActivityKeyEvent* event) {
     struct android_app* android_app = ToApp(activity);
     pthread_mutex_lock(&android_app->mutex);
 
+    // NB: we have to consider that the native thread could have already
+    // (gracefully) exit (setting android_app->destroyed) and so we need
+    // to be careful to avoid a deadlock waiting for a thread that's
+    // already exit.
+    if (android_app->destroyed) {
+        pthread_mutex_unlock(&android_app->mutex);
+        return false;
+    }
+
     if (android_app->keyEventFilter != NULL &&
         !android_app->keyEventFilter(event)) {
         pthread_mutex_unlock(&android_app->mutex);
@@ -599,8 +651,9 @@ static void onTextInputEvent(GameActivity* activity,
                              const GameTextInputState* state) {
     struct android_app* android_app = ToApp(activity);
     pthread_mutex_lock(&android_app->mutex);
-
-    android_app->textInputState = 1;
+    if (!android_app->destroyed) {
+        android_app->textInputState = 1;
+    }
     pthread_mutex_unlock(&android_app->mutex);
 }
 

From bb97af154f656aa2405d6ab6d345f733a08c97cb Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Fri, 28 Jul 2023 22:18:54 +0100
Subject: [PATCH 11/93] Release 0.4.3

---
 android-activity/CHANGELOG.md | 9 ++++++++-
 android-activity/Cargo.toml   | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/android-activity/CHANGELOG.md b/android-activity/CHANGELOG.md
index ca4be1f..4453871 100644
--- a/android-activity/CHANGELOG.md
+++ b/android-activity/CHANGELOG.md
@@ -1,11 +1,18 @@
+<!-- markdownlint-disable MD022 MD024 MD032  -->
+
 # Changelog
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.4.3] - 2022-07-30
+### Fixed
+- Fixed a deadlock in the `native-activity` backend while waiting for the native thread after getting an `onDestroy` callback from Java ([#94](https://github.com/rust-mobile/android-activity/pull/94))
+
+- Fixed numerous deadlocks in the `game-activity` backend with how it would wait for the native thread in various Java callbacks, after the app has returned from `android_main` ([#98](https://github.com/rust-mobile/android-activity/pull/98))
 
-## [0.4.2] - 2022-02-16
+## [0.4.2] - 2022-06-17
 ### Changed
 - The `Activity.finish()` method is now called when `android_main` returns so the `Activity` will be destroyed ([#67](https://github.com/rust-mobile/android-activity/issues/67))
 - The `native-activity` backend now propagates `NativeWindow` redraw/resize and `ContentRectChanged` callbacks to main loop ([#70](https://github.com/rust-mobile/android-activity/pull/70))
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index ed6a1b0..d60bca4 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "android-activity"
-version = "0.4.2"
+version = "0.4.3"
 edition = "2021"
 keywords = ["android", "ndk"]
 readme = "../README.md"

From c471fdf903262c1cafa560065ce4af2531cf1aae Mon Sep 17 00:00:00 2001
From: Alexis <120563837+alexisart@users.noreply.github.com>
Date: Sun, 25 Jun 2023 22:28:45 -0400
Subject: [PATCH 12/93] Import unmodified GameActivity 2.0.2 Source

See: https://developer.android.com/jetpack/androidx/releases/games#games-activity_version_20_2
---
 .../common/gamesdk_common.h                   |  41 +
 .../game-activity/GameActivity.cpp            | 795 ++++++------------
 .../game-activity/GameActivity.h              | 266 +-----
 .../game-activity/GameActivityEvents.cpp      | 413 +++++++++
 .../game-activity/GameActivityEvents.h        | 336 ++++++++
 .../game-activity/GameActivityLog.h           | 109 +++
 .../native_app_glue/android_native_app_glue.c | 216 ++---
 .../native_app_glue/android_native_app_glue.h |  87 +-
 .../game-text-input/gamecommon.h              |   0
 .../game-text-input/gametextinput.cpp         |  13 +
 .../game-text-input/gametextinput.h           |  15 +
 11 files changed, 1338 insertions(+), 953 deletions(-)
 create mode 100644 android-activity/game-activity-csrc/common/gamesdk_common.h
 create mode 100644 android-activity/game-activity-csrc/game-activity/GameActivityEvents.cpp
 create mode 100644 android-activity/game-activity-csrc/game-activity/GameActivityEvents.h
 create mode 100644 android-activity/game-activity-csrc/game-activity/GameActivityLog.h
 mode change 100644 => 100755 android-activity/game-activity-csrc/game-text-input/gamecommon.h
 mode change 100644 => 100755 android-activity/game-activity-csrc/game-text-input/gametextinput.cpp
 mode change 100644 => 100755 android-activity/game-activity-csrc/game-text-input/gametextinput.h

diff --git a/android-activity/game-activity-csrc/common/gamesdk_common.h b/android-activity/game-activity-csrc/common/gamesdk_common.h
new file mode 100644
index 0000000..d29ac01
--- /dev/null
+++ b/android-activity/game-activity-csrc/common/gamesdk_common.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * This is the main interface to the Android Performance Tuner library, also
+ * known as Tuning Fork.
+ *
+ * It is part of the Android Games SDK and produces best results when integrated
+ * with the Swappy Frame Pacing Library.
+ *
+ * See the documentation at
+ * https://developer.android.com/games/sdk/performance-tuner/custom-engine for
+ * more information on using this library in a native Android game.
+ *
+ */
+
+#pragma once
+
+// There are separate versions for each GameSDK component that use this format:
+#define ANDROID_GAMESDK_PACKED_VERSION(MAJOR, MINOR, BUGFIX) \
+    ((MAJOR << 16) | (MINOR << 8) | (BUGFIX))
+// Accessors
+#define ANDROID_GAMESDK_MAJOR_VERSION(PACKED) ((PACKED) >> 16)
+#define ANDROID_GAMESDK_MINOR_VERSION(PACKED) (((PACKED) >> 8) & 0xff)
+#define ANDROID_GAMESDK_BUGFIX_VERSION(PACKED) ((PACKED) & 0xff)
+
+#define AGDK_STRING_VERSION(MAJOR, MINOR, BUGFIX, GIT) \
+#MAJOR "." #MINOR "." #BUGFIX "." #GIT
diff --git a/android-activity/game-activity-csrc/game-activity/GameActivity.cpp b/android-activity/game-activity-csrc/game-activity/GameActivity.cpp
index a139696..3721b6d 100644
--- a/android-activity/game-activity-csrc/game-activity/GameActivity.cpp
+++ b/android-activity/game-activity-csrc/game-activity/GameActivity.cpp
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#define LOG_TAG "GameActivity"
 
 #include "GameActivity.h"
 
@@ -39,53 +38,9 @@
 #include <mutex>
 #include <string>
 
-// TODO(b/187147166): these functions were extracted from the Game SDK
-// (gamesdk/src/common/system_utils.h). system_utils.h/cpp should be used
-// instead.
-namespace {
-
-#if __ANDROID_API__ >= 26
-std::string getSystemPropViaCallback(const char *key,
-                                     const char *default_value = "") {
-    const prop_info *prop = __system_property_find(key);
-    if (prop == nullptr) {
-        return default_value;
-    }
-    std::string return_value;
-    auto thunk = [](void *cookie, const char * /*name*/, const char *value,
-                    uint32_t /*serial*/) {
-        if (value != nullptr) {
-            std::string *r = static_cast<std::string *>(cookie);
-            *r = value;
-        }
-    };
-    __system_property_read_callback(prop, thunk, &return_value);
-    return return_value;
-}
-#else
-std::string getSystemPropViaGet(const char *key,
-                                const char *default_value = "") {
-    char buffer[PROP_VALUE_MAX + 1] = "";  // +1 for terminator
-    int bufferLen = __system_property_get(key, buffer);
-    if (bufferLen > 0)
-        return buffer;
-    else
-        return "";
-}
-#endif
-
-std::string GetSystemProp(const char *key, const char *default_value = "") {
-#if __ANDROID_API__ >= 26
-    return getSystemPropViaCallback(key, default_value);
-#else
-    return getSystemPropViaGet(key, default_value);
-#endif
-}
+#include "GameActivityLog.h"
 
-int GetSystemPropAsInt(const char *key, int default_value = 0) {
-    std::string prop = GetSystemProp(key);
-    return prop == "" ? default_value : strtoll(prop.c_str(), nullptr, 10);
-}
+namespace {
 
 struct OwnedGameTextInputState {
     OwnedGameTextInputState &operator=(const GameTextInputState &rhs) {
@@ -100,93 +55,6 @@ struct OwnedGameTextInputState {
 
 }  // anonymous namespace
 
-#define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__);
-#define ALOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__);
-#define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__);
-#ifdef NDEBUG
-#define ALOGV(...)
-#else
-#define ALOGV(...) \
-    __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__);
-#endif
-
-/* Returns 2nd arg.  Used to substitute default value if caller's vararg list
- * is empty.
- */
-#define __android_second(first, second, ...) second
-
-/* If passed multiple args, returns ',' followed by all but 1st arg, otherwise
- * returns nothing.
- */
-#define __android_rest(first, ...) , ##__VA_ARGS__
-
-#define android_printAssert(cond, tag, fmt...) \
-    __android_log_assert(cond, tag,            \
-                         __android_second(0, ##fmt, NULL) __android_rest(fmt))
-
-#define CONDITION(cond) (__builtin_expect((cond) != 0, 0))
-
-#ifndef LOG_ALWAYS_FATAL_IF
-#define LOG_ALWAYS_FATAL_IF(cond, ...)                                \
-    ((CONDITION(cond))                                                \
-         ? ((void)android_printAssert(#cond, LOG_TAG, ##__VA_ARGS__)) \
-         : (void)0)
-#endif
-
-#ifndef LOG_ALWAYS_FATAL
-#define LOG_ALWAYS_FATAL(...) \
-    (((void)android_printAssert(NULL, LOG_TAG, ##__VA_ARGS__)))
-#endif
-
-/*
- * Simplified macro to send a warning system log message using current LOG_TAG.
- */
-#ifndef SLOGW
-#define SLOGW(...) \
-    ((void)__android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__))
-#endif
-
-#ifndef SLOGW_IF
-#define SLOGW_IF(cond, ...)                                                    \
-    ((__predict_false(cond))                                                   \
-         ? ((void)__android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)) \
-         : (void)0)
-#endif
-
-/*
- * Versions of LOG_ALWAYS_FATAL_IF and LOG_ALWAYS_FATAL that
- * are stripped out of release builds.
- */
-#if LOG_NDEBUG
-
-#ifndef LOG_FATAL_IF
-#define LOG_FATAL_IF(cond, ...) ((void)0)
-#endif
-#ifndef LOG_FATAL
-#define LOG_FATAL(...) ((void)0)
-#endif
-
-#else
-
-#ifndef LOG_FATAL_IF
-#define LOG_FATAL_IF(cond, ...) LOG_ALWAYS_FATAL_IF(cond, ##__VA_ARGS__)
-#endif
-#ifndef LOG_FATAL
-#define LOG_FATAL(...) LOG_ALWAYS_FATAL(__VA_ARGS__)
-#endif
-
-#endif
-
-/*
- * Assertion that generates a log message when the assertion fails.
- * Stripped out of release builds.  Uses the current LOG_TAG.
- */
-#ifndef ALOG_ASSERT
-#define ALOG_ASSERT(cond, ...) LOG_FATAL_IF(!(cond), ##__VA_ARGS__)
-#endif
-
-#define LOG_TRACE(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
-
 #ifndef NELEM
 #define NELEM(x) ((int)(sizeof(x) / sizeof((x)[0])))
 #endif
@@ -212,6 +80,30 @@ static struct {
     jfieldID bottom;
 } gInsetsClassInfo;
 
+/*
+ * JNI fields of the Configuration Java class.
+ */
+static struct ConfigurationClassInfo {
+    jfieldID colorMode;
+    jfieldID densityDpi;
+    jfieldID fontScale;
+    jfieldID fontWeightAdjustment;
+    jfieldID hardKeyboardHidden;
+    jfieldID keyboard;
+    jfieldID keyboardHidden;
+    jfieldID mcc;
+    jfieldID mnc;
+    jfieldID navigation;
+    jfieldID navigationHidden;
+    jfieldID orientation;
+    jfieldID screenHeightDp;
+    jfieldID screenLayout;
+    jfieldID screenWidthDp;
+    jfieldID smallestScreenWidthDp;
+    jfieldID touchscreen;
+    jfieldID uiMode;
+} gConfigurationClassInfo;
+
 /*
  * JNI methods of the WindowInsetsCompat.Type Java class.
  */
@@ -228,6 +120,7 @@ struct ActivityWork {
     int32_t cmd;
     int64_t arg1;
     int64_t arg2;
+    int64_t arg3;
 };
 
 /*
@@ -240,19 +133,46 @@ enum {
     CMD_SET_WINDOW_FLAGS,
     CMD_SHOW_SOFT_INPUT,
     CMD_HIDE_SOFT_INPUT,
-    CMD_SET_SOFT_INPUT_STATE
+    CMD_SET_SOFT_INPUT_STATE,
+    CMD_SET_IME_EDITOR_INFO
 };
 
+/*
+ * Last known Configuration values. They may be accessed from the different
+ * thread, this is why they are made atomic.
+ */
+static struct Configuration {
+    std::atomic_int colorMode;
+    std::atomic_int densityDpi;
+    std::atomic<float> fontScale;
+    std::atomic_int fontWeightAdjustment;
+    std::atomic_int hardKeyboardHidden;
+    std::atomic_int keyboard;
+    std::atomic_int keyboardHidden;
+    std::atomic_int mcc;
+    std::atomic_int mnc;
+    std::atomic_int navigation;
+    std::atomic_int navigationHidden;
+    std::atomic_int orientation;
+    std::atomic_int screenHeightDp;
+    std::atomic_int screenLayout;
+    std::atomic_int screenWidthDp;
+    std::atomic_int smallestScreenWidthDp;
+    std::atomic_int touchscreen;
+    std::atomic_int uiMode;
+} gConfiguration;
+
 /*
  * Write a command to be executed by the GameActivity on the application main
  * thread.
  */
-static void write_work(int fd, int32_t cmd, int64_t arg1 = 0,
-                       int64_t arg2 = 0) {
+static void write_work(int fd, int32_t cmd, int64_t arg1 = 0, int64_t arg2 = 0,
+                       int64_t arg3 = 0) {
     ActivityWork work;
     work.cmd = cmd;
     work.arg1 = arg1;
     work.arg2 = arg2;
+    work.arg3 = arg3;
 
     LOG_TRACE("write_work: cmd=%d", cmd);
 restart:
@@ -291,12 +211,10 @@ static bool read_work(int fd, ActivityWork *outWork) {
  * Native state for interacting with the GameActivity class.
  */
 struct NativeCode : public GameActivity {
-    NativeCode(void *_dlhandle, GameActivity_createFunc *_createFunc) {
+    NativeCode() {
         memset((GameActivity *)this, 0, sizeof(GameActivity));
         memset(&callbacks, 0, sizeof(callbacks));
         memset(&insetsState, 0, sizeof(insetsState));
-        dlhandle = _dlhandle;
-        createActivityFunc = _createFunc;
         nativeWindow = NULL;
         mainWorkRead = mainWorkWrite = -1;
         gameTextInput = NULL;
@@ -324,12 +242,6 @@ struct NativeCode : public GameActivity {
         setSurface(NULL);
         if (mainWorkRead >= 0) close(mainWorkRead);
         if (mainWorkWrite >= 0) close(mainWorkWrite);
-        if (dlhandle != NULL) {
-            // for now don't unload...  we probably should clean this
-            // up and only keep one open dlhandle per proc, since there
-            // is really no benefit to unloading the code.
-            // dlclose(dlhandle);
-        }
     }
 
     void setSurface(jobject _surface) {
@@ -345,9 +257,6 @@ struct NativeCode : public GameActivity {
 
     GameActivityCallbacks callbacks;
 
-    void *dlhandle;
-    GameActivity_createFunc *createActivityFunc;
-
     std::string internalDataPathObj;
     std::string externalDataPathObj;
     std::string obbPathObj;
@@ -374,6 +283,8 @@ struct NativeCode : public GameActivity {
     ARect insetsState[GAMECOMMON_INSETS_TYPE_COUNT];
 };
 
+static void readConfigurationValues(NativeCode *code, jobject javaConfig);
+
 extern "C" void GameActivity_finish(GameActivity *activity) {
     NativeCode *code = static_cast<NativeCode *>(activity);
     write_work(code->mainWorkWrite, CMD_FINISH, 0);
@@ -476,6 +387,13 @@ static int mainWorkCallback(int fd, int events, void *data) {
         case CMD_HIDE_SOFT_INPUT: {
             GameTextInput_hideIme(code->gameTextInput, work.arg1);
         } break;
+        case CMD_SET_IME_EDITOR_INFO: {
+            code->env->CallVoidMethod(
+                code->javaGameActivity,
+                gGameActivityClassInfo.setImeEditorInfoFields, work.arg1,
+                work.arg2, work.arg3);
+            checkAndClearException(code->env, "setImeEditorInfo");
+        } break;
         default:
             ALOGW("Unknown work command: %d", work.cmd);
             break;
@@ -485,40 +403,16 @@ static int mainWorkCallback(int fd, int events, void *data) {
 }
 
 // ------------------------------------------------------------------------
-
 static thread_local std::string g_error_msg;
 
-static jlong loadNativeCode_native(JNIEnv *env, jobject javaGameActivity,
-                                   jstring path, jstring funcName,
-                                   jstring internalDataDir, jstring obbDir,
-                                   jstring externalDataDir, jobject jAssetMgr,
-                                   jbyteArray savedState) {
-    LOG_TRACE("loadNativeCode_native");
-    const char *pathStr = env->GetStringUTFChars(path, NULL);
+static jlong initializeNativeCode_native(
+    JNIEnv *env, jobject javaGameActivity, jstring internalDataDir,
+    jstring obbDir, jstring externalDataDir, jobject jAssetMgr,
+    jbyteArray savedState, jobject javaConfig) {
+    LOG_TRACE("initializeNativeCode_native");
     NativeCode *code = NULL;
 
-    void *handle = dlopen(pathStr, RTLD_LAZY);
-
-    env->ReleaseStringUTFChars(path, pathStr);
-
-    if (handle == nullptr) {
-        g_error_msg = dlerror();
-        ALOGE("GameActivity dlopen(\"%s\") failed: %s", pathStr,
-              g_error_msg.c_str());
-        return 0;
-    }
-
-    const char *funcStr = env->GetStringUTFChars(funcName, NULL);
-    code = new NativeCode(handle,
-                          (GameActivity_createFunc *)dlsym(handle, funcStr));
-    env->ReleaseStringUTFChars(funcName, funcStr);
-
-    if (code->createActivityFunc == nullptr) {
-        g_error_msg = dlerror();
-        ALOGW("GameActivity_onCreate not found: %s", g_error_msg.c_str());
-        delete code;
-        return 0;
-    }
+    code = new NativeCode();
 
     code->looper = ALooper_forThread();
     if (code->looper == nullptr) {
@@ -588,7 +482,10 @@ static jlong loadNativeCode_native(JNIEnv *env, jobject javaGameActivity,
         rawSavedState = env->GetByteArrayElements(savedState, NULL);
         rawSavedSize = env->GetArrayLength(savedState);
     }
-    code->createActivityFunc(code, rawSavedState, rawSavedSize);
+
+    readConfigurationValues(code, javaConfig);
+
+    GameActivity_onCreate(code, rawSavedState, rawSavedSize);
 
     code->gameTextInput = GameTextInput_init(env, 0);
     GameTextInput_setEventCallback(code->gameTextInput,
@@ -609,9 +506,9 @@ static jstring getDlError_native(JNIEnv *env, jobject javaGameActivity) {
     return result;
 }
 
-static void unloadNativeCode_native(JNIEnv *env, jobject javaGameActivity,
+static void terminateNativeCode_native(JNIEnv *env, jobject javaGameActivity,
                                     jlong handle) {
-    LOG_TRACE("unloadNativeCode_native");
+    LOG_TRACE("terminateNativeCode_native");
     if (handle != 0) {
         NativeCode *code = (NativeCode *)handle;
         delete code;
@@ -695,11 +592,57 @@ static void onStop_native(JNIEnv *env, jobject javaGameActivity, jlong handle) {
     }
 }
 
+static void readConfigurationValues(NativeCode *code, jobject javaConfig) {
+    if (gConfigurationClassInfo.colorMode != NULL) {
+        gConfiguration.colorMode = code->env->GetIntField(
+            javaConfig, gConfigurationClassInfo.colorMode);
+    }
+
+    gConfiguration.densityDpi =
+        code->env->GetIntField(javaConfig, gConfigurationClassInfo.densityDpi);
+    gConfiguration.fontScale =
+        code->env->GetFloatField(javaConfig, gConfigurationClassInfo.fontScale);
+
+    if (gConfigurationClassInfo.fontWeightAdjustment != NULL) {
+        gConfiguration.fontWeightAdjustment = code->env->GetIntField(
+            javaConfig, gConfigurationClassInfo.fontWeightAdjustment);
+    }
+
+    gConfiguration.hardKeyboardHidden = code->env->GetIntField(
+        javaConfig, gConfigurationClassInfo.hardKeyboardHidden);
+    gConfiguration.mcc =
+        code->env->GetIntField(javaConfig, gConfigurationClassInfo.mcc);
+    gConfiguration.mnc =
+        code->env->GetIntField(javaConfig, gConfigurationClassInfo.mnc);
+    gConfiguration.navigation =
+        code->env->GetIntField(javaConfig, gConfigurationClassInfo.navigation);
+    gConfiguration.navigationHidden = code->env->GetIntField(
+        javaConfig, gConfigurationClassInfo.navigationHidden);
+    gConfiguration.orientation =
+        code->env->GetIntField(javaConfig, gConfigurationClassInfo.orientation);
+    gConfiguration.screenHeightDp = code->env->GetIntField(
+        javaConfig, gConfigurationClassInfo.screenHeightDp);
+    gConfiguration.screenLayout = code->env->GetIntField(
+        javaConfig, gConfigurationClassInfo.screenLayout);
+    gConfiguration.screenWidthDp = code->env->GetIntField(
+        javaConfig, gConfigurationClassInfo.screenWidthDp);
+    gConfiguration.smallestScreenWidthDp = code->env->GetIntField(
+        javaConfig, gConfigurationClassInfo.smallestScreenWidthDp);
+    gConfiguration.touchscreen =
+        code->env->GetIntField(javaConfig, gConfigurationClassInfo.touchscreen);
+    gConfiguration.uiMode =
+        code->env->GetIntField(javaConfig, gConfigurationClassInfo.uiMode);
+
+    checkAndClearException(code->env, "Configuration.get");
+}
+
 static void onConfigurationChanged_native(JNIEnv *env, jobject javaGameActivity,
-                                          jlong handle) {
+                                          jlong handle, jobject javaNewConfig) {
     LOG_TRACE("onConfigurationChanged_native");
     if (handle != 0) {
         NativeCode *code = (NativeCode *)handle;
+        readConfigurationValues(code, javaNewConfig);
+
         if (code->callbacks.onConfigurationChanged != NULL) {
             code->callbacks.onConfigurationChanged(code);
         }
@@ -776,8 +719,12 @@ static void onSurfaceChanged_native(JNIEnv *env, jobject javaGameActivity,
             // Maybe it was resized?
             int32_t newWidth = ANativeWindow_getWidth(code->nativeWindow);
             int32_t newHeight = ANativeWindow_getHeight(code->nativeWindow);
+
             if (newWidth != code->lastWindowWidth ||
                 newHeight != code->lastWindowHeight) {
+                code->lastWindowWidth = newWidth;
+                code->lastWindowHeight = newHeight;
+
                 if (code->callbacks.onNativeWindowResized != NULL) {
                     code->callbacks.onNativeWindowResized(
                         code, code->nativeWindow, newWidth, newHeight);
@@ -817,347 +764,84 @@ static void onSurfaceDestroyed_native(JNIEnv *env, jobject javaGameActivity,
     }
 }
 
-static bool enabledAxes[GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT] = {
-    /* AMOTION_EVENT_AXIS_X */ true,
-    /* AMOTION_EVENT_AXIS_Y */ true,
-    // Disable all other axes by default (they can be enabled using
-    // `GameActivityPointerAxes_enableAxis`).
-    false};
-
-extern "C" void GameActivityPointerAxes_enableAxis(int32_t axis) {
-    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
-        return;
-    }
+extern "C" void GameActivity_setImeEditorInfo(GameActivity *activity,
+                                              int inputType, int actionId,
+                                              int imeOptions) {
+    NativeCode *code = static_cast<NativeCode *>(activity);
+    write_work(code->mainWorkWrite, CMD_SET_IME_EDITOR_INFO, inputType,
+               actionId, imeOptions);
+}
 
-    enabledAxes[axis] = true;
+extern "C" int GameActivity_getColorMode(GameActivity *) {
+    return gConfiguration.colorMode;
 }
 
-extern "C" void GameActivityPointerAxes_disableAxis(int32_t axis) {
-    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
-        return;
-    }
+extern "C" int GameActivity_getDensityDpi(GameActivity *) {
+    return gConfiguration.densityDpi;
+}
 
-    enabledAxes[axis] = false;
+extern "C" float GameActivity_getFontScale(GameActivity *) {
+    return gConfiguration.fontScale;
 }
 
-static bool enabledHistoricalAxes[GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT] = {
-    // Disable all axes by default (they can be enabled using
-    // `GameActivityPointerAxes_enableHistoricalAxis`).
-    false};
+extern "C" int GameActivity_getFontWeightAdjustment(GameActivity *) {
+    return gConfiguration.fontWeightAdjustment;
+}
 
-extern "C" void GameActivityHistoricalPointerAxes_enableAxis(int32_t axis) {
-    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
-        return;
-    }
+extern "C" int GameActivity_getHardKeyboardHidden(GameActivity *) {
+    return gConfiguration.hardKeyboardHidden;
+}
 
-    enabledHistoricalAxes[axis] = true;
+extern "C" int GameActivity_getKeyboard(GameActivity *) {
+    return gConfiguration.keyboard;
 }
 
-extern "C" void GameActivityHistoricalPointerAxes_disableAxis(int32_t axis) {
-    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
-        return;
-    }
+extern "C" int GameActivity_getKeyboardHidden(GameActivity *) {
+    return gConfiguration.keyboardHidden;
+}
 
-    enabledHistoricalAxes[axis] = false;
+extern "C" int GameActivity_getMcc(GameActivity *) {
+    return gConfiguration.mcc;
 }
 
-extern "C" void GameActivity_setImeEditorInfo(GameActivity *activity,
-                                              int inputType, int actionId,
-                                              int imeOptions) {
-    JNIEnv *env;
-    if (activity->vm->AttachCurrentThread(&env, NULL) == JNI_OK) {
-        env->CallVoidMethod(activity->javaGameActivity,
-                            gGameActivityClassInfo.setImeEditorInfoFields,
-                            inputType, actionId, imeOptions);
-    }
+extern "C" int GameActivity_getMnc(GameActivity *) {
+    return gConfiguration.mnc;
 }
 
-static struct {
-    jmethodID getDeviceId;
-    jmethodID getSource;
-    jmethodID getAction;
-
-    jmethodID getEventTime;
-    jmethodID getDownTime;
-
-    jmethodID getFlags;
-    jmethodID getMetaState;
-
-    jmethodID getActionButton;
-    jmethodID getButtonState;
-    jmethodID getClassification;
-    jmethodID getEdgeFlags;
-
-    jmethodID getPointerCount;
-    jmethodID getPointerId;
-    jmethodID getToolType;
-    jmethodID getRawX;
-    jmethodID getRawY;
-    jmethodID getXPrecision;
-    jmethodID getYPrecision;
-    jmethodID getAxisValue;
-
-    jmethodID getHistorySize;
-    jmethodID getHistoricalEventTime;
-    jmethodID getHistoricalAxisValue;
-} gMotionEventClassInfo;
-
-extern "C" int GameActivityMotionEvent_fromJava(
-    JNIEnv *env, jobject motionEvent, GameActivityMotionEvent *out_event,
-    GameActivityHistoricalPointerAxes *out_historical) {
-    static bool gMotionEventClassInfoInitialized = false;
-    if (!gMotionEventClassInfoInitialized) {
-        int sdkVersion = GetSystemPropAsInt("ro.build.version.sdk");
-        gMotionEventClassInfo = {0};
-        jclass motionEventClass = env->FindClass("android/view/MotionEvent");
-        gMotionEventClassInfo.getDeviceId =
-            env->GetMethodID(motionEventClass, "getDeviceId", "()I");
-        gMotionEventClassInfo.getSource =
-            env->GetMethodID(motionEventClass, "getSource", "()I");
-        gMotionEventClassInfo.getAction =
-            env->GetMethodID(motionEventClass, "getAction", "()I");
-        gMotionEventClassInfo.getEventTime =
-            env->GetMethodID(motionEventClass, "getEventTime", "()J");
-        gMotionEventClassInfo.getDownTime =
-            env->GetMethodID(motionEventClass, "getDownTime", "()J");
-        gMotionEventClassInfo.getFlags =
-            env->GetMethodID(motionEventClass, "getFlags", "()I");
-        gMotionEventClassInfo.getMetaState =
-            env->GetMethodID(motionEventClass, "getMetaState", "()I");
-        if (sdkVersion >= 23) {
-            gMotionEventClassInfo.getActionButton =
-                env->GetMethodID(motionEventClass, "getActionButton", "()I");
-        }
-        if (sdkVersion >= 14) {
-            gMotionEventClassInfo.getButtonState =
-                env->GetMethodID(motionEventClass, "getButtonState", "()I");
-        }
-        if (sdkVersion >= 29) {
-            gMotionEventClassInfo.getClassification =
-                env->GetMethodID(motionEventClass, "getClassification", "()I");
-        }
-        gMotionEventClassInfo.getEdgeFlags =
-            env->GetMethodID(motionEventClass, "getEdgeFlags", "()I");
-        gMotionEventClassInfo.getPointerCount =
-            env->GetMethodID(motionEventClass, "getPointerCount", "()I");
-        gMotionEventClassInfo.getPointerId =
-            env->GetMethodID(motionEventClass, "getPointerId", "(I)I");
-        gMotionEventClassInfo.getToolType =
-            env->GetMethodID(motionEventClass, "getToolType", "(I)I");
-        if (sdkVersion >= 29) {
-            gMotionEventClassInfo.getRawX =
-                env->GetMethodID(motionEventClass, "getRawX", "(I)F");
-            gMotionEventClassInfo.getRawY =
-                env->GetMethodID(motionEventClass, "getRawY", "(I)F");
-        }
-        gMotionEventClassInfo.getXPrecision =
-            env->GetMethodID(motionEventClass, "getXPrecision", "()F");
-        gMotionEventClassInfo.getYPrecision =
-            env->GetMethodID(motionEventClass, "getYPrecision", "()F");
-        gMotionEventClassInfo.getAxisValue =
-            env->GetMethodID(motionEventClass, "getAxisValue", "(II)F");
-
-        gMotionEventClassInfo.getHistorySize =
-            env->GetMethodID(motionEventClass, "getHistorySize", "()I");
-        gMotionEventClassInfo.getHistoricalEventTime =
-            env->GetMethodID(motionEventClass, "getHistoricalEventTime", "(I)J");
-        gMotionEventClassInfo.getHistoricalAxisValue =
-            env->GetMethodID(motionEventClass, "getHistoricalAxisValue", "(III)F");
-
-        gMotionEventClassInfoInitialized = true;
-    }
+extern "C" int GameActivity_getNavigation(GameActivity *) {
+    return gConfiguration.navigation;
+}
 
-    int historySize =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getHistorySize);
-    historySize =
-        std::min(historySize, GAMEACTIVITY_MAX_NUM_HISTORICAL_IN_MOTION_EVENT);
+extern "C" int GameActivity_getNavigationHidden(GameActivity *) {
+    return gConfiguration.navigationHidden;
+}
 
-    int localEnabledHistoricalAxis[GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT];
-    int enabledHistoricalAxisCount = 0;
+extern "C" int GameActivity_getOrientation(GameActivity *) {
+    return gConfiguration.orientation;
+}
 
-    for (int axisIndex = 0;
-         axisIndex < GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
-         ++axisIndex) {
-        if (enabledHistoricalAxes[axisIndex]) {
-            localEnabledHistoricalAxis[enabledHistoricalAxisCount++] = axisIndex;
-        }
-    }
-    out_event->historicalCount = enabledHistoricalAxisCount == 0 ? 0 : historySize;
-    out_event->historicalStart = 0; // Free for caller to use
-
-    // The historical event times aren't unique per-pointer but for simplicity
-    // we output a per-pointer event time, copied from here...
-    int64_t historicalEventTimes[GAMEACTIVITY_MAX_NUM_HISTORICAL_IN_MOTION_EVENT];
-    for (int histIndex = 0; histIndex < historySize; ++histIndex) {
-        historicalEventTimes[histIndex] =
-            env->CallLongMethod(motionEvent,
-                gMotionEventClassInfo.getHistoricalEventTime, histIndex) *
-                1000000;
-    }
+extern "C" int GameActivity_getScreenHeightDp(GameActivity *) {
+    return gConfiguration.screenHeightDp;
+}
 
-    int pointerCount =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getPointerCount);
-    pointerCount =
-        std::min(pointerCount, GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT);
-    out_event->pointerCount = pointerCount;
-    for (int i = 0; i < pointerCount; ++i) {
-        out_event->pointers[i] = {
-            /*id=*/env->CallIntMethod(motionEvent,
-                                      gMotionEventClassInfo.getPointerId, i),
-            /*toolType=*/env->CallIntMethod(motionEvent,
-                                            gMotionEventClassInfo.getToolType, i),
-            /*axisValues=*/{0},
-            /*rawX=*/gMotionEventClassInfo.getRawX
-                ? env->CallFloatMethod(motionEvent,
-                                       gMotionEventClassInfo.getRawX, i)
-                : 0,
-            /*rawY=*/gMotionEventClassInfo.getRawY
-                ? env->CallFloatMethod(motionEvent,
-                                       gMotionEventClassInfo.getRawY, i)
-                : 0,
-        };
-
-        for (int axisIndex = 0;
-             axisIndex < GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT; ++axisIndex) {
-            if (enabledAxes[axisIndex]) {
-                out_event->pointers[i].axisValues[axisIndex] =
-                    env->CallFloatMethod(motionEvent,
-                                         gMotionEventClassInfo.getAxisValue,
-                                         axisIndex, i);
-            }
-        }
+extern "C" int GameActivity_getScreenLayout(GameActivity *) {
+    return gConfiguration.screenLayout;
+}
 
-        if (enabledHistoricalAxisCount > 0) {
-            for (int histIndex = 0; histIndex < historySize; ++histIndex) {
-                int pointerHistIndex = historySize * i;
-                out_historical[pointerHistIndex].eventTime = historicalEventTimes[histIndex];
-                for (int c = 0; c < enabledHistoricalAxisCount; ++c) {
-                    int axisIndex = localEnabledHistoricalAxis[c];
-                    out_historical[pointerHistIndex].axisValues[axisIndex] =
-                        env->CallFloatMethod(motionEvent,
-                                             gMotionEventClassInfo.getHistoricalAxisValue,
-                                             axisIndex, i, histIndex);
-                }
-            }
-        }
-    }
+extern "C" int GameActivity_getScreenWidthDp(GameActivity *) {
+    return gConfiguration.screenWidthDp;
+}
 
-    out_event->deviceId =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getDeviceId);
-    out_event->source =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getSource);
-    out_event->action =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getAction);
-    out_event->eventTime =
-        env->CallLongMethod(motionEvent, gMotionEventClassInfo.getEventTime) *
-        1000000;
-    out_event->downTime =
-        env->CallLongMethod(motionEvent, gMotionEventClassInfo.getDownTime) *
-        1000000;
-    out_event->flags =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getFlags);
-    out_event->metaState =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getMetaState);
-    out_event->actionButton =
-        gMotionEventClassInfo.getActionButton
-            ? env->CallIntMethod(motionEvent,
-                                 gMotionEventClassInfo.getActionButton)
-            : 0;
-    out_event->buttonState =
-        gMotionEventClassInfo.getButtonState
-            ? env->CallIntMethod(motionEvent,
-                                 gMotionEventClassInfo.getButtonState)
-            : 0;
-    out_event->classification =
-        gMotionEventClassInfo.getClassification
-            ? env->CallIntMethod(motionEvent,
-                                 gMotionEventClassInfo.getClassification)
-            : 0;
-    out_event->edgeFlags =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getEdgeFlags);
-    out_event->precisionX =
-        env->CallFloatMethod(motionEvent, gMotionEventClassInfo.getXPrecision);
-    out_event->precisionY =
-        env->CallFloatMethod(motionEvent, gMotionEventClassInfo.getYPrecision);
-
-    return out_event->pointerCount * out_event->historicalCount;
+extern "C" int GameActivity_getSmallestScreenWidthDp(GameActivity *) {
+    return gConfiguration.smallestScreenWidthDp;
 }
 
-static struct {
-    jmethodID getDeviceId;
-    jmethodID getSource;
-    jmethodID getAction;
-
-    jmethodID getEventTime;
-    jmethodID getDownTime;
-
-    jmethodID getFlags;
-    jmethodID getMetaState;
-
-    jmethodID getModifiers;
-    jmethodID getRepeatCount;
-    jmethodID getKeyCode;
-    jmethodID getScanCode;
-} gKeyEventClassInfo;
-
-extern "C" void GameActivityKeyEvent_fromJava(JNIEnv *env, jobject keyEvent,
-                                              GameActivityKeyEvent *out_event) {
-    static bool gKeyEventClassInfoInitialized = false;
-    if (!gKeyEventClassInfoInitialized) {
-        int sdkVersion = GetSystemPropAsInt("ro.build.version.sdk");
-        gKeyEventClassInfo = {0};
-        jclass keyEventClass = env->FindClass("android/view/KeyEvent");
-        gKeyEventClassInfo.getDeviceId =
-            env->GetMethodID(keyEventClass, "getDeviceId", "()I");
-        gKeyEventClassInfo.getSource =
-            env->GetMethodID(keyEventClass, "getSource", "()I");
-        gKeyEventClassInfo.getAction =
-            env->GetMethodID(keyEventClass, "getAction", "()I");
-        gKeyEventClassInfo.getEventTime =
-            env->GetMethodID(keyEventClass, "getEventTime", "()J");
-        gKeyEventClassInfo.getDownTime =
-            env->GetMethodID(keyEventClass, "getDownTime", "()J");
-        gKeyEventClassInfo.getFlags =
-            env->GetMethodID(keyEventClass, "getFlags", "()I");
-        gKeyEventClassInfo.getMetaState =
-            env->GetMethodID(keyEventClass, "getMetaState", "()I");
-        if (sdkVersion >= 13) {
-            gKeyEventClassInfo.getModifiers =
-                env->GetMethodID(keyEventClass, "getModifiers", "()I");
-        }
-        gKeyEventClassInfo.getRepeatCount =
-            env->GetMethodID(keyEventClass, "getRepeatCount", "()I");
-        gKeyEventClassInfo.getKeyCode =
-            env->GetMethodID(keyEventClass, "getKeyCode", "()I");
-        gKeyEventClassInfo.getScanCode =
-            env->GetMethodID(keyEventClass, "getScanCode", "()I");
-
-        gKeyEventClassInfoInitialized = true;
-    }
+extern "C" int GameActivity_getTouchscreen(GameActivity *) {
+    return gConfiguration.touchscreen;
+}
 
-    *out_event = {
-        /*deviceId=*/env->CallIntMethod(keyEvent,
-                                        gKeyEventClassInfo.getDeviceId),
-        /*source=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getSource),
-        /*action=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getAction),
-        // TODO: introduce a millisecondsToNanoseconds helper:
-        /*eventTime=*/
-        env->CallLongMethod(keyEvent, gKeyEventClassInfo.getEventTime) *
-            1000000,
-        /*downTime=*/
-        env->CallLongMethod(keyEvent, gKeyEventClassInfo.getDownTime) * 1000000,
-        /*flags=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getFlags),
-        /*metaState=*/
-        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getMetaState),
-        /*modifiers=*/gKeyEventClassInfo.getModifiers
-            ? env->CallIntMethod(keyEvent, gKeyEventClassInfo.getModifiers)
-            : 0,
-        /*repeatCount=*/
-        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getRepeatCount),
-        /*keyCode=*/
-        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getKeyCode),
-        /*scanCode=*/
-        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getScanCode)};
+extern "C" int GameActivity_getUIMode(GameActivity *) {
+    return gConfiguration.uiMode;
 }
 
 static bool onTouchEvent_native(JNIEnv *env, jobject javaGameActivity,
@@ -1167,11 +851,9 @@ static bool onTouchEvent_native(JNIEnv *env, jobject javaGameActivity,
     if (code->callbacks.onTouchEvent == nullptr) return false;
 
     static GameActivityMotionEvent c_event;
-    // Note the actual data is written contiguously as numPointers x historySize
-    // entries.
-    static GameActivityHistoricalPointerAxes historical[GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT * GAMEACTIVITY_MAX_NUM_HISTORICAL_IN_MOTION_EVENT];
-    int historicalLen = GameActivityMotionEvent_fromJava(env, motionEvent, &c_event, historical);
-    return code->callbacks.onTouchEvent(code, &c_event, historical, historicalLen);
+    GameActivityMotionEvent_fromJava(env, motionEvent, &c_event);
+    return code->callbacks.onTouchEvent(code, &c_event);
+
 }
 
 static bool onKeyUp_native(JNIEnv *env, jobject javaGameActivity, jlong handle,
@@ -1247,19 +929,37 @@ static void setInputConnection_native(JNIEnv *env, jobject activity,
     GameTextInput_setInputConnection(code->gameTextInput, inputConnection);
 }
 
+static void onContentRectChangedNative_native(JNIEnv *env, jobject activity,
+                                              jlong handle, jint x, jint y,
+                                              jint w, jint h) {
+    if (handle != 0) {
+        NativeCode *code = (NativeCode *)handle;
+
+        if (code->callbacks.onContentRectChanged != nullptr) {
+            ARect rect;
+            rect.left = x;
+            rect.top = y;
+            rect.right = x+w;
+            rect.bottom = y+h;
+            code->callbacks.onContentRectChanged(code, &rect);
+        }
+    }
+}
+
 static const JNINativeMethod g_methods[] = {
-    {"loadNativeCode",
-     "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/"
-     "String;Ljava/lang/String;Landroid/content/res/AssetManager;[B)J",
-     (void *)loadNativeCode_native},
+    {"initializeNativeCode",
+     "(Ljava/lang/String;Ljava/lang/String;"
+     "Ljava/lang/String;Landroid/content/res/AssetManager;"
+     "[BLandroid/content/res/Configuration;)J",
+     (void *)initializeNativeCode_native},
     {"getDlError", "()Ljava/lang/String;", (void *)getDlError_native},
-    {"unloadNativeCode", "(J)V", (void *)unloadNativeCode_native},
+    {"terminateNativeCode", "(J)V", (void *)terminateNativeCode_native},
     {"onStartNative", "(J)V", (void *)onStart_native},
     {"onResumeNative", "(J)V", (void *)onResume_native},
     {"onSaveInstanceStateNative", "(J)[B", (void *)onSaveInstanceState_native},
     {"onPauseNative", "(J)V", (void *)onPause_native},
     {"onStopNative", "(J)V", (void *)onStop_native},
-    {"onConfigurationChangedNative", "(J)V",
+    {"onConfigurationChangedNative", "(JLandroid/content/res/Configuration;)V",
      (void *)onConfigurationChanged_native},
     {"onTrimMemoryNative", "(JI)V", (void *)onTrimMemory_native},
     {"onWindowFocusChangedNative", "(JZ)V",
@@ -1284,13 +984,16 @@ static const JNINativeMethod g_methods[] = {
     {"setInputConnectionNative",
      "(JLcom/google/androidgamesdk/gametextinput/InputConnection;)V",
      (void *)setInputConnection_native},
+    {"onContentRectChangedNative", "(JIIII)V",
+     (void *)onContentRectChangedNative_native},
 };
 
 static const char *const kGameActivityPathName =
     "com/google/androidgamesdk/GameActivity";
 
 static const char *const kInsetsPathName = "androidx/core/graphics/Insets";
-
+static const char *const kConfigurationPathName =
+    "android/content/res/Configuration";
 static const char *const kWindowInsetsCompatTypePathName =
     "androidx/core/view/WindowInsetsCompat$Type";
 
@@ -1348,12 +1051,59 @@ extern "C" int GameActivity_register(JNIEnv *env) {
                   "getWaterfallInsets", "()Landroidx/core/graphics/Insets;");
     GET_METHOD_ID(gGameActivityClassInfo.setImeEditorInfoFields, activity_class,
                   "setImeEditorInfoFields", "(III)V");
+
     jclass insets_class;
     FIND_CLASS(insets_class, kInsetsPathName);
     GET_FIELD_ID(gInsetsClassInfo.left, insets_class, "left", "I");
     GET_FIELD_ID(gInsetsClassInfo.right, insets_class, "right", "I");
     GET_FIELD_ID(gInsetsClassInfo.top, insets_class, "top", "I");
     GET_FIELD_ID(gInsetsClassInfo.bottom, insets_class, "bottom", "I");
+
+    jclass configuration_class;
+    FIND_CLASS(configuration_class, kConfigurationPathName);
+
+    if (android_get_device_api_level() >= 26) {
+        GET_FIELD_ID(gConfigurationClassInfo.colorMode, configuration_class,
+                     "colorMode", "I");
+    }
+
+    GET_FIELD_ID(gConfigurationClassInfo.densityDpi, configuration_class,
+                 "densityDpi", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.fontScale, configuration_class,
+                 "fontScale", "F");
+
+    if (android_get_device_api_level() >= 31) {
+        GET_FIELD_ID(gConfigurationClassInfo.fontWeightAdjustment,
+                     configuration_class, "fontWeightAdjustment", "I");
+    }
+
+    GET_FIELD_ID(gConfigurationClassInfo.hardKeyboardHidden,
+                 configuration_class, "hardKeyboardHidden", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.keyboard, configuration_class,
+                 "keyboard", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.keyboardHidden, configuration_class,
+                 "keyboardHidden", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.mcc, configuration_class, "mcc", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.mnc, configuration_class, "mnc", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.navigation, configuration_class,
+                 "navigation", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.navigationHidden, configuration_class,
+                 "navigationHidden", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.orientation, configuration_class,
+                 "orientation", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.screenHeightDp, configuration_class,
+                 "screenHeightDp", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.screenLayout, configuration_class,
+                 "screenLayout", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.screenWidthDp, configuration_class,
+                 "screenWidthDp", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.smallestScreenWidthDp,
+                 configuration_class, "smallestScreenWidthDp", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.touchscreen, configuration_class,
+                 "touchscreen", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.uiMode, configuration_class, "uiMode",
+                 "I");
+
     jclass windowInsetsCompatType_class;
     FIND_CLASS(windowInsetsCompatType_class, kWindowInsetsCompatTypePathName);
     gWindowInsetsCompatTypeClassInfo.clazz =
@@ -1380,19 +1130,14 @@ extern "C" int GameActivity_register(JNIEnv *env) {
                                     NELEM(g_methods));
 }
 
-// XXX: This symbol is renamed with a _C suffix and then re-exported from
-// Rust because Rust/Cargo don't give us a way to directly export symbols
-// from C/C++ code: https://github.com/rust-lang/rfcs/issues/2771
-//
-// Register this method so that GameActiviy_register does not need to be called
-// manually.
-extern "C" jlong Java_com_google_androidgamesdk_GameActivity_loadNativeCode_C(
-    JNIEnv *env, jobject javaGameActivity, jstring path, jstring funcName,
-    jstring internalDataDir, jstring obbDir, jstring externalDataDir,
-    jobject jAssetMgr, jbyteArray savedState) {
+extern "C" JNIEXPORT jlong JNICALL
+Java_com_google_androidgamesdk_GameActivity_initializeNativeCode(
+    JNIEnv *env, jobject javaGameActivity, jstring internalDataDir,
+    jstring obbDir, jstring externalDataDir, jobject jAssetMgr,
+    jbyteArray savedState, jobject javaConfig) {
     GameActivity_register(env);
-    jlong nativeCode = loadNativeCode_native(
-        env, javaGameActivity, path, funcName, internalDataDir, obbDir,
-        externalDataDir, jAssetMgr, savedState);
+    jlong nativeCode = initializeNativeCode_native(
+        env, javaGameActivity, internalDataDir, obbDir, externalDataDir,
+        jAssetMgr, savedState, javaConfig);
     return nativeCode;
 }
diff --git a/android-activity/game-activity-csrc/game-activity/GameActivity.h b/android-activity/game-activity-csrc/game-activity/GameActivity.h
index c5abfc0..702f754 100644
--- a/android-activity/game-activity-csrc/game-activity/GameActivity.h
+++ b/android-activity/game-activity-csrc/game-activity/GameActivity.h
@@ -36,12 +36,22 @@
 #include <stdint.h>
 #include <sys/types.h>
 
+#include "common/gamesdk_common.h"
+#include "game-activity/GameActivityEvents.h"
 #include "game-text-input/gametextinput.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define GAMEACTIVITY_MAJOR_VERSION 2
+#define GAMEACTIVITY_MINOR_VERSION 0
+#define GAMEACTIVITY_BUGFIX_VERSION 2
+#define GAMEACTIVITY_PACKED_VERSION                            \
+    ANDROID_GAMESDK_PACKED_VERSION(GAMEACTIVITY_MAJOR_VERSION, \
+                                   GAMEACTIVITY_MINOR_VERSION, \
+                                   GAMEACTIVITY_BUGFIX_VERSION)
+
 /**
  * {@link GameActivityCallbacks}
  */
@@ -115,199 +125,6 @@ typedef struct GameActivity {
     const char* obbPath;
 } GameActivity;
 
-/**
- * The maximum number of axes supported in an Android MotionEvent.
- * See https://developer.android.com/ndk/reference/group/input.
- */
-#define GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT 48
-
-/**
- * \brief Describe information about a pointer, found in a
- * GameActivityMotionEvent.
- *
- * You can read values directly from this structure, or use helper functions
- * (`GameActivityPointerAxes_getX`, `GameActivityPointerAxes_getY` and
- * `GameActivityPointerAxes_getAxisValue`).
- *
- * The X axis and Y axis are enabled by default but any other axis that you want
- * to read **must** be enabled first, using
- * `GameActivityPointerAxes_enableAxis`.
- *
- * \see GameActivityMotionEvent
- */
-typedef struct GameActivityPointerAxes {
-    int32_t id;
-    int32_t toolType;
-    float axisValues[GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT];
-    float rawX;
-    float rawY;
-} GameActivityPointerAxes;
-
-typedef struct GameActivityHistoricalPointerAxes {
-    int64_t eventTime;
-    float axisValues[GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT];
-} GameActivityHistoricalPointerAxes;
-
-/** \brief Get the current X coordinate of the pointer. */
-inline float GameActivityPointerAxes_getX(
-    const GameActivityPointerAxes* pointerInfo) {
-    return pointerInfo->axisValues[AMOTION_EVENT_AXIS_X];
-}
-
-/** \brief Get the current Y coordinate of the pointer. */
-inline float GameActivityPointerAxes_getY(
-    const GameActivityPointerAxes* pointerInfo) {
-    return pointerInfo->axisValues[AMOTION_EVENT_AXIS_Y];
-}
-
-/**
- * \brief Enable the specified axis, so that its value is reported in the
- * GameActivityPointerAxes structures stored in a motion event.
- *
- * You must enable any axis that you want to read, apart from
- * `AMOTION_EVENT_AXIS_X` and `AMOTION_EVENT_AXIS_Y` that are enabled by
- * default.
- *
- * If the axis index is out of range, nothing is done.
- */
-void GameActivityPointerAxes_enableAxis(int32_t axis);
-
-/**
- * \brief Disable the specified axis. Its value won't be reported in the
- * GameActivityPointerAxes structures stored in a motion event anymore.
- *
- * Apart from X and Y, any axis that you want to read **must** be enabled first,
- * using `GameActivityPointerAxes_enableAxis`.
- *
- * If the axis index is out of range, nothing is done.
- */
-void GameActivityPointerAxes_disableAxis(int32_t axis);
-
-/**
- * \brief Enable the specified axis, so that its value is reported in the
- * GameActivityHistoricalPointerAxes structures associated with a motion event.
- *
- * You must enable any axis that you want to read (no axes are enabled by
- * default).
- *
- * If the axis index is out of range, nothing is done.
- */
-void GameActivityHistoricalPointerAxes_enableAxis(int32_t axis);
-
-/**
- * \brief Disable the specified axis. Its value won't be reported in the
- * GameActivityHistoricalPointerAxes structures associated with motion events
- * anymore.
- *
- * If the axis index is out of range, nothing is done.
- */
-void GameActivityHistoricalPointerAxes_disableAxis(int32_t axis);
-
-/**
- * \brief Get the value of the requested axis.
- *
- * Apart from X and Y, any axis that you want to read **must** be enabled first,
- * using `GameActivityPointerAxes_enableAxis`.
- *
- * Find the valid enums for the axis (`AMOTION_EVENT_AXIS_X`,
- * `AMOTION_EVENT_AXIS_Y`, `AMOTION_EVENT_AXIS_PRESSURE`...)
- * in https://developer.android.com/ndk/reference/group/input.
- *
- * @param pointerInfo The structure containing information about the pointer,
- * obtained from GameActivityMotionEvent.
- * @param axis The axis to get the value from
- * @return The value of the axis, or 0 if the axis is invalid or was not
- * enabled.
- */
-inline float GameActivityPointerAxes_getAxisValue(
-    GameActivityPointerAxes* pointerInfo, int32_t axis) {
-    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
-        return 0;
-    }
-
-    return pointerInfo->axisValues[axis];
-}
-
-/**
- * The maximum number of pointers returned inside a motion event.
- */
-#if (defined GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT_OVERRIDE)
-#define GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT \
-    GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT_OVERRIDE
-#else
-#define GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT 8
-#endif
-
-/**
- * The maximum number of historic samples associated with a single motion event.
- */
-#if (defined GAMEACTIVITY_MAX_NUM_HISTORICAL_IN_MOTION_EVENT_OVERRIDE)
-#define GAMEACTIVITY_MAX_NUM_HISTORICAL_IN_MOTION_EVENT \
-    GAMEACTIVITY_MAX_NUM_HISTORICAL_IN_MOTION_EVENT_OVERRIDE
-#else
-#define GAMEACTIVITY_MAX_NUM_HISTORICAL_IN_MOTION_EVENT 8
-#endif
-
-/**
- * \brief Describe a motion event that happened on the GameActivity SurfaceView.
- *
- * This is 1:1 mapping to the information contained in a Java `MotionEvent`
- * (see https://developer.android.com/reference/android/view/MotionEvent).
- */
-typedef struct GameActivityMotionEvent {
-    int32_t deviceId;
-    int32_t source;
-    int32_t action;
-
-    int64_t eventTime;
-    int64_t downTime;
-
-    int32_t flags;
-    int32_t metaState;
-
-    int32_t actionButton;
-    int32_t buttonState;
-    int32_t classification;
-    int32_t edgeFlags;
-
-    uint32_t pointerCount;
-    GameActivityPointerAxes
-        pointers[GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT];
-
-    float precisionX;
-    float precisionY;
-
-    int16_t historicalStart;
-
-    // Note the actual buffer of historical data has a length of
-    // pointerCount * historicalCount, since the historical axis
-    // data is per-pointer.
-    int16_t historicalCount;
-} GameActivityMotionEvent;
-
-/**
- * \brief Describe a key event that happened on the GameActivity SurfaceView.
- *
- * This is 1:1 mapping to the information contained in a Java `KeyEvent`
- * (see https://developer.android.com/reference/android/view/KeyEvent).
- */
-typedef struct GameActivityKeyEvent {
-    int32_t deviceId;
-    int32_t source;
-    int32_t action;
-
-    int64_t eventTime;
-    int64_t downTime;
-
-    int32_t flags;
-    int32_t metaState;
-
-    int32_t modifiers;
-    int32_t repeatCount;
-    int32_t keyCode;
-    int32_t scanCode;
-} GameActivityKeyEvent;
-
 /**
  * A function the user should call from their callback with the data, its length
  * and the library- supplied context.
@@ -424,9 +241,7 @@ typedef struct GameActivityCallbacks {
      * only valid during the callback.
      */
     bool (*onTouchEvent)(GameActivity* activity,
-                         const GameActivityMotionEvent* event,
-                         const GameActivityHistoricalPointerAxes* historical,
-                         int historicalLen);
+                         const GameActivityMotionEvent* event);
 
     /**
      * Callback called for every key down event on the GameActivity SurfaceView.
@@ -456,36 +271,13 @@ typedef struct GameActivityCallbacks {
      * Call GameActivity_getWindowInsets to retrieve the insets themselves.
      */
     void (*onWindowInsetsChanged)(GameActivity* activity);
-} GameActivityCallbacks;
 
-/**
- * \brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`.
- *
- * This is done automatically by the GameActivity: see `onTouchEvent` to set
- * a callback to consume the received events.
- * This function can be used if you re-implement events handling in your own
- * activity. On return, the out_event->historicalStart will be zero, and should
- * be updated to index into whatever buffer out_historical is copied.
- * On return the length of out_historical is
- * (out_event->pointerCount x out_event->historicalCount) and is in a
- * pointer-major order (i.e. all axis for a pointer are contiguous)
- * Ownership of out_event is maintained by the caller.
- */
-int GameActivityMotionEvent_fromJava(JNIEnv* env, jobject motionEvent,
-                                     GameActivityMotionEvent* out_event,
-                                     GameActivityHistoricalPointerAxes *out_historical);
-
-/**
- * \brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.
- *
- * This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`
- * to set a callback to consume the received events.
- * This function can be used if you re-implement events handling in your own
- * activity.
- * Ownership of out_event is maintained by the caller.
- */
-void GameActivityKeyEvent_fromJava(JNIEnv* env, jobject motionEvent,
-                                   GameActivityKeyEvent* out_event);
+    /**
+     * Callback called when the rectangle in the window where the content
+     * should be placed has changed.
+     */
+    void (*onContentRectChanged)(GameActivity *activity, const ARect *rect);
+} GameActivityCallbacks;
 
 /**
  * This is the function that must be in the native code to instantiate the
@@ -811,6 +603,30 @@ void GameActivity_getWindowInsets(GameActivity* activity,
 void GameActivity_setImeEditorInfo(GameActivity* activity, int inputType,
                                    int actionId, int imeOptions);
 
+/**
+ * These are getters for Configuration class members. They may be called from
+ * any thread.
+ */
+int GameActivity_getOrientation(GameActivity* activity);
+int GameActivity_getColorMode(GameActivity* activity);
+int GameActivity_getDensityDpi(GameActivity* activity);
+float GameActivity_getFontScale(GameActivity* activity);
+int GameActivity_getFontWeightAdjustment(GameActivity* activity);
+int GameActivity_getHardKeyboardHidden(GameActivity* activity);
+int GameActivity_getKeyboard(GameActivity* activity);
+int GameActivity_getKeyboardHidden(GameActivity* activity);
+int GameActivity_getMcc(GameActivity* activity);
+int GameActivity_getMnc(GameActivity* activity);
+int GameActivity_getNavigation(GameActivity* activity);
+int GameActivity_getNavigationHidden(GameActivity* activity);
+int GameActivity_getOrientation(GameActivity* activity);
+int GameActivity_getScreenHeightDp(GameActivity* activity);
+int GameActivity_getScreenLayout(GameActivity* activity);
+int GameActivity_getScreenWidthDp(GameActivity* activity);
+int GameActivity_getSmallestScreenWidthDp(GameActivity* activity);
+int GameActivity_getTouchscreen(GameActivity* activity);
+int GameActivity_getUIMode(GameActivity* activity);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/android-activity/game-activity-csrc/game-activity/GameActivityEvents.cpp b/android-activity/game-activity-csrc/game-activity/GameActivityEvents.cpp
new file mode 100644
index 0000000..4142601
--- /dev/null
+++ b/android-activity/game-activity-csrc/game-activity/GameActivityEvents.cpp
@@ -0,0 +1,413 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "GameActivityEvents.h"
+
+#include <sys/system_properties.h>
+
+#include <string>
+
+#include "GameActivityLog.h"
+
+// TODO(b/187147166): these functions were extracted from the Game SDK
+// (gamesdk/src/common/system_utils.h). system_utils.h/cpp should be used
+// instead.
+namespace {
+
+std::string getSystemPropViaGet(const char *key,
+                                const char *default_value = "") {
+    char buffer[PROP_VALUE_MAX + 1] = "";  // +1 for terminator
+    int bufferLen = __system_property_get(key, buffer);
+    if (bufferLen > 0)
+        return buffer;
+    else
+        return "";
+}
+
+std::string GetSystemProp(const char *key, const char *default_value = "") {
+    return getSystemPropViaGet(key, default_value);
+}
+
+int GetSystemPropAsInt(const char *key, int default_value = 0) {
+    std::string prop = GetSystemProp(key);
+    return prop == "" ? default_value : strtoll(prop.c_str(), nullptr, 10);
+}
+
+}  // anonymous namespace
+
+#ifndef NELEM
+#define NELEM(x) ((int)(sizeof(x) / sizeof((x)[0])))
+#endif
+
+static bool enabledAxes[GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT] = {
+    /* AMOTION_EVENT_AXIS_X */ true,
+    /* AMOTION_EVENT_AXIS_Y */ true,
+    // Disable all other axes by default (they can be enabled using
+    // `GameActivityPointerAxes_enableAxis`).
+    false};
+
+extern "C" void GameActivityPointerAxes_enableAxis(int32_t axis) {
+    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
+        return;
+    }
+
+    enabledAxes[axis] = true;
+}
+
+float GameActivityPointerAxes_getAxisValue(
+    const GameActivityPointerAxes *pointerInfo, int32_t axis) {
+    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
+        return 0;
+    }
+
+    if (!enabledAxes[axis]) {
+        ALOGW("Axis %d must be enabled before it can be accessed.", axis);
+        return 0;
+    }
+
+    return pointerInfo->axisValues[axis];
+}
+
+extern "C" void GameActivityPointerAxes_disableAxis(int32_t axis) {
+    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
+        return;
+    }
+
+    enabledAxes[axis] = false;
+}
+
+float GameActivityMotionEvent_getHistoricalAxisValue(
+    const GameActivityMotionEvent *event, int axis, int pointerIndex,
+    int historyPos) {
+    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
+        ALOGE("Invalid axis %d", axis);
+        return -1;
+    }
+    if (pointerIndex < 0 || pointerIndex >= event->pointerCount) {
+        ALOGE("Invalid pointer index %d", pointerIndex);
+        return -1;
+    }
+    if (historyPos < 0 || historyPos >= event->historySize) {
+        ALOGE("Invalid history index %d", historyPos);
+        return -1;
+    }
+    if (!enabledAxes[axis]) {
+        ALOGW("Axis %d must be enabled before it can be accessed.", axis);
+        return 0;
+    }
+
+    int pointerOffset = pointerIndex * GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+    int historyValuesOffset = historyPos * event->pointerCount *
+                              GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+    return event
+        ->historicalAxisValues[historyValuesOffset + pointerOffset + axis];
+}
+
+static struct {
+    jmethodID getDeviceId;
+    jmethodID getSource;
+    jmethodID getAction;
+
+    jmethodID getEventTime;
+    jmethodID getDownTime;
+
+    jmethodID getFlags;
+    jmethodID getMetaState;
+
+    jmethodID getActionButton;
+    jmethodID getButtonState;
+    jmethodID getClassification;
+    jmethodID getEdgeFlags;
+
+    jmethodID getHistorySize;
+    jmethodID getHistoricalEventTime;
+
+    jmethodID getPointerCount;
+    jmethodID getPointerId;
+
+    jmethodID getToolType;
+
+    jmethodID getRawX;
+    jmethodID getRawY;
+    jmethodID getXPrecision;
+    jmethodID getYPrecision;
+    jmethodID getAxisValue;
+
+    jmethodID getHistoricalAxisValue;
+} gMotionEventClassInfo;
+
+extern "C" void GameActivityMotionEvent_destroy(
+    GameActivityMotionEvent *c_event) {
+    delete c_event->historicalAxisValues;
+    delete c_event->historicalEventTimesMillis;
+    delete c_event->historicalEventTimesNanos;
+}
+
+extern "C" void GameActivityMotionEvent_fromJava(
+    JNIEnv *env, jobject motionEvent, GameActivityMotionEvent *out_event) {
+    static bool gMotionEventClassInfoInitialized = false;
+    if (!gMotionEventClassInfoInitialized) {
+        int sdkVersion = GetSystemPropAsInt("ro.build.version.sdk");
+        gMotionEventClassInfo = {0};
+        jclass motionEventClass = env->FindClass("android/view/MotionEvent");
+        gMotionEventClassInfo.getDeviceId =
+            env->GetMethodID(motionEventClass, "getDeviceId", "()I");
+        gMotionEventClassInfo.getSource =
+            env->GetMethodID(motionEventClass, "getSource", "()I");
+        gMotionEventClassInfo.getAction =
+            env->GetMethodID(motionEventClass, "getAction", "()I");
+        gMotionEventClassInfo.getEventTime =
+            env->GetMethodID(motionEventClass, "getEventTime", "()J");
+        gMotionEventClassInfo.getDownTime =
+            env->GetMethodID(motionEventClass, "getDownTime", "()J");
+        gMotionEventClassInfo.getFlags =
+            env->GetMethodID(motionEventClass, "getFlags", "()I");
+        gMotionEventClassInfo.getMetaState =
+            env->GetMethodID(motionEventClass, "getMetaState", "()I");
+        if (sdkVersion >= 23) {
+            gMotionEventClassInfo.getActionButton =
+                env->GetMethodID(motionEventClass, "getActionButton", "()I");
+        }
+        if (sdkVersion >= 14) {
+            gMotionEventClassInfo.getButtonState =
+                env->GetMethodID(motionEventClass, "getButtonState", "()I");
+        }
+        if (sdkVersion >= 29) {
+            gMotionEventClassInfo.getClassification =
+                env->GetMethodID(motionEventClass, "getClassification", "()I");
+        }
+        gMotionEventClassInfo.getEdgeFlags =
+            env->GetMethodID(motionEventClass, "getEdgeFlags", "()I");
+
+        gMotionEventClassInfo.getHistorySize =
+            env->GetMethodID(motionEventClass, "getHistorySize", "()I");
+        gMotionEventClassInfo.getHistoricalEventTime = env->GetMethodID(
+            motionEventClass, "getHistoricalEventTime", "(I)J");
+
+        gMotionEventClassInfo.getPointerCount =
+            env->GetMethodID(motionEventClass, "getPointerCount", "()I");
+        gMotionEventClassInfo.getPointerId =
+            env->GetMethodID(motionEventClass, "getPointerId", "(I)I");
+        gMotionEventClassInfo.getToolType =
+            env->GetMethodID(motionEventClass, "getToolType", "(I)I");
+        if (sdkVersion >= 29) {
+            gMotionEventClassInfo.getRawX =
+                env->GetMethodID(motionEventClass, "getRawX", "(I)F");
+            gMotionEventClassInfo.getRawY =
+                env->GetMethodID(motionEventClass, "getRawY", "(I)F");
+        }
+        gMotionEventClassInfo.getXPrecision =
+            env->GetMethodID(motionEventClass, "getXPrecision", "()F");
+        gMotionEventClassInfo.getYPrecision =
+            env->GetMethodID(motionEventClass, "getYPrecision", "()F");
+        gMotionEventClassInfo.getAxisValue =
+            env->GetMethodID(motionEventClass, "getAxisValue", "(II)F");
+
+        gMotionEventClassInfo.getHistoricalAxisValue = env->GetMethodID(
+            motionEventClass, "getHistoricalAxisValue", "(III)F");
+        gMotionEventClassInfoInitialized = true;
+    }
+
+    int pointerCount =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getPointerCount);
+    pointerCount =
+        std::min(pointerCount, GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT);
+    out_event->pointerCount = pointerCount;
+    for (int i = 0; i < pointerCount; ++i) {
+        out_event->pointers[i] = {
+            /*id=*/env->CallIntMethod(motionEvent,
+                                      gMotionEventClassInfo.getPointerId, i),
+            /*toolType=*/
+            env->CallIntMethod(motionEvent, gMotionEventClassInfo.getToolType,
+                               i),
+            /*axisValues=*/{0},
+            /*rawX=*/gMotionEventClassInfo.getRawX
+                ? env->CallFloatMethod(motionEvent,
+                                       gMotionEventClassInfo.getRawX, i)
+                : 0,
+            /*rawY=*/gMotionEventClassInfo.getRawY
+                ? env->CallFloatMethod(motionEvent,
+                                       gMotionEventClassInfo.getRawY, i)
+                : 0,
+        };
+
+        for (int axisIndex = 0;
+             axisIndex < GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT; ++axisIndex) {
+            if (enabledAxes[axisIndex]) {
+                out_event->pointers[i].axisValues[axisIndex] =
+                    env->CallFloatMethod(motionEvent,
+                                         gMotionEventClassInfo.getAxisValue,
+                                         axisIndex, i);
+            }
+        }
+    }
+
+    int historySize =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getHistorySize);
+    out_event->historySize = historySize;
+    out_event->historicalAxisValues =
+        new float[historySize * pointerCount *
+                  GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT];
+    out_event->historicalEventTimesMillis = new int64_t[historySize];
+    out_event->historicalEventTimesNanos = new int64_t[historySize];
+
+    for (int historyIndex = 0; historyIndex < historySize; historyIndex++) {
+        out_event->historicalEventTimesMillis[historyIndex] =
+            env->CallLongMethod(motionEvent,
+                                gMotionEventClassInfo.getHistoricalEventTime,
+                                historyIndex);
+        out_event->historicalEventTimesNanos[historyIndex] =
+            out_event->historicalEventTimesMillis[historyIndex] * 1000000;
+        for (int i = 0; i < pointerCount; ++i) {
+            int pointerOffset = i * GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+            int historyAxisOffset = historyIndex * pointerCount *
+                                    GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+            float *axisValues =
+                &out_event
+                     ->historicalAxisValues[historyAxisOffset + pointerOffset];
+            for (int axisIndex = 0;
+                 axisIndex < GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+                 ++axisIndex) {
+                if (enabledAxes[axisIndex]) {
+                    axisValues[axisIndex] = env->CallFloatMethod(
+                        motionEvent,
+                        gMotionEventClassInfo.getHistoricalAxisValue, axisIndex,
+                        i, historyIndex);
+                }
+            }
+        }
+    }
+
+    out_event->deviceId =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getDeviceId);
+    out_event->source =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getSource);
+    out_event->action =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getAction);
+    out_event->eventTime =
+        env->CallLongMethod(motionEvent, gMotionEventClassInfo.getEventTime) *
+        1000000;
+    out_event->downTime =
+        env->CallLongMethod(motionEvent, gMotionEventClassInfo.getDownTime) *
+        1000000;
+    out_event->flags =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getFlags);
+    out_event->metaState =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getMetaState);
+    out_event->actionButton =
+        gMotionEventClassInfo.getActionButton
+            ? env->CallIntMethod(motionEvent,
+                                 gMotionEventClassInfo.getActionButton)
+            : 0;
+    out_event->buttonState =
+        gMotionEventClassInfo.getButtonState
+            ? env->CallIntMethod(motionEvent,
+                                 gMotionEventClassInfo.getButtonState)
+            : 0;
+    out_event->classification =
+        gMotionEventClassInfo.getClassification
+            ? env->CallIntMethod(motionEvent,
+                                 gMotionEventClassInfo.getClassification)
+            : 0;
+    out_event->edgeFlags =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getEdgeFlags);
+    out_event->precisionX =
+        env->CallFloatMethod(motionEvent, gMotionEventClassInfo.getXPrecision);
+    out_event->precisionY =
+        env->CallFloatMethod(motionEvent, gMotionEventClassInfo.getYPrecision);
+}
+
+static struct {
+    jmethodID getDeviceId;
+    jmethodID getSource;
+    jmethodID getAction;
+
+    jmethodID getEventTime;
+    jmethodID getDownTime;
+
+    jmethodID getFlags;
+    jmethodID getMetaState;
+
+    jmethodID getModifiers;
+    jmethodID getRepeatCount;
+    jmethodID getKeyCode;
+    jmethodID getScanCode;
+    jmethodID getUnicodeChar;
+} gKeyEventClassInfo;
+
+extern "C" void GameActivityKeyEvent_fromJava(JNIEnv *env, jobject keyEvent,
+                                              GameActivityKeyEvent *out_event) {
+    static bool gKeyEventClassInfoInitialized = false;
+    if (!gKeyEventClassInfoInitialized) {
+        int sdkVersion = GetSystemPropAsInt("ro.build.version.sdk");
+        gKeyEventClassInfo = {0};
+        jclass keyEventClass = env->FindClass("android/view/KeyEvent");
+        gKeyEventClassInfo.getDeviceId =
+            env->GetMethodID(keyEventClass, "getDeviceId", "()I");
+        gKeyEventClassInfo.getSource =
+            env->GetMethodID(keyEventClass, "getSource", "()I");
+        gKeyEventClassInfo.getAction =
+            env->GetMethodID(keyEventClass, "getAction", "()I");
+        gKeyEventClassInfo.getEventTime =
+            env->GetMethodID(keyEventClass, "getEventTime", "()J");
+        gKeyEventClassInfo.getDownTime =
+            env->GetMethodID(keyEventClass, "getDownTime", "()J");
+        gKeyEventClassInfo.getFlags =
+            env->GetMethodID(keyEventClass, "getFlags", "()I");
+        gKeyEventClassInfo.getMetaState =
+            env->GetMethodID(keyEventClass, "getMetaState", "()I");
+        if (sdkVersion >= 13) {
+            gKeyEventClassInfo.getModifiers =
+                env->GetMethodID(keyEventClass, "getModifiers", "()I");
+        }
+        gKeyEventClassInfo.getRepeatCount =
+            env->GetMethodID(keyEventClass, "getRepeatCount", "()I");
+        gKeyEventClassInfo.getKeyCode =
+            env->GetMethodID(keyEventClass, "getKeyCode", "()I");
+        gKeyEventClassInfo.getScanCode =
+            env->GetMethodID(keyEventClass, "getScanCode", "()I");
+        gKeyEventClassInfo.getUnicodeChar =
+            env->GetMethodID(keyEventClass, "getUnicodeChar", "()I");
+
+        gKeyEventClassInfoInitialized = true;
+    }
+
+    *out_event = {
+        /*deviceId=*/env->CallIntMethod(keyEvent,
+                                        gKeyEventClassInfo.getDeviceId),
+        /*source=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getSource),
+        /*action=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getAction),
+        // TODO: introduce a millisecondsToNanoseconds helper:
+        /*eventTime=*/
+        env->CallLongMethod(keyEvent, gKeyEventClassInfo.getEventTime) *
+            1000000,
+        /*downTime=*/
+        env->CallLongMethod(keyEvent, gKeyEventClassInfo.getDownTime) * 1000000,
+        /*flags=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getFlags),
+        /*metaState=*/
+        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getMetaState),
+        /*modifiers=*/gKeyEventClassInfo.getModifiers
+            ? env->CallIntMethod(keyEvent, gKeyEventClassInfo.getModifiers)
+            : 0,
+        /*repeatCount=*/
+        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getRepeatCount),
+        /*keyCode=*/
+        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getKeyCode),
+        /*scanCode=*/
+        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getScanCode),
+        /*unicodeChar=*/
+        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getUnicodeChar)};
+}
diff --git a/android-activity/game-activity-csrc/game-activity/GameActivityEvents.h b/android-activity/game-activity-csrc/game-activity/GameActivityEvents.h
new file mode 100644
index 0000000..183c72f
--- /dev/null
+++ b/android-activity/game-activity-csrc/game-activity/GameActivityEvents.h
@@ -0,0 +1,336 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @addtogroup GameActivity Game Activity Events
+ * The interface to use Game Activity Events.
+ * @{
+ */
+
+/**
+ * @file GameActivityEvents.h
+ */
+#ifndef ANDROID_GAME_SDK_GAME_ACTIVITY_EVENTS_H
+#define ANDROID_GAME_SDK_GAME_ACTIVITY_EVENTS_H
+
+#include <android/input.h>
+#include <jni.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * The maximum number of axes supported in an Android MotionEvent.
+ * See https://developer.android.com/ndk/reference/group/input.
+ */
+#define GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT 48
+
+/**
+ * \brief Describe information about a pointer, found in a
+ * GameActivityMotionEvent.
+ *
+ * You can read values directly from this structure, or use helper functions
+ * (`GameActivityPointerAxes_getX`, `GameActivityPointerAxes_getY` and
+ * `GameActivityPointerAxes_getAxisValue`).
+ *
+ * The X axis and Y axis are enabled by default but any other axis that you want
+ * to read **must** be enabled first, using
+ * `GameActivityPointerAxes_enableAxis`.
+ *
+ * \see GameActivityMotionEvent
+ */
+typedef struct GameActivityPointerAxes {
+    int32_t id;
+    int32_t toolType;
+    float axisValues[GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT];
+    float rawX;
+    float rawY;
+} GameActivityPointerAxes;
+
+/** \brief Get the toolType of the pointer. */
+inline int32_t GameActivityPointerAxes_getToolType(
+    const GameActivityPointerAxes* pointerInfo) {
+    return pointerInfo->toolType;
+}
+
+/** \brief Get the current X coordinate of the pointer. */
+inline float GameActivityPointerAxes_getX(
+    const GameActivityPointerAxes* pointerInfo) {
+    return pointerInfo->axisValues[AMOTION_EVENT_AXIS_X];
+}
+
+/** \brief Get the current Y coordinate of the pointer. */
+inline float GameActivityPointerAxes_getY(
+    const GameActivityPointerAxes* pointerInfo) {
+    return pointerInfo->axisValues[AMOTION_EVENT_AXIS_Y];
+}
+
+/**
+ * \brief Enable the specified axis, so that its value is reported in the
+ * GameActivityPointerAxes structures stored in a motion event.
+ *
+ * You must enable any axis that you want to read, apart from
+ * `AMOTION_EVENT_AXIS_X` and `AMOTION_EVENT_AXIS_Y` that are enabled by
+ * default.
+ *
+ * If the axis index is out of range, nothing is done.
+ */
+void GameActivityPointerAxes_enableAxis(int32_t axis);
+
+/**
+ * \brief Disable the specified axis. Its value won't be reported in the
+ * GameActivityPointerAxes structures stored in a motion event anymore.
+ *
+ * Apart from X and Y, any axis that you want to read **must** be enabled first,
+ * using `GameActivityPointerAxes_enableAxis`.
+ *
+ * If the axis index is out of range, nothing is done.
+ */
+void GameActivityPointerAxes_disableAxis(int32_t axis);
+
+/**
+ * \brief Get the value of the requested axis.
+ *
+ * Apart from X and Y, any axis that you want to read **must** be enabled first,
+ * using `GameActivityPointerAxes_enableAxis`.
+ *
+ * Find the valid enums for the axis (`AMOTION_EVENT_AXIS_X`,
+ * `AMOTION_EVENT_AXIS_Y`, `AMOTION_EVENT_AXIS_PRESSURE`...)
+ * in https://developer.android.com/ndk/reference/group/input.
+ *
+ * @param pointerInfo The structure containing information about the pointer,
+ * obtained from GameActivityMotionEvent.
+ * @param axis The axis to get the value from
+ * @return The value of the axis, or 0 if the axis is invalid or was not
+ * enabled.
+ */
+float GameActivityPointerAxes_getAxisValue(
+    const GameActivityPointerAxes* pointerInfo, int32_t axis);
+
+inline float GameActivityPointerAxes_getPressure(
+    const GameActivityPointerAxes* pointerInfo) {
+    return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                                AMOTION_EVENT_AXIS_PRESSURE);
+}
+
+inline float GameActivityPointerAxes_getSize(
+    const GameActivityPointerAxes* pointerInfo) {
+    return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                                AMOTION_EVENT_AXIS_SIZE);
+}
+
+inline float GameActivityPointerAxes_getTouchMajor(
+    const GameActivityPointerAxes* pointerInfo) {
+    return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                                AMOTION_EVENT_AXIS_TOUCH_MAJOR);
+}
+
+inline float GameActivityPointerAxes_getTouchMinor(
+    const GameActivityPointerAxes* pointerInfo) {
+    return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                                AMOTION_EVENT_AXIS_TOUCH_MINOR);
+}
+
+inline float GameActivityPointerAxes_getToolMajor(
+    const GameActivityPointerAxes* pointerInfo) {
+    return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                                AMOTION_EVENT_AXIS_TOOL_MAJOR);
+}
+
+inline float GameActivityPointerAxes_getToolMinor(
+    const GameActivityPointerAxes* pointerInfo) {
+    return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                                AMOTION_EVENT_AXIS_TOOL_MINOR);
+}
+
+inline float GameActivityPointerAxes_getOrientation(
+    const GameActivityPointerAxes* pointerInfo) {
+    return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                                AMOTION_EVENT_AXIS_ORIENTATION);
+}
+
+/**
+ * The maximum number of pointers returned inside a motion event.
+ */
+#if (defined GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT_OVERRIDE)
+#define GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT \
+    GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT_OVERRIDE
+#else
+#define GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT 8
+#endif
+
+/**
+ * \brief Describe a motion event that happened on the GameActivity SurfaceView.
+ *
+ * This is 1:1 mapping to the information contained in a Java `MotionEvent`
+ * (see https://developer.android.com/reference/android/view/MotionEvent).
+ */
+typedef struct GameActivityMotionEvent {
+    int32_t deviceId;
+    int32_t source;
+    int32_t action;
+
+    int64_t eventTime;
+    int64_t downTime;
+
+    int32_t flags;
+    int32_t metaState;
+
+    int32_t actionButton;
+    int32_t buttonState;
+    int32_t classification;
+    int32_t edgeFlags;
+
+    uint32_t pointerCount;
+    GameActivityPointerAxes
+        pointers[GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT];
+
+    int historySize;
+    int64_t* historicalEventTimesMillis;
+    int64_t* historicalEventTimesNanos;
+    float* historicalAxisValues;
+
+    float precisionX;
+    float precisionY;
+} GameActivityMotionEvent;
+
+float GameActivityMotionEvent_getHistoricalAxisValue(
+    const GameActivityMotionEvent* event, int axis, int pointerIndex,
+    int historyPos);
+
+inline int GameActivityMotionEvent_getHistorySize(
+    const GameActivityMotionEvent* event) {
+    return event->historySize;
+}
+
+inline float GameActivityMotionEvent_getHistoricalX(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_X, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalY(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_Y, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalPressure(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_PRESSURE, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalSize(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_SIZE, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalTouchMajor(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_TOUCH_MAJOR, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalTouchMinor(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_TOUCH_MINOR, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalToolMajor(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_TOOL_MAJOR, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalToolMinor(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_TOOL_MINOR, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalOrientation(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_ORIENTATION, pointerIndex, historyPos);
+}
+
+/** \brief Handle the freeing of the GameActivityMotionEvent struct. */
+void GameActivityMotionEvent_destroy(GameActivityMotionEvent* c_event);
+
+/**
+ * \brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`.
+ *
+ * This is done automatically by the GameActivity: see `onTouchEvent` to set
+ * a callback to consume the received events.
+ * This function can be used if you re-implement events handling in your own
+ * activity.
+ * Ownership of out_event is maintained by the caller.
+ */
+void GameActivityMotionEvent_fromJava(JNIEnv* env, jobject motionEvent,
+                                      GameActivityMotionEvent* out_event);
+
+/**
+ * \brief Describe a key event that happened on the GameActivity SurfaceView.
+ *
+ * This is 1:1 mapping to the information contained in a Java `KeyEvent`
+ * (see https://developer.android.com/reference/android/view/KeyEvent).
+ * The only exception is the event times, which are reported as
+ * nanoseconds in this struct.
+ */
+typedef struct GameActivityKeyEvent {
+    int32_t deviceId;
+    int32_t source;
+    int32_t action;
+
+    int64_t eventTime;
+    int64_t downTime;
+
+    int32_t flags;
+    int32_t metaState;
+
+    int32_t modifiers;
+    int32_t repeatCount;
+    int32_t keyCode;
+    int32_t scanCode;
+    int32_t unicodeChar;
+} GameActivityKeyEvent;
+
+/**
+ * \brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.
+ *
+ * This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`
+ * to set a callback to consume the received events.
+ * This function can be used if you re-implement events handling in your own
+ * activity.
+ * Ownership of out_event is maintained by the caller.
+ */
+void GameActivityKeyEvent_fromJava(JNIEnv* env, jobject motionEvent,
+                                   GameActivityKeyEvent* out_event);
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @} */
+
+#endif  // ANDROID_GAME_SDK_GAME_ACTIVITY_EVENTS_H
diff --git a/android-activity/game-activity-csrc/game-activity/GameActivityLog.h b/android-activity/game-activity-csrc/game-activity/GameActivityLog.h
new file mode 100644
index 0000000..ba9a9e9
--- /dev/null
+++ b/android-activity/game-activity-csrc/game-activity/GameActivityLog.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ANDROID_GAME_SDK_GAME_ACTIVITY_LOG_H_
+#define ANDROID_GAME_SDK_GAME_ACTIVITY_LOG_H_
+
+#define LOG_TAG "GameActivity"
+#include <android/log.h>
+
+#define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__);
+#define ALOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__);
+#define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__);
+#ifdef NDEBUG
+#define ALOGV(...)
+#else
+#define ALOGV(...) \
+    __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__);
+#endif
+
+/* Returns 2nd arg.  Used to substitute default value if caller's vararg list
+ * is empty.
+ */
+#define __android_second(first, second, ...) second
+
+/* If passed multiple args, returns ',' followed by all but 1st arg, otherwise
+ * returns nothing.
+ */
+#define __android_rest(first, ...) , ##__VA_ARGS__
+
+#define android_printAssert(cond, tag, fmt...) \
+    __android_log_assert(cond, tag,            \
+                         __android_second(0, ##fmt, NULL) __android_rest(fmt))
+
+#define CONDITION(cond) (__builtin_expect((cond) != 0, 0))
+
+#ifndef LOG_ALWAYS_FATAL_IF
+#define LOG_ALWAYS_FATAL_IF(cond, ...)                                \
+    ((CONDITION(cond))                                                \
+         ? ((void)android_printAssert(#cond, LOG_TAG, ##__VA_ARGS__)) \
+         : (void)0)
+#endif
+
+#ifndef LOG_ALWAYS_FATAL
+#define LOG_ALWAYS_FATAL(...) \
+    (((void)android_printAssert(NULL, LOG_TAG, ##__VA_ARGS__)))
+#endif
+
+/*
+ * Simplified macro to send a warning system log message using current LOG_TAG.
+ */
+#ifndef SLOGW
+#define SLOGW(...) \
+    ((void)__android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__))
+#endif
+
+#ifndef SLOGW_IF
+#define SLOGW_IF(cond, ...)                                                    \
+    ((__predict_false(cond))                                                   \
+         ? ((void)__android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)) \
+         : (void)0)
+#endif
+
+/*
+ * Versions of LOG_ALWAYS_FATAL_IF and LOG_ALWAYS_FATAL that
+ * are stripped out of release builds.
+ */
+#if LOG_NDEBUG
+
+#ifndef LOG_FATAL_IF
+#define LOG_FATAL_IF(cond, ...) ((void)0)
+#endif
+#ifndef LOG_FATAL
+#define LOG_FATAL(...) ((void)0)
+#endif
+
+#else
+
+#ifndef LOG_FATAL_IF
+#define LOG_FATAL_IF(cond, ...) LOG_ALWAYS_FATAL_IF(cond, ##__VA_ARGS__)
+#endif
+#ifndef LOG_FATAL
+#define LOG_FATAL(...) LOG_ALWAYS_FATAL(__VA_ARGS__)
+#endif
+
+#endif
+
+/*
+ * Assertion that generates a log message when the assertion fails.
+ * Stripped out of release builds.  Uses the current LOG_TAG.
+ */
+#ifndef ALOG_ASSERT
+#define ALOG_ASSERT(cond, ...) LOG_FATAL_IF(!(cond), ##__VA_ARGS__)
+#endif
+
+#define LOG_TRACE(...)
+
+#endif  // ANDROID_GAME_SDK_GAME_ACTIVITY_LOG_H_
diff --git a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
index 0a52bd0..223c762 100644
--- a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
+++ b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
@@ -17,6 +17,7 @@
 #include "android_native_app_glue.h"
 
 #include <android/log.h>
+#include <assert.h>
 #include <errno.h>
 #include <jni.h>
 #include <stdlib.h>
@@ -24,6 +25,9 @@
 #include <time.h>
 #include <unistd.h>
 
+#define NATIVE_APP_GLUE_MOTION_EVENTS_DEFAULT_BUF_SIZE 16
+#define NATIVE_APP_GLUE_KEY_EVENTS_DEFAULT_BUF_SIZE 4
+
 #define LOGI(...) \
     ((void)__android_log_print(ANDROID_LOG_INFO, "threaded_app", __VA_ARGS__))
 #define LOGE(...) \
@@ -189,6 +193,7 @@ static void process_cmd(struct android_app* app,
 // This is run on a separate thread (i.e: not the main thread).
 static void* android_app_entry(void* param) {
     struct android_app* android_app = (struct android_app*)param;
+    int input_buf_idx = 0;
 
     LOGV("android_app_entry called");
     android_app->config = AConfiguration_new();
@@ -201,6 +206,19 @@ static void* android_app_entry(void* param) {
 
     print_cur_config(android_app);
 
+    /* initialize event buffers */
+    for (input_buf_idx = 0; input_buf_idx < NATIVE_APP_GLUE_MAX_INPUT_BUFFERS; input_buf_idx++) {
+        struct android_input_buffer *buf = &android_app->inputBuffers[input_buf_idx];
+
+        buf->motionEventsBufferSize = NATIVE_APP_GLUE_MOTION_EVENTS_DEFAULT_BUF_SIZE;
+        buf->motionEvents = (GameActivityMotionEvent *) malloc(sizeof(GameActivityMotionEvent) *
+                                                               buf->motionEventsBufferSize);
+
+        buf->keyEventsBufferSize = NATIVE_APP_GLUE_KEY_EVENTS_DEFAULT_BUF_SIZE;
+        buf->keyEvents = (GameActivityKeyEvent *) malloc(sizeof(GameActivityKeyEvent) *
+                                                         buf->keyEventsBufferSize);
+    }
+
     android_app->cmdPollSource.id = LOOPER_ID_MAIN;
     android_app->cmdPollSource.app = android_app;
     android_app->cmdPollSource.process = process_cmd;
@@ -215,7 +233,7 @@ static void* android_app_entry(void* param) {
     pthread_cond_broadcast(&android_app->cond);
     pthread_mutex_unlock(&android_app->mutex);
 
-    _rust_glue_entry(android_app);
+    android_main(android_app);
 
     android_app_destroy(android_app);
     return NULL;
@@ -308,15 +326,6 @@ static void android_app_set_window(struct android_app* android_app,
                                    ANativeWindow* window) {
     LOGV("android_app_set_window called");
     pthread_mutex_lock(&android_app->mutex);
-
-    // NB: we have to consider that the native thread could have already
-    // (gracefully) exit (setting android_app->destroyed) and so we need
-    // to be careful to avoid a deadlock waiting for a thread that's
-    // already exit.
-    if (android_app->destroyed) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return;
-    }
     if (android_app->pendingWindow != NULL) {
         android_app_write_cmd(android_app, APP_CMD_TERM_WINDOW);
     }
@@ -333,36 +342,31 @@ static void android_app_set_window(struct android_app* android_app,
 static void android_app_set_activity_state(struct android_app* android_app,
                                            int8_t cmd) {
     pthread_mutex_lock(&android_app->mutex);
-
-    // NB: we have to consider that the native thread could have already
-    // (gracefully) exit (setting android_app->destroyed) and so we need
-    // to be careful to avoid a deadlock waiting for a thread that's
-    // already exit.
-    if (!android_app->destroyed) {
-        android_app_write_cmd(android_app, cmd);
-        while (android_app->activityState != cmd) {
-            pthread_cond_wait(&android_app->cond, &android_app->mutex);
-        }
+    android_app_write_cmd(android_app, cmd);
+    while (android_app->activityState != cmd) {
+        pthread_cond_wait(&android_app->cond, &android_app->mutex);
     }
     pthread_mutex_unlock(&android_app->mutex);
 }
 
 static void android_app_free(struct android_app* android_app) {
-    pthread_mutex_lock(&android_app->mutex);
-
-    // It's possible that onDestroy is called after we have already 'destroyed'
-    // the app (via `android_app_destroy` due to `android_main` returning.
-    //
-    // In this case `->destroyed` will already be set (so we won't deadlock in
-    // the loop below) but we still need to close the messaging fds and finish
-    // freeing the android_app
+    int input_buf_idx = 0;
 
+    pthread_mutex_lock(&android_app->mutex);
     android_app_write_cmd(android_app, APP_CMD_DESTROY);
     while (!android_app->destroyed) {
         pthread_cond_wait(&android_app->cond, &android_app->mutex);
     }
     pthread_mutex_unlock(&android_app->mutex);
 
+    for (input_buf_idx = 0; input_buf_idx < NATIVE_APP_GLUE_MAX_INPUT_BUFFERS; input_buf_idx++) {
+        struct android_input_buffer *buf = &android_app->inputBuffers[input_buf_idx];
+
+        android_app_clear_motion_events(buf);
+        free(buf->motionEvents);
+        free(buf->keyEvents);
+    }
+
     close(android_app->msgread);
     close(android_app->msgwrite);
     pthread_cond_destroy(&android_app->cond);
@@ -395,17 +399,8 @@ static void onSaveInstanceState(GameActivity* activity,
     LOGV("SaveInstanceState: %p", activity);
 
     struct android_app* android_app = ToApp(activity);
+    void* savedState = NULL;
     pthread_mutex_lock(&android_app->mutex);
-
-    // NB: we have to consider that the native thread could have already
-    // (gracefully) exit (setting android_app->destroyed) and so we need
-    // to be careful to avoid a deadlock waiting for a thread that's
-    // already exit.
-    if (android_app->destroyed) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return;
-    }
-
     android_app->stateSaved = 0;
     android_app_write_cmd(android_app, APP_CMD_SAVE_STATE);
     while (!android_app->stateSaved) {
@@ -483,47 +478,11 @@ void android_app_set_motion_event_filter(struct android_app* app,
     pthread_mutex_unlock(&app->mutex);
 }
 
-bool android_app_input_available_wake_up(struct android_app* app) {
-    pthread_mutex_lock(&app->mutex);
-    // TODO: use atomic ops for this
-    bool available = app->inputAvailableWakeUp;
-    app->inputAvailableWakeUp = false;
-    pthread_mutex_unlock(&app->mutex);
-    return available;
-}
-
-// NB: should be called with the android_app->mutex held already
-static void notifyInput(struct android_app* android_app) {
-    // Don't spam the mainloop with wake ups if we've already sent one
-    if (android_app->inputSwapPending) {
-        return;
-    }
-
-    if (android_app->looper != NULL) {
-        LOGV("Input Notify: %p", android_app);
-        // for the app thread to know why it received the wake() up
-        android_app->inputAvailableWakeUp = true;
-        android_app->inputSwapPending = true;
-        ALooper_wake(android_app->looper);
-    }
-}
-
 static bool onTouchEvent(GameActivity* activity,
-                         const GameActivityMotionEvent* event,
-                         const GameActivityHistoricalPointerAxes* historical,
-                         int historicalLen) {
+                         const GameActivityMotionEvent* event) {
     struct android_app* android_app = ToApp(activity);
     pthread_mutex_lock(&android_app->mutex);
 
-    // NB: we have to consider that the native thread could have already
-    // (gracefully) exit (setting android_app->destroyed) and so we need
-    // to be careful to avoid a deadlock waiting for a thread that's
-    // already exit.
-    if (android_app->destroyed) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return false;
-    }
-
     if (android_app->motionEventFilter != NULL &&
         !android_app->motionEventFilter(event)) {
         pthread_mutex_unlock(&android_app->mutex);
@@ -534,35 +493,21 @@ static bool onTouchEvent(GameActivity* activity,
         &android_app->inputBuffers[android_app->currentInputBuffer];
 
     // Add to the list of active motion events
-    if (inputBuffer->motionEventsCount <
-        NATIVE_APP_GLUE_MAX_NUM_MOTION_EVENTS) {
-        int new_ix = inputBuffer->motionEventsCount;
-        memcpy(&inputBuffer->motionEvents[new_ix], event,
-               sizeof(GameActivityMotionEvent));
-        ++inputBuffer->motionEventsCount;
-
-        if (inputBuffer->historicalSamplesCount + historicalLen <=
-            NATIVE_APP_GLUE_MAX_HISTORICAL_POINTER_SAMPLES) {
-
-            int start_ix = inputBuffer->historicalSamplesCount;
-            memcpy(&inputBuffer->historicalAxisSamples[start_ix], historical,
-                    sizeof(historical[0]) * historicalLen);
-            inputBuffer->historicalSamplesCount += event->historicalCount;
-
-            inputBuffer->motionEvents[new_ix].historicalStart = start_ix;
-            inputBuffer->motionEvents[new_ix].historicalCount = historicalLen;
-        } else {
-            inputBuffer->motionEvents[new_ix].historicalCount = 0;
+    if (inputBuffer->motionEventsCount >= inputBuffer->motionEventsBufferSize) {
+        inputBuffer->motionEventsBufferSize *= 2;
+        inputBuffer->motionEvents = (GameActivityMotionEvent *) realloc(inputBuffer->motionEvents,
+            sizeof(GameActivityMotionEvent) * inputBuffer->motionEventsBufferSize);
+
+        if (inputBuffer->motionEvents == NULL) {
+            LOGE("onTouchEvent: out of memory");
+            abort();
         }
-
-        notifyInput(android_app);
-    } else {
-        LOGW_ONCE("Motion event will be dropped because the number of unconsumed motion"
-             " events exceeded NATIVE_APP_GLUE_MAX_NUM_MOTION_EVENTS (%d). Consider setting"
-             " NATIVE_APP_GLUE_MAX_NUM_MOTION_EVENTS_OVERRIDE to a larger value",
-             NATIVE_APP_GLUE_MAX_NUM_MOTION_EVENTS);
     }
 
+    int new_ix = inputBuffer->motionEventsCount;
+    memcpy(&inputBuffer->motionEvents[new_ix], event, sizeof(GameActivityMotionEvent));
+    ++inputBuffer->motionEventsCount;
+
     pthread_mutex_unlock(&android_app->mutex);
     return true;
 }
@@ -583,16 +528,21 @@ struct android_input_buffer* android_app_swap_input_buffers(
             NATIVE_APP_GLUE_MAX_INPUT_BUFFERS;
     }
 
-    android_app->inputSwapPending = false;
-    android_app->inputAvailableWakeUp = false;
-
     pthread_mutex_unlock(&android_app->mutex);
 
     return inputBuffer;
 }
 
 void android_app_clear_motion_events(struct android_input_buffer* inputBuffer) {
-    inputBuffer->motionEventsCount = 0;
+    // We do not need to lock here if the inputBuffer has already been swapped
+    // as is handled by the game loop thread
+    while (inputBuffer->motionEventsCount > 0) {
+        GameActivityMotionEvent_destroy(
+            &inputBuffer->motionEvents[inputBuffer->motionEventsCount - 1]);
+
+        inputBuffer->motionEventsCount--;
+    }
+    assert(inputBuffer->motionEventsCount == 0);
 }
 
 void android_app_set_key_event_filter(struct android_app* app,
@@ -606,15 +556,6 @@ static bool onKey(GameActivity* activity, const GameActivityKeyEvent* event) {
     struct android_app* android_app = ToApp(activity);
     pthread_mutex_lock(&android_app->mutex);
 
-    // NB: we have to consider that the native thread could have already
-    // (gracefully) exit (setting android_app->destroyed) and so we need
-    // to be careful to avoid a deadlock waiting for a thread that's
-    // already exit.
-    if (android_app->destroyed) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return false;
-    }
-
     if (android_app->keyEventFilter != NULL &&
         !android_app->keyEventFilter(event)) {
         pthread_mutex_unlock(&android_app->mutex);
@@ -625,20 +566,21 @@ static bool onKey(GameActivity* activity, const GameActivityKeyEvent* event) {
         &android_app->inputBuffers[android_app->currentInputBuffer];
 
     // Add to the list of active key down events
-    if (inputBuffer->keyEventsCount < NATIVE_APP_GLUE_MAX_NUM_KEY_EVENTS) {
-        int new_ix = inputBuffer->keyEventsCount;
-        memcpy(&inputBuffer->keyEvents[new_ix], event,
-               sizeof(GameActivityKeyEvent));
-        ++inputBuffer->keyEventsCount;
-
-        notifyInput(android_app);
-    } else {
-        LOGW_ONCE("Key event will be dropped because the number of unconsumed key events exceeded"
-             " NATIVE_APP_GLUE_MAX_NUM_KEY_EVENTS (%d). Consider setting"
-             " NATIVE_APP_GLUE_MAX_NUM_KEY_EVENTS_OVERRIDE to a larger value",
-             NATIVE_APP_GLUE_MAX_NUM_KEY_EVENTS);
+    if (inputBuffer->keyEventsCount >= inputBuffer->keyEventsBufferSize) {
+        inputBuffer->keyEventsBufferSize = inputBuffer->keyEventsBufferSize * 2;
+        inputBuffer->keyEvents = (GameActivityKeyEvent *) realloc(inputBuffer->keyEvents,
+            sizeof(GameActivityKeyEvent) * inputBuffer->keyEventsBufferSize);
+
+        if (inputBuffer->keyEvents == NULL) {
+            LOGE("onKey: out of memory");
+            abort();
+        }
     }
 
+    int new_ix = inputBuffer->keyEventsCount;
+    memcpy(&inputBuffer->keyEvents[new_ix], event, sizeof(GameActivityKeyEvent));
+    ++inputBuffer->keyEventsCount;
+
     pthread_mutex_unlock(&android_app->mutex);
     return true;
 }
@@ -651,9 +593,8 @@ static void onTextInputEvent(GameActivity* activity,
                              const GameTextInputState* state) {
     struct android_app* android_app = ToApp(activity);
     pthread_mutex_lock(&android_app->mutex);
-    if (!android_app->destroyed) {
-        android_app->textInputState = 1;
-    }
+
+    android_app->textInputState = 1;
     pthread_mutex_unlock(&android_app->mutex);
 }
 
@@ -662,8 +603,22 @@ static void onWindowInsetsChanged(GameActivity* activity) {
     android_app_write_cmd(ToApp(activity), APP_CMD_WINDOW_INSETS_CHANGED);
 }
 
+static void onContentRectChanged(GameActivity* activity, const ARect *rect) {
+    LOGV("ContentRectChanged: %p -- (%d %d) (%d %d)", activity, rect->left, rect->top,
+         rect->right, rect->bottom);
+
+    struct android_app* android_app = ToApp(activity);
+
+    pthread_mutex_lock(&android_app->mutex);
+    android_app->contentRect = *rect;
+
+    android_app_write_cmd(android_app, APP_CMD_CONTENT_RECT_CHANGED);
+    pthread_mutex_unlock(&android_app->mutex);
+}
+
+
 JNIEXPORT
-void GameActivity_onCreate_C(GameActivity* activity, void* savedState,
+void GameActivity_onCreate(GameActivity* activity, void* savedState,
                            size_t savedStateSize) {
     LOGV("Creating: %p", activity);
     activity->callbacks->onDestroy = onDestroy;
@@ -685,6 +640,7 @@ void GameActivity_onCreate_C(GameActivity* activity, void* savedState,
         onNativeWindowRedrawNeeded;
     activity->callbacks->onNativeWindowResized = onNativeWindowResized;
     activity->callbacks->onWindowInsetsChanged = onWindowInsetsChanged;
+    activity->callbacks->onContentRectChanged = onContentRectChanged;
     LOGV("Callbacks set: %p", activity->callbacks);
 
     activity->instance =
diff --git a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h
index 96968e3..e63026f 100644
--- a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h
+++ b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h
@@ -30,27 +30,6 @@
 
 #include "game-activity/GameActivity.h"
 
-#if (defined NATIVE_APP_GLUE_MAX_NUM_MOTION_EVENTS_OVERRIDE)
-#define NATIVE_APP_GLUE_MAX_NUM_MOTION_EVENTS \
-    NATIVE_APP_GLUE_MAX_NUM_MOTION_EVENTS_OVERRIDE
-#else
-#define NATIVE_APP_GLUE_MAX_NUM_MOTION_EVENTS 16
-#endif
-
-#if (defined NATIVE_APP_GLUE_MAX_HISTORICAL_POINTER_SAMPLES_OVERRIDE)
-#define NATIVE_APP_GLUE_MAX_HISTORICAL_POINTER_SAMPLES \
-    NATIVE_APP_GLUE_MAX_HISTORICAL_POINTER_SAMPLES_OVERRIDE
-#else
-#define NATIVE_APP_GLUE_MAX_HISTORICAL_POINTER_SAMPLES 64
-#endif
-
-#if (defined NATIVE_APP_GLUE_MAX_NUM_KEY_EVENTS_OVERRIDE)
-#define NATIVE_APP_GLUE_MAX_NUM_KEY_EVENTS \
-    NATIVE_APP_GLUE_MAX_NUM_KEY_EVENTS_OVERRIDE
-#else
-#define NATIVE_APP_GLUE_MAX_NUM_KEY_EVENTS 4
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -126,10 +105,10 @@ struct android_poll_source {
 
 struct android_input_buffer {
     /**
-     * Pointer to a read-only array of pointers to GameActivityMotionEvent.
+     * Pointer to a read-only array of GameActivityMotionEvent.
      * Only the first motionEventsCount events are valid.
      */
-    GameActivityMotionEvent motionEvents[NATIVE_APP_GLUE_MAX_NUM_MOTION_EVENTS];
+    GameActivityMotionEvent *motionEvents;
 
     /**
      * The number of valid motion events in `motionEvents`.
@@ -137,36 +116,25 @@ struct android_input_buffer {
     uint64_t motionEventsCount;
 
     /**
-     * Pointer to a read-only array of pointers to GameActivityHistoricalPointerAxes.
-     *
-     * Only the first historicalSamplesCount samples are valid.
-     * Refer to event->historicalStart, event->pointerCount and event->historicalCount
-     * to access the specific samples that relate to an event.
-     *
-     * Each slice of samples for one event has a length of
-     * (event->pointerCount and event->historicalCount) and is in pointer-major
-     * order so the historic samples for each pointer are contiguous.
-     * E.g. you would access historic sample index 3 for pointer 2 of an event with:
-     *
-     *   historicalAxisSamples[event->historicalStart + (event->historicalCount * 2) + 3];
-     */
-    GameActivityHistoricalPointerAxes historicalAxisSamples[NATIVE_APP_GLUE_MAX_HISTORICAL_POINTER_SAMPLES];
-
-    /**
-     * The number of valid historical samples in `historicalAxisSamples`.
+     * The size of the `motionEvents` buffer.
      */
-    uint64_t historicalSamplesCount;
+    uint64_t motionEventsBufferSize;
 
     /**
-     * Pointer to a read-only array of pointers to GameActivityKeyEvent.
+     * Pointer to a read-only array of GameActivityKeyEvent.
      * Only the first keyEventsCount events are valid.
      */
-    GameActivityKeyEvent keyEvents[NATIVE_APP_GLUE_MAX_NUM_KEY_EVENTS];
+    GameActivityKeyEvent *keyEvents;
 
     /**
      * The number of valid "Key" events in `keyEvents`.
      */
     uint64_t keyEventsCount;
+
+    /**
+     * The size of the `keyEvents` buffer.
+     */
+    uint64_t keyEventsBufferSize;
 };
 
 /**
@@ -295,26 +263,6 @@ struct android_app {
     android_key_event_filter keyEventFilter;
     android_motion_event_filter motionEventFilter;
 
-    // When new input is received we set both of these flags and use the looper to
-    // wake up the application mainloop.
-    //
-    // To avoid spamming the mainloop with wake ups from lots of input though we
-    // don't sent a wake up if the inputSwapPending flag is already set. (i.e.
-    // we already expect input to be processed in a finite amount of time due to
-    // our previous wake up)
-    //
-    // When a wake up is received then we will check this flag (clearing it
-    // at the same time). If it was set then an InputAvailable event is sent to
-    // the application - which should lead to all input being processed within
-    // a finite amount of time.
-    //
-    // The next time android_app_swap_input_buffers is called, both flags will be
-    // cleared.
-    //
-    // NB: both of these should only be read with the app mutex held
-    bool inputAvailableWakeUp;
-    bool inputSwapPending;
-
     /** @endcond */
 };
 
@@ -500,10 +448,10 @@ void android_app_clear_motion_events(struct android_input_buffer* inputBuffer);
 void android_app_clear_key_events(struct android_input_buffer* inputBuffer);
 
 /**
- * This is a springboard into the Rust glue layer that wraps calling the
- * main entry for the app itself.
+ * This is the function that application code must implement, representing
+ * the main entry to the app.
  */
-extern void _rust_glue_entry(struct android_app* app);
+extern void android_main(struct android_app* app);
 
 /**
  * Set the filter to use when processing key events.
@@ -527,13 +475,6 @@ void android_app_set_key_event_filter(struct android_app* app,
 void android_app_set_motion_event_filter(struct android_app* app,
                                          android_motion_event_filter filter);
 
-/**
- * Determines if a looper wake up was due to new input becoming available
- */
-bool android_app_input_available_wake_up(struct android_app* app);
-
-void GameActivity_onCreate_C(GameActivity* activity, void* savedState,
-                            size_t savedStateSize);
 #ifdef __cplusplus
 }
 #endif
diff --git a/android-activity/game-activity-csrc/game-text-input/gamecommon.h b/android-activity/game-activity-csrc/game-text-input/gamecommon.h
old mode 100644
new mode 100755
diff --git a/android-activity/game-activity-csrc/game-text-input/gametextinput.cpp b/android-activity/game-activity-csrc/game-text-input/gametextinput.cpp
old mode 100644
new mode 100755
index 6a39943..b8244fb
--- a/android-activity/game-activity-csrc/game-text-input/gametextinput.cpp
+++ b/android-activity/game-activity-csrc/game-text-input/gametextinput.cpp
@@ -48,6 +48,7 @@ struct GameTextInput {
     void processEvent(jobject textInputEvent);
     void showIme(uint32_t flags);
     void hideIme(uint32_t flags);
+    void restartInput();
     void setEventCallback(GameTextInputEventCallback callback, void *context);
     jobject stateToJava(const GameTextInputState &state) const;
     void stateFromJava(jobject textInputEvent,
@@ -73,6 +74,7 @@ struct GameTextInput {
     jobject inputConnection_ = nullptr;
     jmethodID inputConnectionSetStateMethod_;
     jmethodID setSoftKeyboardActiveMethod_;
+    jmethodID restartInputMethod_;
     void (*eventCallback_)(void *context,
                            const struct GameTextInputState *state) = nullptr;
     void *eventCallbackContext_ = nullptr;
@@ -164,6 +166,10 @@ void GameTextInput_hideIme(struct GameTextInput *input, uint32_t flags) {
     input->hideIme(flags);
 }
 
+void GameTextInput_restartInput(struct GameTextInput *input) {
+    input->restartInput();
+}
+
 void GameTextInput_setEventCallback(struct GameTextInput *input,
                                     GameTextInputEventCallback callback,
                                     void *context) {
@@ -199,6 +205,8 @@ GameTextInput::GameTextInput(JNIEnv *env, uint32_t max_string_size)
                           "(Lcom/google/androidgamesdk/gametextinput/State;)V");
     setSoftKeyboardActiveMethod_ = env_->GetMethodID(
         inputConnectionClass_, "setSoftKeyboardActive", "(ZI)V");
+    restartInputMethod_ =
+        env_->GetMethodID(inputConnectionClass_, "restartInput", "()V");
 
     stateClassInfo_.text =
         env_->GetFieldID(stateJavaClass_, "text", "Ljava/lang/String;");
@@ -307,6 +315,11 @@ void GameTextInput::hideIme(uint32_t flags) {
                          flags);
 }
 
+void GameTextInput::restartInput() {
+    if (inputConnection_ == nullptr) return;
+    env_->CallVoidMethod(inputConnection_, restartInputMethod_, false);
+}
+
 jobject GameTextInput::stateToJava(const GameTextInputState &state) const {
     static jmethodID constructor = nullptr;
     if (constructor == nullptr) {
diff --git a/android-activity/game-activity-csrc/game-text-input/gametextinput.h b/android-activity/game-activity-csrc/game-text-input/gametextinput.h
old mode 100644
new mode 100755
index a85265e..8c33da5
--- a/android-activity/game-activity-csrc/game-text-input/gametextinput.h
+++ b/android-activity/game-activity-csrc/game-text-input/gametextinput.h
@@ -26,12 +26,21 @@
 #include <jni.h>
 #include <stdint.h>
 
+#include "common/gamesdk_common.h"
 #include "gamecommon.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define GAMETEXTINPUT_MAJOR_VERSION 2
+#define GAMETEXTINPUT_MINOR_VERSION 0
+#define GAMETEXTINPUT_BUGFIX_VERSION 0
+#define GAMETEXTINPUT_PACKED_VERSION                            \
+    ANDROID_GAMESDK_PACKED_VERSION(GAMETEXTINPUT_MAJOR_VERSION, \
+                                   GAMETEXTINPUT_MINOR_VERSION, \
+                                   GAMETEXTINPUT_BUGFIX_VERSION)
+
 /**
  * This struct holds a span within a region of text from start (inclusive) to
  * end (exclusive). An empty span or cursor position is specified with
@@ -173,6 +182,12 @@ enum HideImeFlags {
  */
 void GameTextInput_hideIme(GameTextInput *input, uint32_t flags);
 
+/**
+ * Restarts the input method. Calls InputMethodManager.restartInput().
+ * @param input A valid GameTextInput library handle.
+ */
+void GameTextInput_restartInput(GameTextInput *input);
+
 /**
  * Call a callback with the current GameTextInput state, which may have been
  * modified by changes in the IME and calls to GameTextInput_setState. We use a

From d6345abb2a087d1eecd12614538c21b7d47b835b Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Sat, 22 Jul 2023 18:12:01 +0100
Subject: [PATCH 13/93] GameActivity PATCH: rename C symbols that need export

Give C symbols that need to be exported a `_C` suffix so that they can
be linked into a Rust symbol with the correct name (Since we can't
directly export from C/C++ with Rust+Cargo)

See: https://github.com/rust-lang/rfcs/issues/2771
---
 .../game-activity-csrc/game-activity/GameActivity.cpp     | 8 ++++++--
 .../game-activity-csrc/game-activity/GameActivity.h       | 2 +-
 .../native_app_glue/android_native_app_glue.c             | 7 +++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/android-activity/game-activity-csrc/game-activity/GameActivity.cpp b/android-activity/game-activity-csrc/game-activity/GameActivity.cpp
index 3721b6d..4dbc9e8 100644
--- a/android-activity/game-activity-csrc/game-activity/GameActivity.cpp
+++ b/android-activity/game-activity-csrc/game-activity/GameActivity.cpp
@@ -485,7 +485,7 @@ static jlong initializeNativeCode_native(
 
     readConfigurationValues(code, javaConfig);
 
-    GameActivity_onCreate(code, rawSavedState, rawSavedSize);
+    GameActivity_onCreate_C(code, rawSavedState, rawSavedSize);
 
     code->gameTextInput = GameTextInput_init(env, 0);
     GameTextInput_setEventCallback(code->gameTextInput,
@@ -1130,8 +1130,12 @@ extern "C" int GameActivity_register(JNIEnv *env) {
                                     NELEM(g_methods));
 }
 
+// XXX: This symbol is renamed with a _C suffix and then re-exported from
+// Rust because Rust/Cargo don't give us a way to directly export symbols
+// from C/C++ code: https://github.com/rust-lang/rfcs/issues/2771
+//
 extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_androidgamesdk_GameActivity_initializeNativeCode(
+Java_com_google_androidgamesdk_GameActivity_initializeNativeCode_C(
     JNIEnv *env, jobject javaGameActivity, jstring internalDataDir,
     jstring obbDir, jstring externalDataDir, jobject jAssetMgr,
     jbyteArray savedState, jobject javaConfig) {
diff --git a/android-activity/game-activity-csrc/game-activity/GameActivity.h b/android-activity/game-activity-csrc/game-activity/GameActivity.h
index 702f754..b945069 100644
--- a/android-activity/game-activity-csrc/game-activity/GameActivity.h
+++ b/android-activity/game-activity-csrc/game-activity/GameActivity.h
@@ -296,7 +296,7 @@ typedef void GameActivity_createFunc(GameActivity* activity, void* savedState,
  * "android.app.func_name" string meta-data in your manifest to use a different
  * function.
  */
-extern GameActivity_createFunc GameActivity_onCreate;
+extern GameActivity_createFunc GameActivity_onCreate_C;
 
 /**
  * Finish the given activity.  Its finish() method will be called, causing it
diff --git a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
index 223c762..09a4b22 100644
--- a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
+++ b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
@@ -616,9 +616,12 @@ static void onContentRectChanged(GameActivity* activity, const ARect *rect) {
     pthread_mutex_unlock(&android_app->mutex);
 }
 
-
+// XXX: This symbol is renamed with a _C suffix and then re-exported from
+// Rust because Rust/Cargo don't give us a way to directly export symbols
+// from C/C++ code: https://github.com/rust-lang/rfcs/issues/2771
+//
 JNIEXPORT
-void GameActivity_onCreate(GameActivity* activity, void* savedState,
+void GameActivity_onCreate_C(GameActivity* activity, void* savedState,
                            size_t savedStateSize) {
     LOGV("Creating: %p", activity);
     activity->callbacks->onDestroy = onDestroy;

From 202ab4c1e988c3d4cbe46aaece70862a6979fc38 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Sat, 22 Jul 2023 18:15:58 +0100
Subject: [PATCH 14/93] GameActivity PATCH: Rename android_main
 _rust_glue_entry

The real `android_main` is going to be written in Rust and
android-activity needs to handle its own initialization before calling
the application's `android_main` and so the C/C++ code
calls an intermediate `_rust_glue_entry` function.
---
 .../game-activity/native_app_glue/android_native_app_glue.c | 2 +-
 .../game-activity/native_app_glue/android_native_app_glue.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
index 09a4b22..56e3a44 100644
--- a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
+++ b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
@@ -233,7 +233,7 @@ static void* android_app_entry(void* param) {
     pthread_cond_broadcast(&android_app->cond);
     pthread_mutex_unlock(&android_app->mutex);
 
-    android_main(android_app);
+    _rust_glue_entry(android_app);
 
     android_app_destroy(android_app);
     return NULL;
diff --git a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h
index e63026f..f504ac4 100644
--- a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h
+++ b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h
@@ -448,10 +448,10 @@ void android_app_clear_motion_events(struct android_input_buffer* inputBuffer);
 void android_app_clear_key_events(struct android_input_buffer* inputBuffer);
 
 /**
- * This is the function that application code must implement, representing
- * the main entry to the app.
+ * This is a springboard into the Rust glue layer that wraps calling the
+ * main entry for the app itself.
  */
-extern void android_main(struct android_app* app);
+extern void _rust_glue_entry(struct android_app* app);
 
 /**
  * Set the filter to use when processing key events.

From 3e3fb84c0350c485a6423f7eb0ce0142e99d7a7d Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Wed, 25 May 2022 23:57:45 +0100
Subject: [PATCH 15/93] GameActivity PATCH: remove unused variable

---
 .../game-activity/native_app_glue/android_native_app_glue.c      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
index 56e3a44..01ee70c 100644
--- a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
+++ b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
@@ -399,7 +399,6 @@ static void onSaveInstanceState(GameActivity* activity,
     LOGV("SaveInstanceState: %p", activity);
 
     struct android_app* android_app = ToApp(activity);
-    void* savedState = NULL;
     pthread_mutex_lock(&android_app->mutex);
     android_app->stateSaved = 0;
     android_app_write_cmd(android_app, APP_CMD_SAVE_STATE);

From d2d18154d9cf6773d543619f1d3021104e77413a Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Sat, 13 Aug 2022 05:42:37 +0100
Subject: [PATCH 16/93] GameActivity PATCH: Support InputAvailable events

This makes a small change to the C glue code for GameActivity to send
looper wake ups when new input is received (only sending a single wake
up, until the application next handles input).

This makes it possible to recognise that new input is available and send
an `InputAvailable` event to the application - consistent with how
NativeActivity can deliver `InputAvailable` events.

This addresses a significant feature disparity between GameActivity and
NativeActivity that meant GameActivity was not practically usable for
GUI applications that wouldn't want to render continuously like a game.
---
 .../native_app_glue/android_native_app_glue.c | 28 +++++++++++++++++++
 .../native_app_glue/android_native_app_glue.h | 25 +++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
index 01ee70c..8500ff6 100644
--- a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
+++ b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
@@ -477,6 +477,29 @@ void android_app_set_motion_event_filter(struct android_app* app,
     pthread_mutex_unlock(&app->mutex);
 }
 
+bool android_app_input_available_wake_up(struct android_app* app) {
+    pthread_mutex_lock(&app->mutex);
+    bool available = app->inputAvailableWakeUp;
+    app->inputAvailableWakeUp = false;
+    pthread_mutex_unlock(&app->mutex);
+    return available;
+}
+
+// NB: should be called with the android_app->mutex held already
+static void notifyInput(struct android_app* android_app) {
+    // Don't spam the mainloop with wake ups if we've already sent one
+    if (android_app->inputSwapPending) {
+        return;
+    }
+
+    if (android_app->looper != NULL) {
+        // for the app thread to know why it received the wake() up
+        android_app->inputAvailableWakeUp = true;
+        android_app->inputSwapPending = true;
+        ALooper_wake(android_app->looper);
+    }
+}
+
 static bool onTouchEvent(GameActivity* activity,
                          const GameActivityMotionEvent* event) {
     struct android_app* android_app = ToApp(activity);
@@ -506,6 +529,7 @@ static bool onTouchEvent(GameActivity* activity,
     int new_ix = inputBuffer->motionEventsCount;
     memcpy(&inputBuffer->motionEvents[new_ix], event, sizeof(GameActivityMotionEvent));
     ++inputBuffer->motionEventsCount;
+    notifyInput(android_app);
 
     pthread_mutex_unlock(&android_app->mutex);
     return true;
@@ -527,6 +551,9 @@ struct android_input_buffer* android_app_swap_input_buffers(
             NATIVE_APP_GLUE_MAX_INPUT_BUFFERS;
     }
 
+    android_app->inputSwapPending = false;
+    android_app->inputAvailableWakeUp = false;
+
     pthread_mutex_unlock(&android_app->mutex);
 
     return inputBuffer;
@@ -579,6 +606,7 @@ static bool onKey(GameActivity* activity, const GameActivityKeyEvent* event) {
     int new_ix = inputBuffer->keyEventsCount;
     memcpy(&inputBuffer->keyEvents[new_ix], event, sizeof(GameActivityKeyEvent));
     ++inputBuffer->keyEventsCount;
+    notifyInput(android_app);
 
     pthread_mutex_unlock(&android_app->mutex);
     return true;
diff --git a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h
index f504ac4..6fa5721 100644
--- a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h
+++ b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h
@@ -263,6 +263,26 @@ struct android_app {
     android_key_event_filter keyEventFilter;
     android_motion_event_filter motionEventFilter;
 
+    // When new input is received we set both of these flags and use the looper to
+    // wake up the application mainloop.
+    //
+    // To avoid spamming the mainloop with wake ups from lots of input though we
+    // don't sent a wake up if the inputSwapPending flag is already set. (i.e.
+    // we already expect input to be processed in a finite amount of time due to
+    // our previous wake up)
+    //
+    // When a wake up is received then we will check this flag (clearing it
+    // at the same time). If it was set then an InputAvailable event is sent to
+    // the application - which should lead to all input being processed within
+    // a finite amount of time.
+    //
+    // The next time android_app_swap_input_buffers is called, both flags will be
+    // cleared.
+    //
+    // NB: both of these should only be read with the app mutex held
+    bool inputAvailableWakeUp;
+    bool inputSwapPending;
+
     /** @endcond */
 };
 
@@ -475,6 +495,11 @@ void android_app_set_key_event_filter(struct android_app* app,
 void android_app_set_motion_event_filter(struct android_app* app,
                                          android_motion_event_filter filter);
 
+/**
+ * Determines if a looper wake up was due to new input becoming available
+ */
+bool android_app_input_available_wake_up(struct android_app* app);
+
 #ifdef __cplusplus
 }
 #endif

From 2a2f27637f79026d61b6bfa75335de57ab4e9e66 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Fri, 28 Jul 2023 22:18:24 +0100
Subject: [PATCH 17/93] GameActivity PATCH: fix deadlocks in java callbacks
 after app destroyed

This ensures that any java Activity callbacks take into account the
possibility that the `android_app` may have already been marked
destroyed if `android_main` has returned - and so they mustn't block
and wait for a thread that is no longer running.
---
 .../native_app_glue/android_native_app_glue.c | 63 +++++++++++++++++--
 1 file changed, 58 insertions(+), 5 deletions(-)

diff --git a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
index 8500ff6..b78a44f 100644
--- a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
+++ b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
@@ -326,6 +326,15 @@ static void android_app_set_window(struct android_app* android_app,
                                    ANativeWindow* window) {
     LOGV("android_app_set_window called");
     pthread_mutex_lock(&android_app->mutex);
+
+    // NB: we have to consider that the native thread could have already
+    // (gracefully) exit (setting android_app->destroyed) and so we need
+    // to be careful to avoid a deadlock waiting for a thread that's
+    // already exit.
+    if (android_app->destroyed) {
+        pthread_mutex_unlock(&android_app->mutex);
+        return;
+    }
     if (android_app->pendingWindow != NULL) {
         android_app_write_cmd(android_app, APP_CMD_TERM_WINDOW);
     }
@@ -342,9 +351,16 @@ static void android_app_set_window(struct android_app* android_app,
 static void android_app_set_activity_state(struct android_app* android_app,
                                            int8_t cmd) {
     pthread_mutex_lock(&android_app->mutex);
-    android_app_write_cmd(android_app, cmd);
-    while (android_app->activityState != cmd) {
-        pthread_cond_wait(&android_app->cond, &android_app->mutex);
+
+    // NB: we have to consider that the native thread could have already
+    // (gracefully) exit (setting android_app->destroyed) and so we need
+    // to be careful to avoid a deadlock waiting for a thread that's
+    // already exit.
+    if (!android_app->destroyed) {
+        android_app_write_cmd(android_app, cmd);
+        while (android_app->activityState != cmd) {
+            pthread_cond_wait(&android_app->cond, &android_app->mutex);
+        }
     }
     pthread_mutex_unlock(&android_app->mutex);
 }
@@ -353,6 +369,14 @@ static void android_app_free(struct android_app* android_app) {
     int input_buf_idx = 0;
 
     pthread_mutex_lock(&android_app->mutex);
+
+    // It's possible that onDestroy is called after we have already 'destroyed'
+    // the app (via `android_app_destroy` due to `android_main` returning.
+    //
+    // In this case `->destroyed` will already be set (so we won't deadlock in
+    // the loop below) but we still need to close the messaging fds and finish
+    // freeing the android_app
+
     android_app_write_cmd(android_app, APP_CMD_DESTROY);
     while (!android_app->destroyed) {
         pthread_cond_wait(&android_app->cond, &android_app->mutex);
@@ -400,6 +424,16 @@ static void onSaveInstanceState(GameActivity* activity,
 
     struct android_app* android_app = ToApp(activity);
     pthread_mutex_lock(&android_app->mutex);
+
+    // NB: we have to consider that the native thread could have already
+    // (gracefully) exit (setting android_app->destroyed) and so we need
+    // to be careful to avoid a deadlock waiting for a thread that's
+    // already exit.
+    if (android_app->destroyed) {
+        pthread_mutex_unlock(&android_app->mutex);
+        return;
+    }
+
     android_app->stateSaved = 0;
     android_app_write_cmd(android_app, APP_CMD_SAVE_STATE);
     while (!android_app->stateSaved) {
@@ -505,6 +539,15 @@ static bool onTouchEvent(GameActivity* activity,
     struct android_app* android_app = ToApp(activity);
     pthread_mutex_lock(&android_app->mutex);
 
+    // NB: we have to consider that the native thread could have already
+    // (gracefully) exit (setting android_app->destroyed) and so we need
+    // to be careful to avoid a deadlock waiting for a thread that's
+    // already exit.
+    if (android_app->destroyed) {
+        pthread_mutex_unlock(&android_app->mutex);
+        return false;
+    }
+
     if (android_app->motionEventFilter != NULL &&
         !android_app->motionEventFilter(event)) {
         pthread_mutex_unlock(&android_app->mutex);
@@ -582,6 +625,15 @@ static bool onKey(GameActivity* activity, const GameActivityKeyEvent* event) {
     struct android_app* android_app = ToApp(activity);
     pthread_mutex_lock(&android_app->mutex);
 
+    // NB: we have to consider that the native thread could have already
+    // (gracefully) exit (setting android_app->destroyed) and so we need
+    // to be careful to avoid a deadlock waiting for a thread that's
+    // already exit.
+    if (android_app->destroyed) {
+        pthread_mutex_unlock(&android_app->mutex);
+        return false;
+    }
+
     if (android_app->keyEventFilter != NULL &&
         !android_app->keyEventFilter(event)) {
         pthread_mutex_unlock(&android_app->mutex);
@@ -620,8 +672,9 @@ static void onTextInputEvent(GameActivity* activity,
                              const GameTextInputState* state) {
     struct android_app* android_app = ToApp(activity);
     pthread_mutex_lock(&android_app->mutex);
-
-    android_app->textInputState = 1;
+    if (!android_app->destroyed) {
+        android_app->textInputState = 1;
+    }
     pthread_mutex_unlock(&android_app->mutex);
 }
 

From cc3983ca2106876d22374ea229b61f4bacfa1232 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Sat, 22 Jul 2023 18:36:07 +0100
Subject: [PATCH 18/93] generate-bindings: add comment about installing
 bindgen-cli

---
 android-activity/generate-bindings.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/android-activity/generate-bindings.sh b/android-activity/generate-bindings.sh
index 530eeae..51c5602 100644
--- a/android-activity/generate-bindings.sh
+++ b/android-activity/generate-bindings.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# First install bindgen-cli via `cargo install bindgen-cli`
+
 if test -z "${ANDROID_NDK_ROOT}"; then
     export ANDROID_NDK_ROOT=${ANDROID_NDK_HOME}
 fi

From b09526a4a9a3909969c326bddab3d4127e86394d Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Sat, 22 Jul 2023 18:38:38 +0100
Subject: [PATCH 19/93] game-activity: update ffi bindings for 2.0.2 via
 ./generate-bindings.sh

---
 android-activity/src/game_activity/ffi.rs     |    2 +-
 .../src/game_activity/ffi_aarch64.rs          | 4800 +++++++--------
 android-activity/src/game_activity/ffi_arm.rs | 4742 +++++++--------
 .../src/game_activity/ffi_i686.rs             | 5123 ++++++++--------
 .../src/game_activity/ffi_x86_64.rs           | 5274 ++++++++---------
 5 files changed, 9593 insertions(+), 10348 deletions(-)

diff --git a/android-activity/src/game_activity/ffi.rs b/android-activity/src/game_activity/ffi.rs
index 3196865..e3c561d 100644
--- a/android-activity/src/game_activity/ffi.rs
+++ b/android-activity/src/game_activity/ffi.rs
@@ -13,7 +13,7 @@
 #![allow(dead_code)]
 
 use jni_sys::*;
-use libc::{pthread_cond_t, pthread_mutex_t, pthread_t, size_t};
+use libc::{pthread_cond_t, pthread_mutex_t, pthread_t};
 use ndk_sys::{AAssetManager, AConfiguration, ALooper, ALooper_callbackFunc, ANativeWindow, ARect};
 
 #[cfg(all(
diff --git a/android-activity/src/game_activity/ffi_aarch64.rs b/android-activity/src/game_activity/ffi_aarch64.rs
index 20a66d0..0d5c320 100644
--- a/android-activity/src/game_activity/ffi_aarch64.rs
+++ b/android-activity/src/game_activity/ffi_aarch64.rs
@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.59.2 */
+/* automatically generated by rust-bindgen 0.66.1 */
 
 pub const __BIONIC__: u32 = 1;
 pub const __WORDSIZE: u32 = 64;
@@ -21,10 +21,14 @@ pub const __ANDROID_API_O_MR1__: u32 = 27;
 pub const __ANDROID_API_P__: u32 = 28;
 pub const __ANDROID_API_Q__: u32 = 29;
 pub const __ANDROID_API_R__: u32 = 30;
-pub const __NDK_MAJOR__: u32 = 21;
-pub const __NDK_MINOR__: u32 = 1;
+pub const __ANDROID_API_S__: u32 = 31;
+pub const __ANDROID_API_T__: u32 = 33;
+pub const __ANDROID_API_U__: u32 = 34;
+pub const __ANDROID_NDK__: u32 = 1;
+pub const __NDK_MAJOR__: u32 = 25;
+pub const __NDK_MINOR__: u32 = 2;
 pub const __NDK_BETA__: u32 = 0;
-pub const __NDK_BUILD__: u32 = 6352462;
+pub const __NDK_BUILD__: u32 = 9519653;
 pub const __NDK_CANARY__: u32 = 0;
 pub const WCHAR_MIN: u8 = 0u8;
 pub const INT8_MIN: i32 = -128;
@@ -57,171 +61,176 @@ pub const WINT_MAX: u32 = 4294967295;
 pub const WINT_MIN: u32 = 0;
 pub const __BITS_PER_LONG: u32 = 64;
 pub const __FD_SETSIZE: u32 = 1024;
-pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8;
-pub const __PRI_64_prefix: &[u8; 2usize] = b"l\0";
-pub const __PRI_PTR_prefix: &[u8; 2usize] = b"l\0";
-pub const __PRI_FAST_prefix: &[u8; 2usize] = b"l\0";
-pub const PRId8: &[u8; 2usize] = b"d\0";
-pub const PRId16: &[u8; 2usize] = b"d\0";
-pub const PRId32: &[u8; 2usize] = b"d\0";
-pub const PRId64: &[u8; 3usize] = b"ld\0";
-pub const PRIdLEAST8: &[u8; 2usize] = b"d\0";
-pub const PRIdLEAST16: &[u8; 2usize] = b"d\0";
-pub const PRIdLEAST32: &[u8; 2usize] = b"d\0";
-pub const PRIdLEAST64: &[u8; 3usize] = b"ld\0";
-pub const PRIdFAST8: &[u8; 2usize] = b"d\0";
-pub const PRIdFAST16: &[u8; 3usize] = b"ld\0";
-pub const PRIdFAST32: &[u8; 3usize] = b"ld\0";
-pub const PRIdFAST64: &[u8; 3usize] = b"ld\0";
-pub const PRIdMAX: &[u8; 3usize] = b"jd\0";
-pub const PRIdPTR: &[u8; 3usize] = b"ld\0";
-pub const PRIi8: &[u8; 2usize] = b"i\0";
-pub const PRIi16: &[u8; 2usize] = b"i\0";
-pub const PRIi32: &[u8; 2usize] = b"i\0";
-pub const PRIi64: &[u8; 3usize] = b"li\0";
-pub const PRIiLEAST8: &[u8; 2usize] = b"i\0";
-pub const PRIiLEAST16: &[u8; 2usize] = b"i\0";
-pub const PRIiLEAST32: &[u8; 2usize] = b"i\0";
-pub const PRIiLEAST64: &[u8; 3usize] = b"li\0";
-pub const PRIiFAST8: &[u8; 2usize] = b"i\0";
-pub const PRIiFAST16: &[u8; 3usize] = b"li\0";
-pub const PRIiFAST32: &[u8; 3usize] = b"li\0";
-pub const PRIiFAST64: &[u8; 3usize] = b"li\0";
-pub const PRIiMAX: &[u8; 3usize] = b"ji\0";
-pub const PRIiPTR: &[u8; 3usize] = b"li\0";
-pub const PRIo8: &[u8; 2usize] = b"o\0";
-pub const PRIo16: &[u8; 2usize] = b"o\0";
-pub const PRIo32: &[u8; 2usize] = b"o\0";
-pub const PRIo64: &[u8; 3usize] = b"lo\0";
-pub const PRIoLEAST8: &[u8; 2usize] = b"o\0";
-pub const PRIoLEAST16: &[u8; 2usize] = b"o\0";
-pub const PRIoLEAST32: &[u8; 2usize] = b"o\0";
-pub const PRIoLEAST64: &[u8; 3usize] = b"lo\0";
-pub const PRIoFAST8: &[u8; 2usize] = b"o\0";
-pub const PRIoFAST16: &[u8; 3usize] = b"lo\0";
-pub const PRIoFAST32: &[u8; 3usize] = b"lo\0";
-pub const PRIoFAST64: &[u8; 3usize] = b"lo\0";
-pub const PRIoMAX: &[u8; 3usize] = b"jo\0";
-pub const PRIoPTR: &[u8; 3usize] = b"lo\0";
-pub const PRIu8: &[u8; 2usize] = b"u\0";
-pub const PRIu16: &[u8; 2usize] = b"u\0";
-pub const PRIu32: &[u8; 2usize] = b"u\0";
-pub const PRIu64: &[u8; 3usize] = b"lu\0";
-pub const PRIuLEAST8: &[u8; 2usize] = b"u\0";
-pub const PRIuLEAST16: &[u8; 2usize] = b"u\0";
-pub const PRIuLEAST32: &[u8; 2usize] = b"u\0";
-pub const PRIuLEAST64: &[u8; 3usize] = b"lu\0";
-pub const PRIuFAST8: &[u8; 2usize] = b"u\0";
-pub const PRIuFAST16: &[u8; 3usize] = b"lu\0";
-pub const PRIuFAST32: &[u8; 3usize] = b"lu\0";
-pub const PRIuFAST64: &[u8; 3usize] = b"lu\0";
-pub const PRIuMAX: &[u8; 3usize] = b"ju\0";
-pub const PRIuPTR: &[u8; 3usize] = b"lu\0";
-pub const PRIx8: &[u8; 2usize] = b"x\0";
-pub const PRIx16: &[u8; 2usize] = b"x\0";
-pub const PRIx32: &[u8; 2usize] = b"x\0";
-pub const PRIx64: &[u8; 3usize] = b"lx\0";
-pub const PRIxLEAST8: &[u8; 2usize] = b"x\0";
-pub const PRIxLEAST16: &[u8; 2usize] = b"x\0";
-pub const PRIxLEAST32: &[u8; 2usize] = b"x\0";
-pub const PRIxLEAST64: &[u8; 3usize] = b"lx\0";
-pub const PRIxFAST8: &[u8; 2usize] = b"x\0";
-pub const PRIxFAST16: &[u8; 3usize] = b"lx\0";
-pub const PRIxFAST32: &[u8; 3usize] = b"lx\0";
-pub const PRIxFAST64: &[u8; 3usize] = b"lx\0";
-pub const PRIxMAX: &[u8; 3usize] = b"jx\0";
-pub const PRIxPTR: &[u8; 3usize] = b"lx\0";
-pub const PRIX8: &[u8; 2usize] = b"X\0";
-pub const PRIX16: &[u8; 2usize] = b"X\0";
-pub const PRIX32: &[u8; 2usize] = b"X\0";
-pub const PRIX64: &[u8; 3usize] = b"lX\0";
-pub const PRIXLEAST8: &[u8; 2usize] = b"X\0";
-pub const PRIXLEAST16: &[u8; 2usize] = b"X\0";
-pub const PRIXLEAST32: &[u8; 2usize] = b"X\0";
-pub const PRIXLEAST64: &[u8; 3usize] = b"lX\0";
-pub const PRIXFAST8: &[u8; 2usize] = b"X\0";
-pub const PRIXFAST16: &[u8; 3usize] = b"lX\0";
-pub const PRIXFAST32: &[u8; 3usize] = b"lX\0";
-pub const PRIXFAST64: &[u8; 3usize] = b"lX\0";
-pub const PRIXMAX: &[u8; 3usize] = b"jX\0";
-pub const PRIXPTR: &[u8; 3usize] = b"lX\0";
-pub const SCNd8: &[u8; 4usize] = b"hhd\0";
-pub const SCNd16: &[u8; 3usize] = b"hd\0";
-pub const SCNd32: &[u8; 2usize] = b"d\0";
-pub const SCNd64: &[u8; 3usize] = b"ld\0";
-pub const SCNdLEAST8: &[u8; 4usize] = b"hhd\0";
-pub const SCNdLEAST16: &[u8; 3usize] = b"hd\0";
-pub const SCNdLEAST32: &[u8; 2usize] = b"d\0";
-pub const SCNdLEAST64: &[u8; 3usize] = b"ld\0";
-pub const SCNdFAST8: &[u8; 4usize] = b"hhd\0";
-pub const SCNdFAST16: &[u8; 3usize] = b"ld\0";
-pub const SCNdFAST32: &[u8; 3usize] = b"ld\0";
-pub const SCNdFAST64: &[u8; 3usize] = b"ld\0";
-pub const SCNdMAX: &[u8; 3usize] = b"jd\0";
-pub const SCNdPTR: &[u8; 3usize] = b"ld\0";
-pub const SCNi8: &[u8; 4usize] = b"hhi\0";
-pub const SCNi16: &[u8; 3usize] = b"hi\0";
-pub const SCNi32: &[u8; 2usize] = b"i\0";
-pub const SCNi64: &[u8; 3usize] = b"li\0";
-pub const SCNiLEAST8: &[u8; 4usize] = b"hhi\0";
-pub const SCNiLEAST16: &[u8; 3usize] = b"hi\0";
-pub const SCNiLEAST32: &[u8; 2usize] = b"i\0";
-pub const SCNiLEAST64: &[u8; 3usize] = b"li\0";
-pub const SCNiFAST8: &[u8; 4usize] = b"hhi\0";
-pub const SCNiFAST16: &[u8; 3usize] = b"li\0";
-pub const SCNiFAST32: &[u8; 3usize] = b"li\0";
-pub const SCNiFAST64: &[u8; 3usize] = b"li\0";
-pub const SCNiMAX: &[u8; 3usize] = b"ji\0";
-pub const SCNiPTR: &[u8; 3usize] = b"li\0";
-pub const SCNo8: &[u8; 4usize] = b"hho\0";
-pub const SCNo16: &[u8; 3usize] = b"ho\0";
-pub const SCNo32: &[u8; 2usize] = b"o\0";
-pub const SCNo64: &[u8; 3usize] = b"lo\0";
-pub const SCNoLEAST8: &[u8; 4usize] = b"hho\0";
-pub const SCNoLEAST16: &[u8; 3usize] = b"ho\0";
-pub const SCNoLEAST32: &[u8; 2usize] = b"o\0";
-pub const SCNoLEAST64: &[u8; 3usize] = b"lo\0";
-pub const SCNoFAST8: &[u8; 4usize] = b"hho\0";
-pub const SCNoFAST16: &[u8; 3usize] = b"lo\0";
-pub const SCNoFAST32: &[u8; 3usize] = b"lo\0";
-pub const SCNoFAST64: &[u8; 3usize] = b"lo\0";
-pub const SCNoMAX: &[u8; 3usize] = b"jo\0";
-pub const SCNoPTR: &[u8; 3usize] = b"lo\0";
-pub const SCNu8: &[u8; 4usize] = b"hhu\0";
-pub const SCNu16: &[u8; 3usize] = b"hu\0";
-pub const SCNu32: &[u8; 2usize] = b"u\0";
-pub const SCNu64: &[u8; 3usize] = b"lu\0";
-pub const SCNuLEAST8: &[u8; 4usize] = b"hhu\0";
-pub const SCNuLEAST16: &[u8; 3usize] = b"hu\0";
-pub const SCNuLEAST32: &[u8; 2usize] = b"u\0";
-pub const SCNuLEAST64: &[u8; 3usize] = b"lu\0";
-pub const SCNuFAST8: &[u8; 4usize] = b"hhu\0";
-pub const SCNuFAST16: &[u8; 3usize] = b"lu\0";
-pub const SCNuFAST32: &[u8; 3usize] = b"lu\0";
-pub const SCNuFAST64: &[u8; 3usize] = b"lu\0";
-pub const SCNuMAX: &[u8; 3usize] = b"ju\0";
-pub const SCNuPTR: &[u8; 3usize] = b"lu\0";
-pub const SCNx8: &[u8; 4usize] = b"hhx\0";
-pub const SCNx16: &[u8; 3usize] = b"hx\0";
-pub const SCNx32: &[u8; 2usize] = b"x\0";
-pub const SCNx64: &[u8; 3usize] = b"lx\0";
-pub const SCNxLEAST8: &[u8; 4usize] = b"hhx\0";
-pub const SCNxLEAST16: &[u8; 3usize] = b"hx\0";
-pub const SCNxLEAST32: &[u8; 2usize] = b"x\0";
-pub const SCNxLEAST64: &[u8; 3usize] = b"lx\0";
-pub const SCNxFAST8: &[u8; 4usize] = b"hhx\0";
-pub const SCNxFAST16: &[u8; 3usize] = b"lx\0";
-pub const SCNxFAST32: &[u8; 3usize] = b"lx\0";
-pub const SCNxFAST64: &[u8; 3usize] = b"lx\0";
-pub const SCNxMAX: &[u8; 3usize] = b"jx\0";
-pub const SCNxPTR: &[u8; 3usize] = b"lx\0";
 pub const __GNUC_VA_LIST: u32 = 1;
+pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8;
 pub const true_: u32 = 1;
 pub const false_: u32 = 0;
 pub const __bool_true_false_are_defined: u32 = 1;
+pub const __PRI_64_prefix: &[u8; 2] = b"l\0";
+pub const __PRI_PTR_prefix: &[u8; 2] = b"l\0";
+pub const __PRI_FAST_prefix: &[u8; 2] = b"l\0";
+pub const PRId8: &[u8; 2] = b"d\0";
+pub const PRId16: &[u8; 2] = b"d\0";
+pub const PRId32: &[u8; 2] = b"d\0";
+pub const PRId64: &[u8; 3] = b"ld\0";
+pub const PRIdLEAST8: &[u8; 2] = b"d\0";
+pub const PRIdLEAST16: &[u8; 2] = b"d\0";
+pub const PRIdLEAST32: &[u8; 2] = b"d\0";
+pub const PRIdLEAST64: &[u8; 3] = b"ld\0";
+pub const PRIdFAST8: &[u8; 2] = b"d\0";
+pub const PRIdFAST16: &[u8; 3] = b"ld\0";
+pub const PRIdFAST32: &[u8; 3] = b"ld\0";
+pub const PRIdFAST64: &[u8; 3] = b"ld\0";
+pub const PRIdMAX: &[u8; 3] = b"jd\0";
+pub const PRIdPTR: &[u8; 3] = b"ld\0";
+pub const PRIi8: &[u8; 2] = b"i\0";
+pub const PRIi16: &[u8; 2] = b"i\0";
+pub const PRIi32: &[u8; 2] = b"i\0";
+pub const PRIi64: &[u8; 3] = b"li\0";
+pub const PRIiLEAST8: &[u8; 2] = b"i\0";
+pub const PRIiLEAST16: &[u8; 2] = b"i\0";
+pub const PRIiLEAST32: &[u8; 2] = b"i\0";
+pub const PRIiLEAST64: &[u8; 3] = b"li\0";
+pub const PRIiFAST8: &[u8; 2] = b"i\0";
+pub const PRIiFAST16: &[u8; 3] = b"li\0";
+pub const PRIiFAST32: &[u8; 3] = b"li\0";
+pub const PRIiFAST64: &[u8; 3] = b"li\0";
+pub const PRIiMAX: &[u8; 3] = b"ji\0";
+pub const PRIiPTR: &[u8; 3] = b"li\0";
+pub const PRIo8: &[u8; 2] = b"o\0";
+pub const PRIo16: &[u8; 2] = b"o\0";
+pub const PRIo32: &[u8; 2] = b"o\0";
+pub const PRIo64: &[u8; 3] = b"lo\0";
+pub const PRIoLEAST8: &[u8; 2] = b"o\0";
+pub const PRIoLEAST16: &[u8; 2] = b"o\0";
+pub const PRIoLEAST32: &[u8; 2] = b"o\0";
+pub const PRIoLEAST64: &[u8; 3] = b"lo\0";
+pub const PRIoFAST8: &[u8; 2] = b"o\0";
+pub const PRIoFAST16: &[u8; 3] = b"lo\0";
+pub const PRIoFAST32: &[u8; 3] = b"lo\0";
+pub const PRIoFAST64: &[u8; 3] = b"lo\0";
+pub const PRIoMAX: &[u8; 3] = b"jo\0";
+pub const PRIoPTR: &[u8; 3] = b"lo\0";
+pub const PRIu8: &[u8; 2] = b"u\0";
+pub const PRIu16: &[u8; 2] = b"u\0";
+pub const PRIu32: &[u8; 2] = b"u\0";
+pub const PRIu64: &[u8; 3] = b"lu\0";
+pub const PRIuLEAST8: &[u8; 2] = b"u\0";
+pub const PRIuLEAST16: &[u8; 2] = b"u\0";
+pub const PRIuLEAST32: &[u8; 2] = b"u\0";
+pub const PRIuLEAST64: &[u8; 3] = b"lu\0";
+pub const PRIuFAST8: &[u8; 2] = b"u\0";
+pub const PRIuFAST16: &[u8; 3] = b"lu\0";
+pub const PRIuFAST32: &[u8; 3] = b"lu\0";
+pub const PRIuFAST64: &[u8; 3] = b"lu\0";
+pub const PRIuMAX: &[u8; 3] = b"ju\0";
+pub const PRIuPTR: &[u8; 3] = b"lu\0";
+pub const PRIx8: &[u8; 2] = b"x\0";
+pub const PRIx16: &[u8; 2] = b"x\0";
+pub const PRIx32: &[u8; 2] = b"x\0";
+pub const PRIx64: &[u8; 3] = b"lx\0";
+pub const PRIxLEAST8: &[u8; 2] = b"x\0";
+pub const PRIxLEAST16: &[u8; 2] = b"x\0";
+pub const PRIxLEAST32: &[u8; 2] = b"x\0";
+pub const PRIxLEAST64: &[u8; 3] = b"lx\0";
+pub const PRIxFAST8: &[u8; 2] = b"x\0";
+pub const PRIxFAST16: &[u8; 3] = b"lx\0";
+pub const PRIxFAST32: &[u8; 3] = b"lx\0";
+pub const PRIxFAST64: &[u8; 3] = b"lx\0";
+pub const PRIxMAX: &[u8; 3] = b"jx\0";
+pub const PRIxPTR: &[u8; 3] = b"lx\0";
+pub const PRIX8: &[u8; 2] = b"X\0";
+pub const PRIX16: &[u8; 2] = b"X\0";
+pub const PRIX32: &[u8; 2] = b"X\0";
+pub const PRIX64: &[u8; 3] = b"lX\0";
+pub const PRIXLEAST8: &[u8; 2] = b"X\0";
+pub const PRIXLEAST16: &[u8; 2] = b"X\0";
+pub const PRIXLEAST32: &[u8; 2] = b"X\0";
+pub const PRIXLEAST64: &[u8; 3] = b"lX\0";
+pub const PRIXFAST8: &[u8; 2] = b"X\0";
+pub const PRIXFAST16: &[u8; 3] = b"lX\0";
+pub const PRIXFAST32: &[u8; 3] = b"lX\0";
+pub const PRIXFAST64: &[u8; 3] = b"lX\0";
+pub const PRIXMAX: &[u8; 3] = b"jX\0";
+pub const PRIXPTR: &[u8; 3] = b"lX\0";
+pub const SCNd8: &[u8; 4] = b"hhd\0";
+pub const SCNd16: &[u8; 3] = b"hd\0";
+pub const SCNd32: &[u8; 2] = b"d\0";
+pub const SCNd64: &[u8; 3] = b"ld\0";
+pub const SCNdLEAST8: &[u8; 4] = b"hhd\0";
+pub const SCNdLEAST16: &[u8; 3] = b"hd\0";
+pub const SCNdLEAST32: &[u8; 2] = b"d\0";
+pub const SCNdLEAST64: &[u8; 3] = b"ld\0";
+pub const SCNdFAST8: &[u8; 4] = b"hhd\0";
+pub const SCNdFAST16: &[u8; 3] = b"ld\0";
+pub const SCNdFAST32: &[u8; 3] = b"ld\0";
+pub const SCNdFAST64: &[u8; 3] = b"ld\0";
+pub const SCNdMAX: &[u8; 3] = b"jd\0";
+pub const SCNdPTR: &[u8; 3] = b"ld\0";
+pub const SCNi8: &[u8; 4] = b"hhi\0";
+pub const SCNi16: &[u8; 3] = b"hi\0";
+pub const SCNi32: &[u8; 2] = b"i\0";
+pub const SCNi64: &[u8; 3] = b"li\0";
+pub const SCNiLEAST8: &[u8; 4] = b"hhi\0";
+pub const SCNiLEAST16: &[u8; 3] = b"hi\0";
+pub const SCNiLEAST32: &[u8; 2] = b"i\0";
+pub const SCNiLEAST64: &[u8; 3] = b"li\0";
+pub const SCNiFAST8: &[u8; 4] = b"hhi\0";
+pub const SCNiFAST16: &[u8; 3] = b"li\0";
+pub const SCNiFAST32: &[u8; 3] = b"li\0";
+pub const SCNiFAST64: &[u8; 3] = b"li\0";
+pub const SCNiMAX: &[u8; 3] = b"ji\0";
+pub const SCNiPTR: &[u8; 3] = b"li\0";
+pub const SCNo8: &[u8; 4] = b"hho\0";
+pub const SCNo16: &[u8; 3] = b"ho\0";
+pub const SCNo32: &[u8; 2] = b"o\0";
+pub const SCNo64: &[u8; 3] = b"lo\0";
+pub const SCNoLEAST8: &[u8; 4] = b"hho\0";
+pub const SCNoLEAST16: &[u8; 3] = b"ho\0";
+pub const SCNoLEAST32: &[u8; 2] = b"o\0";
+pub const SCNoLEAST64: &[u8; 3] = b"lo\0";
+pub const SCNoFAST8: &[u8; 4] = b"hho\0";
+pub const SCNoFAST16: &[u8; 3] = b"lo\0";
+pub const SCNoFAST32: &[u8; 3] = b"lo\0";
+pub const SCNoFAST64: &[u8; 3] = b"lo\0";
+pub const SCNoMAX: &[u8; 3] = b"jo\0";
+pub const SCNoPTR: &[u8; 3] = b"lo\0";
+pub const SCNu8: &[u8; 4] = b"hhu\0";
+pub const SCNu16: &[u8; 3] = b"hu\0";
+pub const SCNu32: &[u8; 2] = b"u\0";
+pub const SCNu64: &[u8; 3] = b"lu\0";
+pub const SCNuLEAST8: &[u8; 4] = b"hhu\0";
+pub const SCNuLEAST16: &[u8; 3] = b"hu\0";
+pub const SCNuLEAST32: &[u8; 2] = b"u\0";
+pub const SCNuLEAST64: &[u8; 3] = b"lu\0";
+pub const SCNuFAST8: &[u8; 4] = b"hhu\0";
+pub const SCNuFAST16: &[u8; 3] = b"lu\0";
+pub const SCNuFAST32: &[u8; 3] = b"lu\0";
+pub const SCNuFAST64: &[u8; 3] = b"lu\0";
+pub const SCNuMAX: &[u8; 3] = b"ju\0";
+pub const SCNuPTR: &[u8; 3] = b"lu\0";
+pub const SCNx8: &[u8; 4] = b"hhx\0";
+pub const SCNx16: &[u8; 3] = b"hx\0";
+pub const SCNx32: &[u8; 2] = b"x\0";
+pub const SCNx64: &[u8; 3] = b"lx\0";
+pub const SCNxLEAST8: &[u8; 4] = b"hhx\0";
+pub const SCNxLEAST16: &[u8; 3] = b"hx\0";
+pub const SCNxLEAST32: &[u8; 2] = b"x\0";
+pub const SCNxLEAST64: &[u8; 3] = b"lx\0";
+pub const SCNxFAST8: &[u8; 4] = b"hhx\0";
+pub const SCNxFAST16: &[u8; 3] = b"lx\0";
+pub const SCNxFAST32: &[u8; 3] = b"lx\0";
+pub const SCNxFAST64: &[u8; 3] = b"lx\0";
+pub const SCNxMAX: &[u8; 3] = b"jx\0";
+pub const SCNxPTR: &[u8; 3] = b"lx\0";
 pub const GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT: u32 = 48;
 pub const GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT: u32 = 8;
-pub const GAMEACTIVITY_MAX_NUM_HISTORICAL_IN_MOTION_EVENT: u32 = 8;
+pub const GAMETEXTINPUT_MAJOR_VERSION: u32 = 2;
+pub const GAMETEXTINPUT_MINOR_VERSION: u32 = 0;
+pub const GAMETEXTINPUT_BUGFIX_VERSION: u32 = 0;
+pub const GAMEACTIVITY_MAJOR_VERSION: u32 = 2;
+pub const GAMEACTIVITY_MINOR_VERSION: u32 = 0;
+pub const GAMEACTIVITY_BUGFIX_VERSION: u32 = 2;
 pub const POLLIN: u32 = 1;
 pub const POLLPRI: u32 = 2;
 pub const POLLOUT: u32 = 4;
@@ -471,6 +480,8 @@ pub const __SIGRTMAX: u32 = 64;
 pub const SA_NOCLDSTOP: u32 = 1;
 pub const SA_NOCLDWAIT: u32 = 2;
 pub const SA_SIGINFO: u32 = 4;
+pub const SA_UNSUPPORTED: u32 = 1024;
+pub const SA_EXPOSE_TAGBITS: u32 = 2048;
 pub const SA_ONSTACK: u32 = 134217728;
 pub const SA_RESTART: u32 = 268435456;
 pub const SA_NODEFER: u32 = 1073741824;
@@ -526,7 +537,9 @@ pub const SEGV_PKUERR: u32 = 4;
 pub const SEGV_ACCADI: u32 = 5;
 pub const SEGV_ADIDERR: u32 = 6;
 pub const SEGV_ADIPERR: u32 = 7;
-pub const NSIGSEGV: u32 = 7;
+pub const SEGV_MTEAERR: u32 = 8;
+pub const SEGV_MTESERR: u32 = 9;
+pub const NSIGSEGV: u32 = 9;
 pub const BUS_ADRALN: u32 = 1;
 pub const BUS_ADRERR: u32 = 2;
 pub const BUS_OBJERR: u32 = 3;
@@ -538,7 +551,8 @@ pub const TRAP_TRACE: u32 = 2;
 pub const TRAP_BRANCH: u32 = 3;
 pub const TRAP_HWBKPT: u32 = 4;
 pub const TRAP_UNK: u32 = 5;
-pub const NSIGTRAP: u32 = 5;
+pub const TRAP_PERF: u32 = 6;
+pub const NSIGTRAP: u32 = 6;
 pub const CLD_EXITED: u32 = 1;
 pub const CLD_KILLED: u32 = 2;
 pub const CLD_DUMPED: u32 = 3;
@@ -554,7 +568,8 @@ pub const POLL_PRI: u32 = 5;
 pub const POLL_HUP: u32 = 6;
 pub const NSIGPOLL: u32 = 6;
 pub const SYS_SECCOMP: u32 = 1;
-pub const NSIGSYS: u32 = 1;
+pub const SYS_USER_DISPATCH: u32 = 2;
+pub const NSIGSYS: u32 = 2;
 pub const EMT_TAGOVF: u32 = 1;
 pub const NSIGEMT: u32 = 1;
 pub const SIGEV_SIGNAL: u32 = 0;
@@ -618,6 +633,12 @@ pub const CLONE_NEWUSER: u32 = 268435456;
 pub const CLONE_NEWPID: u32 = 536870912;
 pub const CLONE_NEWNET: u32 = 1073741824;
 pub const CLONE_IO: u32 = 2147483648;
+pub const CLONE_CLEAR_SIGHAND: u64 = 4294967296;
+pub const CLONE_INTO_CGROUP: u64 = 8589934592;
+pub const CLONE_NEWTIME: u32 = 128;
+pub const CLONE_ARGS_SIZE_VER0: u32 = 64;
+pub const CLONE_ARGS_SIZE_VER1: u32 = 80;
+pub const CLONE_ARGS_SIZE_VER2: u32 = 88;
 pub const SCHED_NORMAL: u32 = 0;
 pub const SCHED_FIFO: u32 = 1;
 pub const SCHED_RR: u32 = 2;
@@ -649,9 +670,6 @@ pub const PTHREAD_PROCESS_PRIVATE: u32 = 0;
 pub const PTHREAD_PROCESS_SHARED: u32 = 1;
 pub const PTHREAD_SCOPE_SYSTEM: u32 = 0;
 pub const PTHREAD_SCOPE_PROCESS: u32 = 1;
-pub const NATIVE_APP_GLUE_MAX_NUM_MOTION_EVENTS: u32 = 16;
-pub const NATIVE_APP_GLUE_MAX_HISTORICAL_POINTER_SAMPLES: u32 = 64;
-pub const NATIVE_APP_GLUE_MAX_NUM_KEY_EVENTS: u32 = 4;
 pub const NATIVE_APP_GLUE_MAX_INPUT_BUFFERS: u32 = 2;
 extern "C" {
     pub fn android_get_application_target_sdk_version() -> ::std::os::raw::c_int;
@@ -670,6 +688,8 @@ pub struct max_align_t {
 }
 #[test]
 fn bindgen_test_layout_max_align_t() {
+    const UNINIT: ::std::mem::MaybeUninit<max_align_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<max_align_t>(),
         32usize,
@@ -681,9 +701,7 @@ fn bindgen_test_layout_max_align_t() {
         concat!("Alignment of ", stringify!(max_align_t))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<max_align_t>())).__clang_max_align_nonce1 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce1) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -693,9 +711,7 @@ fn bindgen_test_layout_max_align_t() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<max_align_t>())).__clang_max_align_nonce2 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce2) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -748,6 +764,8 @@ pub struct __kernel_fd_set {
 }
 #[test]
 fn bindgen_test_layout___kernel_fd_set() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_fd_set> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_fd_set>(),
         128usize,
@@ -759,7 +777,7 @@ fn bindgen_test_layout___kernel_fd_set() {
         concat!("Alignment of ", stringify!(__kernel_fd_set))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_fd_set>())).fds_bits as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -798,6 +816,8 @@ pub struct __kernel_fsid_t {
 }
 #[test]
 fn bindgen_test_layout___kernel_fsid_t() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_fsid_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_fsid_t>(),
         8usize,
@@ -809,7 +829,7 @@ fn bindgen_test_layout___kernel_fsid_t() {
         concat!("Alignment of ", stringify!(__kernel_fsid_t))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_fsid_t>())).val as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).val) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -821,6 +841,7 @@ fn bindgen_test_layout___kernel_fsid_t() {
 }
 pub type __kernel_off_t = __kernel_long_t;
 pub type __kernel_loff_t = ::std::os::raw::c_longlong;
+pub type __kernel_old_time_t = __kernel_long_t;
 pub type __kernel_time_t = __kernel_long_t;
 pub type __kernel_time64_t = ::std::os::raw::c_longlong;
 pub type __kernel_clock_t = __kernel_long_t;
@@ -879,7 +900,6 @@ pub type off64_t = loff_t;
 pub type __socklen_t = u32;
 pub type socklen_t = __socklen_t;
 pub type __va_list = [u64; 4usize];
-pub type ssize_t = __kernel_ssize_t;
 pub type uint_t = ::std::os::raw::c_uint;
 pub type uint = ::std::os::raw::c_uint;
 pub type u_char = ::std::os::raw::c_uchar;
@@ -890,483 +910,651 @@ pub type u_int32_t = u32;
 pub type u_int16_t = u16;
 pub type u_int8_t = u8;
 pub type u_int64_t = u64;
-pub const AASSET_MODE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AASSET_MODE_RANDOM: ::std::os::raw::c_uint = 1;
-pub const AASSET_MODE_STREAMING: ::std::os::raw::c_uint = 2;
-pub const AASSET_MODE_BUFFER: ::std::os::raw::c_uint = 3;
+pub const AASSET_MODE_UNKNOWN: _bindgen_ty_1 = 0;
+pub const AASSET_MODE_RANDOM: _bindgen_ty_1 = 1;
+pub const AASSET_MODE_STREAMING: _bindgen_ty_1 = 2;
+pub const AASSET_MODE_BUFFER: _bindgen_ty_1 = 3;
 pub type _bindgen_ty_1 = ::std::os::raw::c_uint;
-pub const AKEYCODE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AKEYCODE_SOFT_LEFT: ::std::os::raw::c_uint = 1;
-pub const AKEYCODE_SOFT_RIGHT: ::std::os::raw::c_uint = 2;
-pub const AKEYCODE_HOME: ::std::os::raw::c_uint = 3;
-pub const AKEYCODE_BACK: ::std::os::raw::c_uint = 4;
-pub const AKEYCODE_CALL: ::std::os::raw::c_uint = 5;
-pub const AKEYCODE_ENDCALL: ::std::os::raw::c_uint = 6;
-pub const AKEYCODE_0: ::std::os::raw::c_uint = 7;
-pub const AKEYCODE_1: ::std::os::raw::c_uint = 8;
-pub const AKEYCODE_2: ::std::os::raw::c_uint = 9;
-pub const AKEYCODE_3: ::std::os::raw::c_uint = 10;
-pub const AKEYCODE_4: ::std::os::raw::c_uint = 11;
-pub const AKEYCODE_5: ::std::os::raw::c_uint = 12;
-pub const AKEYCODE_6: ::std::os::raw::c_uint = 13;
-pub const AKEYCODE_7: ::std::os::raw::c_uint = 14;
-pub const AKEYCODE_8: ::std::os::raw::c_uint = 15;
-pub const AKEYCODE_9: ::std::os::raw::c_uint = 16;
-pub const AKEYCODE_STAR: ::std::os::raw::c_uint = 17;
-pub const AKEYCODE_POUND: ::std::os::raw::c_uint = 18;
-pub const AKEYCODE_DPAD_UP: ::std::os::raw::c_uint = 19;
-pub const AKEYCODE_DPAD_DOWN: ::std::os::raw::c_uint = 20;
-pub const AKEYCODE_DPAD_LEFT: ::std::os::raw::c_uint = 21;
-pub const AKEYCODE_DPAD_RIGHT: ::std::os::raw::c_uint = 22;
-pub const AKEYCODE_DPAD_CENTER: ::std::os::raw::c_uint = 23;
-pub const AKEYCODE_VOLUME_UP: ::std::os::raw::c_uint = 24;
-pub const AKEYCODE_VOLUME_DOWN: ::std::os::raw::c_uint = 25;
-pub const AKEYCODE_POWER: ::std::os::raw::c_uint = 26;
-pub const AKEYCODE_CAMERA: ::std::os::raw::c_uint = 27;
-pub const AKEYCODE_CLEAR: ::std::os::raw::c_uint = 28;
-pub const AKEYCODE_A: ::std::os::raw::c_uint = 29;
-pub const AKEYCODE_B: ::std::os::raw::c_uint = 30;
-pub const AKEYCODE_C: ::std::os::raw::c_uint = 31;
-pub const AKEYCODE_D: ::std::os::raw::c_uint = 32;
-pub const AKEYCODE_E: ::std::os::raw::c_uint = 33;
-pub const AKEYCODE_F: ::std::os::raw::c_uint = 34;
-pub const AKEYCODE_G: ::std::os::raw::c_uint = 35;
-pub const AKEYCODE_H: ::std::os::raw::c_uint = 36;
-pub const AKEYCODE_I: ::std::os::raw::c_uint = 37;
-pub const AKEYCODE_J: ::std::os::raw::c_uint = 38;
-pub const AKEYCODE_K: ::std::os::raw::c_uint = 39;
-pub const AKEYCODE_L: ::std::os::raw::c_uint = 40;
-pub const AKEYCODE_M: ::std::os::raw::c_uint = 41;
-pub const AKEYCODE_N: ::std::os::raw::c_uint = 42;
-pub const AKEYCODE_O: ::std::os::raw::c_uint = 43;
-pub const AKEYCODE_P: ::std::os::raw::c_uint = 44;
-pub const AKEYCODE_Q: ::std::os::raw::c_uint = 45;
-pub const AKEYCODE_R: ::std::os::raw::c_uint = 46;
-pub const AKEYCODE_S: ::std::os::raw::c_uint = 47;
-pub const AKEYCODE_T: ::std::os::raw::c_uint = 48;
-pub const AKEYCODE_U: ::std::os::raw::c_uint = 49;
-pub const AKEYCODE_V: ::std::os::raw::c_uint = 50;
-pub const AKEYCODE_W: ::std::os::raw::c_uint = 51;
-pub const AKEYCODE_X: ::std::os::raw::c_uint = 52;
-pub const AKEYCODE_Y: ::std::os::raw::c_uint = 53;
-pub const AKEYCODE_Z: ::std::os::raw::c_uint = 54;
-pub const AKEYCODE_COMMA: ::std::os::raw::c_uint = 55;
-pub const AKEYCODE_PERIOD: ::std::os::raw::c_uint = 56;
-pub const AKEYCODE_ALT_LEFT: ::std::os::raw::c_uint = 57;
-pub const AKEYCODE_ALT_RIGHT: ::std::os::raw::c_uint = 58;
-pub const AKEYCODE_SHIFT_LEFT: ::std::os::raw::c_uint = 59;
-pub const AKEYCODE_SHIFT_RIGHT: ::std::os::raw::c_uint = 60;
-pub const AKEYCODE_TAB: ::std::os::raw::c_uint = 61;
-pub const AKEYCODE_SPACE: ::std::os::raw::c_uint = 62;
-pub const AKEYCODE_SYM: ::std::os::raw::c_uint = 63;
-pub const AKEYCODE_EXPLORER: ::std::os::raw::c_uint = 64;
-pub const AKEYCODE_ENVELOPE: ::std::os::raw::c_uint = 65;
-pub const AKEYCODE_ENTER: ::std::os::raw::c_uint = 66;
-pub const AKEYCODE_DEL: ::std::os::raw::c_uint = 67;
-pub const AKEYCODE_GRAVE: ::std::os::raw::c_uint = 68;
-pub const AKEYCODE_MINUS: ::std::os::raw::c_uint = 69;
-pub const AKEYCODE_EQUALS: ::std::os::raw::c_uint = 70;
-pub const AKEYCODE_LEFT_BRACKET: ::std::os::raw::c_uint = 71;
-pub const AKEYCODE_RIGHT_BRACKET: ::std::os::raw::c_uint = 72;
-pub const AKEYCODE_BACKSLASH: ::std::os::raw::c_uint = 73;
-pub const AKEYCODE_SEMICOLON: ::std::os::raw::c_uint = 74;
-pub const AKEYCODE_APOSTROPHE: ::std::os::raw::c_uint = 75;
-pub const AKEYCODE_SLASH: ::std::os::raw::c_uint = 76;
-pub const AKEYCODE_AT: ::std::os::raw::c_uint = 77;
-pub const AKEYCODE_NUM: ::std::os::raw::c_uint = 78;
-pub const AKEYCODE_HEADSETHOOK: ::std::os::raw::c_uint = 79;
-pub const AKEYCODE_FOCUS: ::std::os::raw::c_uint = 80;
-pub const AKEYCODE_PLUS: ::std::os::raw::c_uint = 81;
-pub const AKEYCODE_MENU: ::std::os::raw::c_uint = 82;
-pub const AKEYCODE_NOTIFICATION: ::std::os::raw::c_uint = 83;
-pub const AKEYCODE_SEARCH: ::std::os::raw::c_uint = 84;
-pub const AKEYCODE_MEDIA_PLAY_PAUSE: ::std::os::raw::c_uint = 85;
-pub const AKEYCODE_MEDIA_STOP: ::std::os::raw::c_uint = 86;
-pub const AKEYCODE_MEDIA_NEXT: ::std::os::raw::c_uint = 87;
-pub const AKEYCODE_MEDIA_PREVIOUS: ::std::os::raw::c_uint = 88;
-pub const AKEYCODE_MEDIA_REWIND: ::std::os::raw::c_uint = 89;
-pub const AKEYCODE_MEDIA_FAST_FORWARD: ::std::os::raw::c_uint = 90;
-pub const AKEYCODE_MUTE: ::std::os::raw::c_uint = 91;
-pub const AKEYCODE_PAGE_UP: ::std::os::raw::c_uint = 92;
-pub const AKEYCODE_PAGE_DOWN: ::std::os::raw::c_uint = 93;
-pub const AKEYCODE_PICTSYMBOLS: ::std::os::raw::c_uint = 94;
-pub const AKEYCODE_SWITCH_CHARSET: ::std::os::raw::c_uint = 95;
-pub const AKEYCODE_BUTTON_A: ::std::os::raw::c_uint = 96;
-pub const AKEYCODE_BUTTON_B: ::std::os::raw::c_uint = 97;
-pub const AKEYCODE_BUTTON_C: ::std::os::raw::c_uint = 98;
-pub const AKEYCODE_BUTTON_X: ::std::os::raw::c_uint = 99;
-pub const AKEYCODE_BUTTON_Y: ::std::os::raw::c_uint = 100;
-pub const AKEYCODE_BUTTON_Z: ::std::os::raw::c_uint = 101;
-pub const AKEYCODE_BUTTON_L1: ::std::os::raw::c_uint = 102;
-pub const AKEYCODE_BUTTON_R1: ::std::os::raw::c_uint = 103;
-pub const AKEYCODE_BUTTON_L2: ::std::os::raw::c_uint = 104;
-pub const AKEYCODE_BUTTON_R2: ::std::os::raw::c_uint = 105;
-pub const AKEYCODE_BUTTON_THUMBL: ::std::os::raw::c_uint = 106;
-pub const AKEYCODE_BUTTON_THUMBR: ::std::os::raw::c_uint = 107;
-pub const AKEYCODE_BUTTON_START: ::std::os::raw::c_uint = 108;
-pub const AKEYCODE_BUTTON_SELECT: ::std::os::raw::c_uint = 109;
-pub const AKEYCODE_BUTTON_MODE: ::std::os::raw::c_uint = 110;
-pub const AKEYCODE_ESCAPE: ::std::os::raw::c_uint = 111;
-pub const AKEYCODE_FORWARD_DEL: ::std::os::raw::c_uint = 112;
-pub const AKEYCODE_CTRL_LEFT: ::std::os::raw::c_uint = 113;
-pub const AKEYCODE_CTRL_RIGHT: ::std::os::raw::c_uint = 114;
-pub const AKEYCODE_CAPS_LOCK: ::std::os::raw::c_uint = 115;
-pub const AKEYCODE_SCROLL_LOCK: ::std::os::raw::c_uint = 116;
-pub const AKEYCODE_META_LEFT: ::std::os::raw::c_uint = 117;
-pub const AKEYCODE_META_RIGHT: ::std::os::raw::c_uint = 118;
-pub const AKEYCODE_FUNCTION: ::std::os::raw::c_uint = 119;
-pub const AKEYCODE_SYSRQ: ::std::os::raw::c_uint = 120;
-pub const AKEYCODE_BREAK: ::std::os::raw::c_uint = 121;
-pub const AKEYCODE_MOVE_HOME: ::std::os::raw::c_uint = 122;
-pub const AKEYCODE_MOVE_END: ::std::os::raw::c_uint = 123;
-pub const AKEYCODE_INSERT: ::std::os::raw::c_uint = 124;
-pub const AKEYCODE_FORWARD: ::std::os::raw::c_uint = 125;
-pub const AKEYCODE_MEDIA_PLAY: ::std::os::raw::c_uint = 126;
-pub const AKEYCODE_MEDIA_PAUSE: ::std::os::raw::c_uint = 127;
-pub const AKEYCODE_MEDIA_CLOSE: ::std::os::raw::c_uint = 128;
-pub const AKEYCODE_MEDIA_EJECT: ::std::os::raw::c_uint = 129;
-pub const AKEYCODE_MEDIA_RECORD: ::std::os::raw::c_uint = 130;
-pub const AKEYCODE_F1: ::std::os::raw::c_uint = 131;
-pub const AKEYCODE_F2: ::std::os::raw::c_uint = 132;
-pub const AKEYCODE_F3: ::std::os::raw::c_uint = 133;
-pub const AKEYCODE_F4: ::std::os::raw::c_uint = 134;
-pub const AKEYCODE_F5: ::std::os::raw::c_uint = 135;
-pub const AKEYCODE_F6: ::std::os::raw::c_uint = 136;
-pub const AKEYCODE_F7: ::std::os::raw::c_uint = 137;
-pub const AKEYCODE_F8: ::std::os::raw::c_uint = 138;
-pub const AKEYCODE_F9: ::std::os::raw::c_uint = 139;
-pub const AKEYCODE_F10: ::std::os::raw::c_uint = 140;
-pub const AKEYCODE_F11: ::std::os::raw::c_uint = 141;
-pub const AKEYCODE_F12: ::std::os::raw::c_uint = 142;
-pub const AKEYCODE_NUM_LOCK: ::std::os::raw::c_uint = 143;
-pub const AKEYCODE_NUMPAD_0: ::std::os::raw::c_uint = 144;
-pub const AKEYCODE_NUMPAD_1: ::std::os::raw::c_uint = 145;
-pub const AKEYCODE_NUMPAD_2: ::std::os::raw::c_uint = 146;
-pub const AKEYCODE_NUMPAD_3: ::std::os::raw::c_uint = 147;
-pub const AKEYCODE_NUMPAD_4: ::std::os::raw::c_uint = 148;
-pub const AKEYCODE_NUMPAD_5: ::std::os::raw::c_uint = 149;
-pub const AKEYCODE_NUMPAD_6: ::std::os::raw::c_uint = 150;
-pub const AKEYCODE_NUMPAD_7: ::std::os::raw::c_uint = 151;
-pub const AKEYCODE_NUMPAD_8: ::std::os::raw::c_uint = 152;
-pub const AKEYCODE_NUMPAD_9: ::std::os::raw::c_uint = 153;
-pub const AKEYCODE_NUMPAD_DIVIDE: ::std::os::raw::c_uint = 154;
-pub const AKEYCODE_NUMPAD_MULTIPLY: ::std::os::raw::c_uint = 155;
-pub const AKEYCODE_NUMPAD_SUBTRACT: ::std::os::raw::c_uint = 156;
-pub const AKEYCODE_NUMPAD_ADD: ::std::os::raw::c_uint = 157;
-pub const AKEYCODE_NUMPAD_DOT: ::std::os::raw::c_uint = 158;
-pub const AKEYCODE_NUMPAD_COMMA: ::std::os::raw::c_uint = 159;
-pub const AKEYCODE_NUMPAD_ENTER: ::std::os::raw::c_uint = 160;
-pub const AKEYCODE_NUMPAD_EQUALS: ::std::os::raw::c_uint = 161;
-pub const AKEYCODE_NUMPAD_LEFT_PAREN: ::std::os::raw::c_uint = 162;
-pub const AKEYCODE_NUMPAD_RIGHT_PAREN: ::std::os::raw::c_uint = 163;
-pub const AKEYCODE_VOLUME_MUTE: ::std::os::raw::c_uint = 164;
-pub const AKEYCODE_INFO: ::std::os::raw::c_uint = 165;
-pub const AKEYCODE_CHANNEL_UP: ::std::os::raw::c_uint = 166;
-pub const AKEYCODE_CHANNEL_DOWN: ::std::os::raw::c_uint = 167;
-pub const AKEYCODE_ZOOM_IN: ::std::os::raw::c_uint = 168;
-pub const AKEYCODE_ZOOM_OUT: ::std::os::raw::c_uint = 169;
-pub const AKEYCODE_TV: ::std::os::raw::c_uint = 170;
-pub const AKEYCODE_WINDOW: ::std::os::raw::c_uint = 171;
-pub const AKEYCODE_GUIDE: ::std::os::raw::c_uint = 172;
-pub const AKEYCODE_DVR: ::std::os::raw::c_uint = 173;
-pub const AKEYCODE_BOOKMARK: ::std::os::raw::c_uint = 174;
-pub const AKEYCODE_CAPTIONS: ::std::os::raw::c_uint = 175;
-pub const AKEYCODE_SETTINGS: ::std::os::raw::c_uint = 176;
-pub const AKEYCODE_TV_POWER: ::std::os::raw::c_uint = 177;
-pub const AKEYCODE_TV_INPUT: ::std::os::raw::c_uint = 178;
-pub const AKEYCODE_STB_POWER: ::std::os::raw::c_uint = 179;
-pub const AKEYCODE_STB_INPUT: ::std::os::raw::c_uint = 180;
-pub const AKEYCODE_AVR_POWER: ::std::os::raw::c_uint = 181;
-pub const AKEYCODE_AVR_INPUT: ::std::os::raw::c_uint = 182;
-pub const AKEYCODE_PROG_RED: ::std::os::raw::c_uint = 183;
-pub const AKEYCODE_PROG_GREEN: ::std::os::raw::c_uint = 184;
-pub const AKEYCODE_PROG_YELLOW: ::std::os::raw::c_uint = 185;
-pub const AKEYCODE_PROG_BLUE: ::std::os::raw::c_uint = 186;
-pub const AKEYCODE_APP_SWITCH: ::std::os::raw::c_uint = 187;
-pub const AKEYCODE_BUTTON_1: ::std::os::raw::c_uint = 188;
-pub const AKEYCODE_BUTTON_2: ::std::os::raw::c_uint = 189;
-pub const AKEYCODE_BUTTON_3: ::std::os::raw::c_uint = 190;
-pub const AKEYCODE_BUTTON_4: ::std::os::raw::c_uint = 191;
-pub const AKEYCODE_BUTTON_5: ::std::os::raw::c_uint = 192;
-pub const AKEYCODE_BUTTON_6: ::std::os::raw::c_uint = 193;
-pub const AKEYCODE_BUTTON_7: ::std::os::raw::c_uint = 194;
-pub const AKEYCODE_BUTTON_8: ::std::os::raw::c_uint = 195;
-pub const AKEYCODE_BUTTON_9: ::std::os::raw::c_uint = 196;
-pub const AKEYCODE_BUTTON_10: ::std::os::raw::c_uint = 197;
-pub const AKEYCODE_BUTTON_11: ::std::os::raw::c_uint = 198;
-pub const AKEYCODE_BUTTON_12: ::std::os::raw::c_uint = 199;
-pub const AKEYCODE_BUTTON_13: ::std::os::raw::c_uint = 200;
-pub const AKEYCODE_BUTTON_14: ::std::os::raw::c_uint = 201;
-pub const AKEYCODE_BUTTON_15: ::std::os::raw::c_uint = 202;
-pub const AKEYCODE_BUTTON_16: ::std::os::raw::c_uint = 203;
-pub const AKEYCODE_LANGUAGE_SWITCH: ::std::os::raw::c_uint = 204;
-pub const AKEYCODE_MANNER_MODE: ::std::os::raw::c_uint = 205;
-pub const AKEYCODE_3D_MODE: ::std::os::raw::c_uint = 206;
-pub const AKEYCODE_CONTACTS: ::std::os::raw::c_uint = 207;
-pub const AKEYCODE_CALENDAR: ::std::os::raw::c_uint = 208;
-pub const AKEYCODE_MUSIC: ::std::os::raw::c_uint = 209;
-pub const AKEYCODE_CALCULATOR: ::std::os::raw::c_uint = 210;
-pub const AKEYCODE_ZENKAKU_HANKAKU: ::std::os::raw::c_uint = 211;
-pub const AKEYCODE_EISU: ::std::os::raw::c_uint = 212;
-pub const AKEYCODE_MUHENKAN: ::std::os::raw::c_uint = 213;
-pub const AKEYCODE_HENKAN: ::std::os::raw::c_uint = 214;
-pub const AKEYCODE_KATAKANA_HIRAGANA: ::std::os::raw::c_uint = 215;
-pub const AKEYCODE_YEN: ::std::os::raw::c_uint = 216;
-pub const AKEYCODE_RO: ::std::os::raw::c_uint = 217;
-pub const AKEYCODE_KANA: ::std::os::raw::c_uint = 218;
-pub const AKEYCODE_ASSIST: ::std::os::raw::c_uint = 219;
-pub const AKEYCODE_BRIGHTNESS_DOWN: ::std::os::raw::c_uint = 220;
-pub const AKEYCODE_BRIGHTNESS_UP: ::std::os::raw::c_uint = 221;
-pub const AKEYCODE_MEDIA_AUDIO_TRACK: ::std::os::raw::c_uint = 222;
-pub const AKEYCODE_SLEEP: ::std::os::raw::c_uint = 223;
-pub const AKEYCODE_WAKEUP: ::std::os::raw::c_uint = 224;
-pub const AKEYCODE_PAIRING: ::std::os::raw::c_uint = 225;
-pub const AKEYCODE_MEDIA_TOP_MENU: ::std::os::raw::c_uint = 226;
-pub const AKEYCODE_11: ::std::os::raw::c_uint = 227;
-pub const AKEYCODE_12: ::std::os::raw::c_uint = 228;
-pub const AKEYCODE_LAST_CHANNEL: ::std::os::raw::c_uint = 229;
-pub const AKEYCODE_TV_DATA_SERVICE: ::std::os::raw::c_uint = 230;
-pub const AKEYCODE_VOICE_ASSIST: ::std::os::raw::c_uint = 231;
-pub const AKEYCODE_TV_RADIO_SERVICE: ::std::os::raw::c_uint = 232;
-pub const AKEYCODE_TV_TELETEXT: ::std::os::raw::c_uint = 233;
-pub const AKEYCODE_TV_NUMBER_ENTRY: ::std::os::raw::c_uint = 234;
-pub const AKEYCODE_TV_TERRESTRIAL_ANALOG: ::std::os::raw::c_uint = 235;
-pub const AKEYCODE_TV_TERRESTRIAL_DIGITAL: ::std::os::raw::c_uint = 236;
-pub const AKEYCODE_TV_SATELLITE: ::std::os::raw::c_uint = 237;
-pub const AKEYCODE_TV_SATELLITE_BS: ::std::os::raw::c_uint = 238;
-pub const AKEYCODE_TV_SATELLITE_CS: ::std::os::raw::c_uint = 239;
-pub const AKEYCODE_TV_SATELLITE_SERVICE: ::std::os::raw::c_uint = 240;
-pub const AKEYCODE_TV_NETWORK: ::std::os::raw::c_uint = 241;
-pub const AKEYCODE_TV_ANTENNA_CABLE: ::std::os::raw::c_uint = 242;
-pub const AKEYCODE_TV_INPUT_HDMI_1: ::std::os::raw::c_uint = 243;
-pub const AKEYCODE_TV_INPUT_HDMI_2: ::std::os::raw::c_uint = 244;
-pub const AKEYCODE_TV_INPUT_HDMI_3: ::std::os::raw::c_uint = 245;
-pub const AKEYCODE_TV_INPUT_HDMI_4: ::std::os::raw::c_uint = 246;
-pub const AKEYCODE_TV_INPUT_COMPOSITE_1: ::std::os::raw::c_uint = 247;
-pub const AKEYCODE_TV_INPUT_COMPOSITE_2: ::std::os::raw::c_uint = 248;
-pub const AKEYCODE_TV_INPUT_COMPONENT_1: ::std::os::raw::c_uint = 249;
-pub const AKEYCODE_TV_INPUT_COMPONENT_2: ::std::os::raw::c_uint = 250;
-pub const AKEYCODE_TV_INPUT_VGA_1: ::std::os::raw::c_uint = 251;
-pub const AKEYCODE_TV_AUDIO_DESCRIPTION: ::std::os::raw::c_uint = 252;
-pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP: ::std::os::raw::c_uint = 253;
-pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN: ::std::os::raw::c_uint = 254;
-pub const AKEYCODE_TV_ZOOM_MODE: ::std::os::raw::c_uint = 255;
-pub const AKEYCODE_TV_CONTENTS_MENU: ::std::os::raw::c_uint = 256;
-pub const AKEYCODE_TV_MEDIA_CONTEXT_MENU: ::std::os::raw::c_uint = 257;
-pub const AKEYCODE_TV_TIMER_PROGRAMMING: ::std::os::raw::c_uint = 258;
-pub const AKEYCODE_HELP: ::std::os::raw::c_uint = 259;
-pub const AKEYCODE_NAVIGATE_PREVIOUS: ::std::os::raw::c_uint = 260;
-pub const AKEYCODE_NAVIGATE_NEXT: ::std::os::raw::c_uint = 261;
-pub const AKEYCODE_NAVIGATE_IN: ::std::os::raw::c_uint = 262;
-pub const AKEYCODE_NAVIGATE_OUT: ::std::os::raw::c_uint = 263;
-pub const AKEYCODE_STEM_PRIMARY: ::std::os::raw::c_uint = 264;
-pub const AKEYCODE_STEM_1: ::std::os::raw::c_uint = 265;
-pub const AKEYCODE_STEM_2: ::std::os::raw::c_uint = 266;
-pub const AKEYCODE_STEM_3: ::std::os::raw::c_uint = 267;
-pub const AKEYCODE_DPAD_UP_LEFT: ::std::os::raw::c_uint = 268;
-pub const AKEYCODE_DPAD_DOWN_LEFT: ::std::os::raw::c_uint = 269;
-pub const AKEYCODE_DPAD_UP_RIGHT: ::std::os::raw::c_uint = 270;
-pub const AKEYCODE_DPAD_DOWN_RIGHT: ::std::os::raw::c_uint = 271;
-pub const AKEYCODE_MEDIA_SKIP_FORWARD: ::std::os::raw::c_uint = 272;
-pub const AKEYCODE_MEDIA_SKIP_BACKWARD: ::std::os::raw::c_uint = 273;
-pub const AKEYCODE_MEDIA_STEP_FORWARD: ::std::os::raw::c_uint = 274;
-pub const AKEYCODE_MEDIA_STEP_BACKWARD: ::std::os::raw::c_uint = 275;
-pub const AKEYCODE_SOFT_SLEEP: ::std::os::raw::c_uint = 276;
-pub const AKEYCODE_CUT: ::std::os::raw::c_uint = 277;
-pub const AKEYCODE_COPY: ::std::os::raw::c_uint = 278;
-pub const AKEYCODE_PASTE: ::std::os::raw::c_uint = 279;
-pub const AKEYCODE_SYSTEM_NAVIGATION_UP: ::std::os::raw::c_uint = 280;
-pub const AKEYCODE_SYSTEM_NAVIGATION_DOWN: ::std::os::raw::c_uint = 281;
-pub const AKEYCODE_SYSTEM_NAVIGATION_LEFT: ::std::os::raw::c_uint = 282;
-pub const AKEYCODE_SYSTEM_NAVIGATION_RIGHT: ::std::os::raw::c_uint = 283;
-pub const AKEYCODE_ALL_APPS: ::std::os::raw::c_uint = 284;
-pub const AKEYCODE_REFRESH: ::std::os::raw::c_uint = 285;
-pub const AKEYCODE_THUMBS_UP: ::std::os::raw::c_uint = 286;
-pub const AKEYCODE_THUMBS_DOWN: ::std::os::raw::c_uint = 287;
-pub const AKEYCODE_PROFILE_SWITCH: ::std::os::raw::c_uint = 288;
+pub const AKEYCODE_UNKNOWN: _bindgen_ty_2 = 0;
+pub const AKEYCODE_SOFT_LEFT: _bindgen_ty_2 = 1;
+pub const AKEYCODE_SOFT_RIGHT: _bindgen_ty_2 = 2;
+pub const AKEYCODE_HOME: _bindgen_ty_2 = 3;
+pub const AKEYCODE_BACK: _bindgen_ty_2 = 4;
+pub const AKEYCODE_CALL: _bindgen_ty_2 = 5;
+pub const AKEYCODE_ENDCALL: _bindgen_ty_2 = 6;
+pub const AKEYCODE_0: _bindgen_ty_2 = 7;
+pub const AKEYCODE_1: _bindgen_ty_2 = 8;
+pub const AKEYCODE_2: _bindgen_ty_2 = 9;
+pub const AKEYCODE_3: _bindgen_ty_2 = 10;
+pub const AKEYCODE_4: _bindgen_ty_2 = 11;
+pub const AKEYCODE_5: _bindgen_ty_2 = 12;
+pub const AKEYCODE_6: _bindgen_ty_2 = 13;
+pub const AKEYCODE_7: _bindgen_ty_2 = 14;
+pub const AKEYCODE_8: _bindgen_ty_2 = 15;
+pub const AKEYCODE_9: _bindgen_ty_2 = 16;
+pub const AKEYCODE_STAR: _bindgen_ty_2 = 17;
+pub const AKEYCODE_POUND: _bindgen_ty_2 = 18;
+pub const AKEYCODE_DPAD_UP: _bindgen_ty_2 = 19;
+pub const AKEYCODE_DPAD_DOWN: _bindgen_ty_2 = 20;
+pub const AKEYCODE_DPAD_LEFT: _bindgen_ty_2 = 21;
+pub const AKEYCODE_DPAD_RIGHT: _bindgen_ty_2 = 22;
+pub const AKEYCODE_DPAD_CENTER: _bindgen_ty_2 = 23;
+pub const AKEYCODE_VOLUME_UP: _bindgen_ty_2 = 24;
+pub const AKEYCODE_VOLUME_DOWN: _bindgen_ty_2 = 25;
+pub const AKEYCODE_POWER: _bindgen_ty_2 = 26;
+pub const AKEYCODE_CAMERA: _bindgen_ty_2 = 27;
+pub const AKEYCODE_CLEAR: _bindgen_ty_2 = 28;
+pub const AKEYCODE_A: _bindgen_ty_2 = 29;
+pub const AKEYCODE_B: _bindgen_ty_2 = 30;
+pub const AKEYCODE_C: _bindgen_ty_2 = 31;
+pub const AKEYCODE_D: _bindgen_ty_2 = 32;
+pub const AKEYCODE_E: _bindgen_ty_2 = 33;
+pub const AKEYCODE_F: _bindgen_ty_2 = 34;
+pub const AKEYCODE_G: _bindgen_ty_2 = 35;
+pub const AKEYCODE_H: _bindgen_ty_2 = 36;
+pub const AKEYCODE_I: _bindgen_ty_2 = 37;
+pub const AKEYCODE_J: _bindgen_ty_2 = 38;
+pub const AKEYCODE_K: _bindgen_ty_2 = 39;
+pub const AKEYCODE_L: _bindgen_ty_2 = 40;
+pub const AKEYCODE_M: _bindgen_ty_2 = 41;
+pub const AKEYCODE_N: _bindgen_ty_2 = 42;
+pub const AKEYCODE_O: _bindgen_ty_2 = 43;
+pub const AKEYCODE_P: _bindgen_ty_2 = 44;
+pub const AKEYCODE_Q: _bindgen_ty_2 = 45;
+pub const AKEYCODE_R: _bindgen_ty_2 = 46;
+pub const AKEYCODE_S: _bindgen_ty_2 = 47;
+pub const AKEYCODE_T: _bindgen_ty_2 = 48;
+pub const AKEYCODE_U: _bindgen_ty_2 = 49;
+pub const AKEYCODE_V: _bindgen_ty_2 = 50;
+pub const AKEYCODE_W: _bindgen_ty_2 = 51;
+pub const AKEYCODE_X: _bindgen_ty_2 = 52;
+pub const AKEYCODE_Y: _bindgen_ty_2 = 53;
+pub const AKEYCODE_Z: _bindgen_ty_2 = 54;
+pub const AKEYCODE_COMMA: _bindgen_ty_2 = 55;
+pub const AKEYCODE_PERIOD: _bindgen_ty_2 = 56;
+pub const AKEYCODE_ALT_LEFT: _bindgen_ty_2 = 57;
+pub const AKEYCODE_ALT_RIGHT: _bindgen_ty_2 = 58;
+pub const AKEYCODE_SHIFT_LEFT: _bindgen_ty_2 = 59;
+pub const AKEYCODE_SHIFT_RIGHT: _bindgen_ty_2 = 60;
+pub const AKEYCODE_TAB: _bindgen_ty_2 = 61;
+pub const AKEYCODE_SPACE: _bindgen_ty_2 = 62;
+pub const AKEYCODE_SYM: _bindgen_ty_2 = 63;
+pub const AKEYCODE_EXPLORER: _bindgen_ty_2 = 64;
+pub const AKEYCODE_ENVELOPE: _bindgen_ty_2 = 65;
+pub const AKEYCODE_ENTER: _bindgen_ty_2 = 66;
+pub const AKEYCODE_DEL: _bindgen_ty_2 = 67;
+pub const AKEYCODE_GRAVE: _bindgen_ty_2 = 68;
+pub const AKEYCODE_MINUS: _bindgen_ty_2 = 69;
+pub const AKEYCODE_EQUALS: _bindgen_ty_2 = 70;
+pub const AKEYCODE_LEFT_BRACKET: _bindgen_ty_2 = 71;
+pub const AKEYCODE_RIGHT_BRACKET: _bindgen_ty_2 = 72;
+pub const AKEYCODE_BACKSLASH: _bindgen_ty_2 = 73;
+pub const AKEYCODE_SEMICOLON: _bindgen_ty_2 = 74;
+pub const AKEYCODE_APOSTROPHE: _bindgen_ty_2 = 75;
+pub const AKEYCODE_SLASH: _bindgen_ty_2 = 76;
+pub const AKEYCODE_AT: _bindgen_ty_2 = 77;
+pub const AKEYCODE_NUM: _bindgen_ty_2 = 78;
+pub const AKEYCODE_HEADSETHOOK: _bindgen_ty_2 = 79;
+pub const AKEYCODE_FOCUS: _bindgen_ty_2 = 80;
+pub const AKEYCODE_PLUS: _bindgen_ty_2 = 81;
+pub const AKEYCODE_MENU: _bindgen_ty_2 = 82;
+pub const AKEYCODE_NOTIFICATION: _bindgen_ty_2 = 83;
+pub const AKEYCODE_SEARCH: _bindgen_ty_2 = 84;
+pub const AKEYCODE_MEDIA_PLAY_PAUSE: _bindgen_ty_2 = 85;
+pub const AKEYCODE_MEDIA_STOP: _bindgen_ty_2 = 86;
+pub const AKEYCODE_MEDIA_NEXT: _bindgen_ty_2 = 87;
+pub const AKEYCODE_MEDIA_PREVIOUS: _bindgen_ty_2 = 88;
+pub const AKEYCODE_MEDIA_REWIND: _bindgen_ty_2 = 89;
+pub const AKEYCODE_MEDIA_FAST_FORWARD: _bindgen_ty_2 = 90;
+pub const AKEYCODE_MUTE: _bindgen_ty_2 = 91;
+pub const AKEYCODE_PAGE_UP: _bindgen_ty_2 = 92;
+pub const AKEYCODE_PAGE_DOWN: _bindgen_ty_2 = 93;
+pub const AKEYCODE_PICTSYMBOLS: _bindgen_ty_2 = 94;
+pub const AKEYCODE_SWITCH_CHARSET: _bindgen_ty_2 = 95;
+pub const AKEYCODE_BUTTON_A: _bindgen_ty_2 = 96;
+pub const AKEYCODE_BUTTON_B: _bindgen_ty_2 = 97;
+pub const AKEYCODE_BUTTON_C: _bindgen_ty_2 = 98;
+pub const AKEYCODE_BUTTON_X: _bindgen_ty_2 = 99;
+pub const AKEYCODE_BUTTON_Y: _bindgen_ty_2 = 100;
+pub const AKEYCODE_BUTTON_Z: _bindgen_ty_2 = 101;
+pub const AKEYCODE_BUTTON_L1: _bindgen_ty_2 = 102;
+pub const AKEYCODE_BUTTON_R1: _bindgen_ty_2 = 103;
+pub const AKEYCODE_BUTTON_L2: _bindgen_ty_2 = 104;
+pub const AKEYCODE_BUTTON_R2: _bindgen_ty_2 = 105;
+pub const AKEYCODE_BUTTON_THUMBL: _bindgen_ty_2 = 106;
+pub const AKEYCODE_BUTTON_THUMBR: _bindgen_ty_2 = 107;
+pub const AKEYCODE_BUTTON_START: _bindgen_ty_2 = 108;
+pub const AKEYCODE_BUTTON_SELECT: _bindgen_ty_2 = 109;
+pub const AKEYCODE_BUTTON_MODE: _bindgen_ty_2 = 110;
+pub const AKEYCODE_ESCAPE: _bindgen_ty_2 = 111;
+pub const AKEYCODE_FORWARD_DEL: _bindgen_ty_2 = 112;
+pub const AKEYCODE_CTRL_LEFT: _bindgen_ty_2 = 113;
+pub const AKEYCODE_CTRL_RIGHT: _bindgen_ty_2 = 114;
+pub const AKEYCODE_CAPS_LOCK: _bindgen_ty_2 = 115;
+pub const AKEYCODE_SCROLL_LOCK: _bindgen_ty_2 = 116;
+pub const AKEYCODE_META_LEFT: _bindgen_ty_2 = 117;
+pub const AKEYCODE_META_RIGHT: _bindgen_ty_2 = 118;
+pub const AKEYCODE_FUNCTION: _bindgen_ty_2 = 119;
+pub const AKEYCODE_SYSRQ: _bindgen_ty_2 = 120;
+pub const AKEYCODE_BREAK: _bindgen_ty_2 = 121;
+pub const AKEYCODE_MOVE_HOME: _bindgen_ty_2 = 122;
+pub const AKEYCODE_MOVE_END: _bindgen_ty_2 = 123;
+pub const AKEYCODE_INSERT: _bindgen_ty_2 = 124;
+pub const AKEYCODE_FORWARD: _bindgen_ty_2 = 125;
+pub const AKEYCODE_MEDIA_PLAY: _bindgen_ty_2 = 126;
+pub const AKEYCODE_MEDIA_PAUSE: _bindgen_ty_2 = 127;
+pub const AKEYCODE_MEDIA_CLOSE: _bindgen_ty_2 = 128;
+pub const AKEYCODE_MEDIA_EJECT: _bindgen_ty_2 = 129;
+pub const AKEYCODE_MEDIA_RECORD: _bindgen_ty_2 = 130;
+pub const AKEYCODE_F1: _bindgen_ty_2 = 131;
+pub const AKEYCODE_F2: _bindgen_ty_2 = 132;
+pub const AKEYCODE_F3: _bindgen_ty_2 = 133;
+pub const AKEYCODE_F4: _bindgen_ty_2 = 134;
+pub const AKEYCODE_F5: _bindgen_ty_2 = 135;
+pub const AKEYCODE_F6: _bindgen_ty_2 = 136;
+pub const AKEYCODE_F7: _bindgen_ty_2 = 137;
+pub const AKEYCODE_F8: _bindgen_ty_2 = 138;
+pub const AKEYCODE_F9: _bindgen_ty_2 = 139;
+pub const AKEYCODE_F10: _bindgen_ty_2 = 140;
+pub const AKEYCODE_F11: _bindgen_ty_2 = 141;
+pub const AKEYCODE_F12: _bindgen_ty_2 = 142;
+pub const AKEYCODE_NUM_LOCK: _bindgen_ty_2 = 143;
+pub const AKEYCODE_NUMPAD_0: _bindgen_ty_2 = 144;
+pub const AKEYCODE_NUMPAD_1: _bindgen_ty_2 = 145;
+pub const AKEYCODE_NUMPAD_2: _bindgen_ty_2 = 146;
+pub const AKEYCODE_NUMPAD_3: _bindgen_ty_2 = 147;
+pub const AKEYCODE_NUMPAD_4: _bindgen_ty_2 = 148;
+pub const AKEYCODE_NUMPAD_5: _bindgen_ty_2 = 149;
+pub const AKEYCODE_NUMPAD_6: _bindgen_ty_2 = 150;
+pub const AKEYCODE_NUMPAD_7: _bindgen_ty_2 = 151;
+pub const AKEYCODE_NUMPAD_8: _bindgen_ty_2 = 152;
+pub const AKEYCODE_NUMPAD_9: _bindgen_ty_2 = 153;
+pub const AKEYCODE_NUMPAD_DIVIDE: _bindgen_ty_2 = 154;
+pub const AKEYCODE_NUMPAD_MULTIPLY: _bindgen_ty_2 = 155;
+pub const AKEYCODE_NUMPAD_SUBTRACT: _bindgen_ty_2 = 156;
+pub const AKEYCODE_NUMPAD_ADD: _bindgen_ty_2 = 157;
+pub const AKEYCODE_NUMPAD_DOT: _bindgen_ty_2 = 158;
+pub const AKEYCODE_NUMPAD_COMMA: _bindgen_ty_2 = 159;
+pub const AKEYCODE_NUMPAD_ENTER: _bindgen_ty_2 = 160;
+pub const AKEYCODE_NUMPAD_EQUALS: _bindgen_ty_2 = 161;
+pub const AKEYCODE_NUMPAD_LEFT_PAREN: _bindgen_ty_2 = 162;
+pub const AKEYCODE_NUMPAD_RIGHT_PAREN: _bindgen_ty_2 = 163;
+pub const AKEYCODE_VOLUME_MUTE: _bindgen_ty_2 = 164;
+pub const AKEYCODE_INFO: _bindgen_ty_2 = 165;
+pub const AKEYCODE_CHANNEL_UP: _bindgen_ty_2 = 166;
+pub const AKEYCODE_CHANNEL_DOWN: _bindgen_ty_2 = 167;
+pub const AKEYCODE_ZOOM_IN: _bindgen_ty_2 = 168;
+pub const AKEYCODE_ZOOM_OUT: _bindgen_ty_2 = 169;
+pub const AKEYCODE_TV: _bindgen_ty_2 = 170;
+pub const AKEYCODE_WINDOW: _bindgen_ty_2 = 171;
+pub const AKEYCODE_GUIDE: _bindgen_ty_2 = 172;
+pub const AKEYCODE_DVR: _bindgen_ty_2 = 173;
+pub const AKEYCODE_BOOKMARK: _bindgen_ty_2 = 174;
+pub const AKEYCODE_CAPTIONS: _bindgen_ty_2 = 175;
+pub const AKEYCODE_SETTINGS: _bindgen_ty_2 = 176;
+pub const AKEYCODE_TV_POWER: _bindgen_ty_2 = 177;
+pub const AKEYCODE_TV_INPUT: _bindgen_ty_2 = 178;
+pub const AKEYCODE_STB_POWER: _bindgen_ty_2 = 179;
+pub const AKEYCODE_STB_INPUT: _bindgen_ty_2 = 180;
+pub const AKEYCODE_AVR_POWER: _bindgen_ty_2 = 181;
+pub const AKEYCODE_AVR_INPUT: _bindgen_ty_2 = 182;
+pub const AKEYCODE_PROG_RED: _bindgen_ty_2 = 183;
+pub const AKEYCODE_PROG_GREEN: _bindgen_ty_2 = 184;
+pub const AKEYCODE_PROG_YELLOW: _bindgen_ty_2 = 185;
+pub const AKEYCODE_PROG_BLUE: _bindgen_ty_2 = 186;
+pub const AKEYCODE_APP_SWITCH: _bindgen_ty_2 = 187;
+pub const AKEYCODE_BUTTON_1: _bindgen_ty_2 = 188;
+pub const AKEYCODE_BUTTON_2: _bindgen_ty_2 = 189;
+pub const AKEYCODE_BUTTON_3: _bindgen_ty_2 = 190;
+pub const AKEYCODE_BUTTON_4: _bindgen_ty_2 = 191;
+pub const AKEYCODE_BUTTON_5: _bindgen_ty_2 = 192;
+pub const AKEYCODE_BUTTON_6: _bindgen_ty_2 = 193;
+pub const AKEYCODE_BUTTON_7: _bindgen_ty_2 = 194;
+pub const AKEYCODE_BUTTON_8: _bindgen_ty_2 = 195;
+pub const AKEYCODE_BUTTON_9: _bindgen_ty_2 = 196;
+pub const AKEYCODE_BUTTON_10: _bindgen_ty_2 = 197;
+pub const AKEYCODE_BUTTON_11: _bindgen_ty_2 = 198;
+pub const AKEYCODE_BUTTON_12: _bindgen_ty_2 = 199;
+pub const AKEYCODE_BUTTON_13: _bindgen_ty_2 = 200;
+pub const AKEYCODE_BUTTON_14: _bindgen_ty_2 = 201;
+pub const AKEYCODE_BUTTON_15: _bindgen_ty_2 = 202;
+pub const AKEYCODE_BUTTON_16: _bindgen_ty_2 = 203;
+pub const AKEYCODE_LANGUAGE_SWITCH: _bindgen_ty_2 = 204;
+pub const AKEYCODE_MANNER_MODE: _bindgen_ty_2 = 205;
+pub const AKEYCODE_3D_MODE: _bindgen_ty_2 = 206;
+pub const AKEYCODE_CONTACTS: _bindgen_ty_2 = 207;
+pub const AKEYCODE_CALENDAR: _bindgen_ty_2 = 208;
+pub const AKEYCODE_MUSIC: _bindgen_ty_2 = 209;
+pub const AKEYCODE_CALCULATOR: _bindgen_ty_2 = 210;
+pub const AKEYCODE_ZENKAKU_HANKAKU: _bindgen_ty_2 = 211;
+pub const AKEYCODE_EISU: _bindgen_ty_2 = 212;
+pub const AKEYCODE_MUHENKAN: _bindgen_ty_2 = 213;
+pub const AKEYCODE_HENKAN: _bindgen_ty_2 = 214;
+pub const AKEYCODE_KATAKANA_HIRAGANA: _bindgen_ty_2 = 215;
+pub const AKEYCODE_YEN: _bindgen_ty_2 = 216;
+pub const AKEYCODE_RO: _bindgen_ty_2 = 217;
+pub const AKEYCODE_KANA: _bindgen_ty_2 = 218;
+pub const AKEYCODE_ASSIST: _bindgen_ty_2 = 219;
+pub const AKEYCODE_BRIGHTNESS_DOWN: _bindgen_ty_2 = 220;
+pub const AKEYCODE_BRIGHTNESS_UP: _bindgen_ty_2 = 221;
+pub const AKEYCODE_MEDIA_AUDIO_TRACK: _bindgen_ty_2 = 222;
+pub const AKEYCODE_SLEEP: _bindgen_ty_2 = 223;
+pub const AKEYCODE_WAKEUP: _bindgen_ty_2 = 224;
+pub const AKEYCODE_PAIRING: _bindgen_ty_2 = 225;
+pub const AKEYCODE_MEDIA_TOP_MENU: _bindgen_ty_2 = 226;
+pub const AKEYCODE_11: _bindgen_ty_2 = 227;
+pub const AKEYCODE_12: _bindgen_ty_2 = 228;
+pub const AKEYCODE_LAST_CHANNEL: _bindgen_ty_2 = 229;
+pub const AKEYCODE_TV_DATA_SERVICE: _bindgen_ty_2 = 230;
+pub const AKEYCODE_VOICE_ASSIST: _bindgen_ty_2 = 231;
+pub const AKEYCODE_TV_RADIO_SERVICE: _bindgen_ty_2 = 232;
+pub const AKEYCODE_TV_TELETEXT: _bindgen_ty_2 = 233;
+pub const AKEYCODE_TV_NUMBER_ENTRY: _bindgen_ty_2 = 234;
+pub const AKEYCODE_TV_TERRESTRIAL_ANALOG: _bindgen_ty_2 = 235;
+pub const AKEYCODE_TV_TERRESTRIAL_DIGITAL: _bindgen_ty_2 = 236;
+pub const AKEYCODE_TV_SATELLITE: _bindgen_ty_2 = 237;
+pub const AKEYCODE_TV_SATELLITE_BS: _bindgen_ty_2 = 238;
+pub const AKEYCODE_TV_SATELLITE_CS: _bindgen_ty_2 = 239;
+pub const AKEYCODE_TV_SATELLITE_SERVICE: _bindgen_ty_2 = 240;
+pub const AKEYCODE_TV_NETWORK: _bindgen_ty_2 = 241;
+pub const AKEYCODE_TV_ANTENNA_CABLE: _bindgen_ty_2 = 242;
+pub const AKEYCODE_TV_INPUT_HDMI_1: _bindgen_ty_2 = 243;
+pub const AKEYCODE_TV_INPUT_HDMI_2: _bindgen_ty_2 = 244;
+pub const AKEYCODE_TV_INPUT_HDMI_3: _bindgen_ty_2 = 245;
+pub const AKEYCODE_TV_INPUT_HDMI_4: _bindgen_ty_2 = 246;
+pub const AKEYCODE_TV_INPUT_COMPOSITE_1: _bindgen_ty_2 = 247;
+pub const AKEYCODE_TV_INPUT_COMPOSITE_2: _bindgen_ty_2 = 248;
+pub const AKEYCODE_TV_INPUT_COMPONENT_1: _bindgen_ty_2 = 249;
+pub const AKEYCODE_TV_INPUT_COMPONENT_2: _bindgen_ty_2 = 250;
+pub const AKEYCODE_TV_INPUT_VGA_1: _bindgen_ty_2 = 251;
+pub const AKEYCODE_TV_AUDIO_DESCRIPTION: _bindgen_ty_2 = 252;
+pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP: _bindgen_ty_2 = 253;
+pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN: _bindgen_ty_2 = 254;
+pub const AKEYCODE_TV_ZOOM_MODE: _bindgen_ty_2 = 255;
+pub const AKEYCODE_TV_CONTENTS_MENU: _bindgen_ty_2 = 256;
+pub const AKEYCODE_TV_MEDIA_CONTEXT_MENU: _bindgen_ty_2 = 257;
+pub const AKEYCODE_TV_TIMER_PROGRAMMING: _bindgen_ty_2 = 258;
+pub const AKEYCODE_HELP: _bindgen_ty_2 = 259;
+pub const AKEYCODE_NAVIGATE_PREVIOUS: _bindgen_ty_2 = 260;
+pub const AKEYCODE_NAVIGATE_NEXT: _bindgen_ty_2 = 261;
+pub const AKEYCODE_NAVIGATE_IN: _bindgen_ty_2 = 262;
+pub const AKEYCODE_NAVIGATE_OUT: _bindgen_ty_2 = 263;
+pub const AKEYCODE_STEM_PRIMARY: _bindgen_ty_2 = 264;
+pub const AKEYCODE_STEM_1: _bindgen_ty_2 = 265;
+pub const AKEYCODE_STEM_2: _bindgen_ty_2 = 266;
+pub const AKEYCODE_STEM_3: _bindgen_ty_2 = 267;
+pub const AKEYCODE_DPAD_UP_LEFT: _bindgen_ty_2 = 268;
+pub const AKEYCODE_DPAD_DOWN_LEFT: _bindgen_ty_2 = 269;
+pub const AKEYCODE_DPAD_UP_RIGHT: _bindgen_ty_2 = 270;
+pub const AKEYCODE_DPAD_DOWN_RIGHT: _bindgen_ty_2 = 271;
+pub const AKEYCODE_MEDIA_SKIP_FORWARD: _bindgen_ty_2 = 272;
+pub const AKEYCODE_MEDIA_SKIP_BACKWARD: _bindgen_ty_2 = 273;
+pub const AKEYCODE_MEDIA_STEP_FORWARD: _bindgen_ty_2 = 274;
+pub const AKEYCODE_MEDIA_STEP_BACKWARD: _bindgen_ty_2 = 275;
+pub const AKEYCODE_SOFT_SLEEP: _bindgen_ty_2 = 276;
+pub const AKEYCODE_CUT: _bindgen_ty_2 = 277;
+pub const AKEYCODE_COPY: _bindgen_ty_2 = 278;
+pub const AKEYCODE_PASTE: _bindgen_ty_2 = 279;
+pub const AKEYCODE_SYSTEM_NAVIGATION_UP: _bindgen_ty_2 = 280;
+pub const AKEYCODE_SYSTEM_NAVIGATION_DOWN: _bindgen_ty_2 = 281;
+pub const AKEYCODE_SYSTEM_NAVIGATION_LEFT: _bindgen_ty_2 = 282;
+pub const AKEYCODE_SYSTEM_NAVIGATION_RIGHT: _bindgen_ty_2 = 283;
+pub const AKEYCODE_ALL_APPS: _bindgen_ty_2 = 284;
+pub const AKEYCODE_REFRESH: _bindgen_ty_2 = 285;
+pub const AKEYCODE_THUMBS_UP: _bindgen_ty_2 = 286;
+pub const AKEYCODE_THUMBS_DOWN: _bindgen_ty_2 = 287;
+pub const AKEYCODE_PROFILE_SWITCH: _bindgen_ty_2 = 288;
 pub type _bindgen_ty_2 = ::std::os::raw::c_uint;
-pub const ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: ::std::os::raw::c_uint = 1;
+pub const ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: _bindgen_ty_3 = 1;
 pub type _bindgen_ty_3 = ::std::os::raw::c_uint;
-pub const ALOOPER_POLL_WAKE: ::std::os::raw::c_int = -1;
-pub const ALOOPER_POLL_CALLBACK: ::std::os::raw::c_int = -2;
-pub const ALOOPER_POLL_TIMEOUT: ::std::os::raw::c_int = -3;
-pub const ALOOPER_POLL_ERROR: ::std::os::raw::c_int = -4;
+pub const ALOOPER_POLL_WAKE: _bindgen_ty_4 = -1;
+pub const ALOOPER_POLL_CALLBACK: _bindgen_ty_4 = -2;
+pub const ALOOPER_POLL_TIMEOUT: _bindgen_ty_4 = -3;
+pub const ALOOPER_POLL_ERROR: _bindgen_ty_4 = -4;
 pub type _bindgen_ty_4 = ::std::os::raw::c_int;
-pub const ALOOPER_EVENT_INPUT: ::std::os::raw::c_uint = 1;
-pub const ALOOPER_EVENT_OUTPUT: ::std::os::raw::c_uint = 2;
-pub const ALOOPER_EVENT_ERROR: ::std::os::raw::c_uint = 4;
-pub const ALOOPER_EVENT_HANGUP: ::std::os::raw::c_uint = 8;
-pub const ALOOPER_EVENT_INVALID: ::std::os::raw::c_uint = 16;
+pub const ALOOPER_EVENT_INPUT: _bindgen_ty_5 = 1;
+pub const ALOOPER_EVENT_OUTPUT: _bindgen_ty_5 = 2;
+pub const ALOOPER_EVENT_ERROR: _bindgen_ty_5 = 4;
+pub const ALOOPER_EVENT_HANGUP: _bindgen_ty_5 = 8;
+pub const ALOOPER_EVENT_INVALID: _bindgen_ty_5 = 16;
 pub type _bindgen_ty_5 = ::std::os::raw::c_uint;
-pub const AKEY_STATE_UNKNOWN: ::std::os::raw::c_int = -1;
-pub const AKEY_STATE_UP: ::std::os::raw::c_int = 0;
-pub const AKEY_STATE_DOWN: ::std::os::raw::c_int = 1;
-pub const AKEY_STATE_VIRTUAL: ::std::os::raw::c_int = 2;
+pub type va_list = [u64; 4usize];
+pub type __gnuc_va_list = [u64; 4usize];
+#[repr(C)]
+pub struct JavaVMAttachArgs {
+    pub version: jint,
+    pub name: *const ::std::os::raw::c_char,
+    pub group: jobject,
+}
+#[test]
+fn bindgen_test_layout_JavaVMAttachArgs() {
+    const UNINIT: ::std::mem::MaybeUninit<JavaVMAttachArgs> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<JavaVMAttachArgs>(),
+        24usize,
+        concat!("Size of: ", stringify!(JavaVMAttachArgs))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<JavaVMAttachArgs>(),
+        8usize,
+        concat!("Alignment of ", stringify!(JavaVMAttachArgs))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMAttachArgs),
+            "::",
+            stringify!(version)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).name) as usize - ptr as usize },
+        8usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMAttachArgs),
+            "::",
+            stringify!(name)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).group) as usize - ptr as usize },
+        16usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMAttachArgs),
+            "::",
+            stringify!(group)
+        )
+    );
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct JavaVMOption {
+    pub optionString: *const ::std::os::raw::c_char,
+    pub extraInfo: *mut ::std::os::raw::c_void,
+}
+#[test]
+fn bindgen_test_layout_JavaVMOption() {
+    const UNINIT: ::std::mem::MaybeUninit<JavaVMOption> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<JavaVMOption>(),
+        16usize,
+        concat!("Size of: ", stringify!(JavaVMOption))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<JavaVMOption>(),
+        8usize,
+        concat!("Alignment of ", stringify!(JavaVMOption))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).optionString) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMOption),
+            "::",
+            stringify!(optionString)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).extraInfo) as usize - ptr as usize },
+        8usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMOption),
+            "::",
+            stringify!(extraInfo)
+        )
+    );
+}
+#[repr(C)]
+pub struct JavaVMInitArgs {
+    pub version: jint,
+    pub nOptions: jint,
+    pub options: *mut JavaVMOption,
+    pub ignoreUnrecognized: jboolean,
+}
+#[test]
+fn bindgen_test_layout_JavaVMInitArgs() {
+    const UNINIT: ::std::mem::MaybeUninit<JavaVMInitArgs> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<JavaVMInitArgs>(),
+        24usize,
+        concat!("Size of: ", stringify!(JavaVMInitArgs))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<JavaVMInitArgs>(),
+        8usize,
+        concat!("Alignment of ", stringify!(JavaVMInitArgs))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(version)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).nOptions) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(nOptions)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).options) as usize - ptr as usize },
+        8usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(options)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).ignoreUnrecognized) as usize - ptr as usize },
+        16usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(ignoreUnrecognized)
+        )
+    );
+}
+pub const AKEY_STATE_UNKNOWN: _bindgen_ty_6 = -1;
+pub const AKEY_STATE_UP: _bindgen_ty_6 = 0;
+pub const AKEY_STATE_DOWN: _bindgen_ty_6 = 1;
+pub const AKEY_STATE_VIRTUAL: _bindgen_ty_6 = 2;
 pub type _bindgen_ty_6 = ::std::os::raw::c_int;
-pub const AMETA_NONE: ::std::os::raw::c_uint = 0;
-pub const AMETA_ALT_ON: ::std::os::raw::c_uint = 2;
-pub const AMETA_ALT_LEFT_ON: ::std::os::raw::c_uint = 16;
-pub const AMETA_ALT_RIGHT_ON: ::std::os::raw::c_uint = 32;
-pub const AMETA_SHIFT_ON: ::std::os::raw::c_uint = 1;
-pub const AMETA_SHIFT_LEFT_ON: ::std::os::raw::c_uint = 64;
-pub const AMETA_SHIFT_RIGHT_ON: ::std::os::raw::c_uint = 128;
-pub const AMETA_SYM_ON: ::std::os::raw::c_uint = 4;
-pub const AMETA_FUNCTION_ON: ::std::os::raw::c_uint = 8;
-pub const AMETA_CTRL_ON: ::std::os::raw::c_uint = 4096;
-pub const AMETA_CTRL_LEFT_ON: ::std::os::raw::c_uint = 8192;
-pub const AMETA_CTRL_RIGHT_ON: ::std::os::raw::c_uint = 16384;
-pub const AMETA_META_ON: ::std::os::raw::c_uint = 65536;
-pub const AMETA_META_LEFT_ON: ::std::os::raw::c_uint = 131072;
-pub const AMETA_META_RIGHT_ON: ::std::os::raw::c_uint = 262144;
-pub const AMETA_CAPS_LOCK_ON: ::std::os::raw::c_uint = 1048576;
-pub const AMETA_NUM_LOCK_ON: ::std::os::raw::c_uint = 2097152;
-pub const AMETA_SCROLL_LOCK_ON: ::std::os::raw::c_uint = 4194304;
+pub const AMETA_NONE: _bindgen_ty_7 = 0;
+pub const AMETA_ALT_ON: _bindgen_ty_7 = 2;
+pub const AMETA_ALT_LEFT_ON: _bindgen_ty_7 = 16;
+pub const AMETA_ALT_RIGHT_ON: _bindgen_ty_7 = 32;
+pub const AMETA_SHIFT_ON: _bindgen_ty_7 = 1;
+pub const AMETA_SHIFT_LEFT_ON: _bindgen_ty_7 = 64;
+pub const AMETA_SHIFT_RIGHT_ON: _bindgen_ty_7 = 128;
+pub const AMETA_SYM_ON: _bindgen_ty_7 = 4;
+pub const AMETA_FUNCTION_ON: _bindgen_ty_7 = 8;
+pub const AMETA_CTRL_ON: _bindgen_ty_7 = 4096;
+pub const AMETA_CTRL_LEFT_ON: _bindgen_ty_7 = 8192;
+pub const AMETA_CTRL_RIGHT_ON: _bindgen_ty_7 = 16384;
+pub const AMETA_META_ON: _bindgen_ty_7 = 65536;
+pub const AMETA_META_LEFT_ON: _bindgen_ty_7 = 131072;
+pub const AMETA_META_RIGHT_ON: _bindgen_ty_7 = 262144;
+pub const AMETA_CAPS_LOCK_ON: _bindgen_ty_7 = 1048576;
+pub const AMETA_NUM_LOCK_ON: _bindgen_ty_7 = 2097152;
+pub const AMETA_SCROLL_LOCK_ON: _bindgen_ty_7 = 4194304;
 pub type _bindgen_ty_7 = ::std::os::raw::c_uint;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct AInputEvent {
     _unused: [u8; 0],
 }
-pub const AINPUT_EVENT_TYPE_KEY: ::std::os::raw::c_uint = 1;
-pub const AINPUT_EVENT_TYPE_MOTION: ::std::os::raw::c_uint = 2;
+pub const AINPUT_EVENT_TYPE_KEY: _bindgen_ty_8 = 1;
+pub const AINPUT_EVENT_TYPE_MOTION: _bindgen_ty_8 = 2;
+pub const AINPUT_EVENT_TYPE_FOCUS: _bindgen_ty_8 = 3;
+pub const AINPUT_EVENT_TYPE_CAPTURE: _bindgen_ty_8 = 4;
+pub const AINPUT_EVENT_TYPE_DRAG: _bindgen_ty_8 = 5;
+pub const AINPUT_EVENT_TYPE_TOUCH_MODE: _bindgen_ty_8 = 6;
 pub type _bindgen_ty_8 = ::std::os::raw::c_uint;
-pub const AKEY_EVENT_ACTION_DOWN: ::std::os::raw::c_uint = 0;
-pub const AKEY_EVENT_ACTION_UP: ::std::os::raw::c_uint = 1;
-pub const AKEY_EVENT_ACTION_MULTIPLE: ::std::os::raw::c_uint = 2;
+pub const AKEY_EVENT_ACTION_DOWN: _bindgen_ty_9 = 0;
+pub const AKEY_EVENT_ACTION_UP: _bindgen_ty_9 = 1;
+pub const AKEY_EVENT_ACTION_MULTIPLE: _bindgen_ty_9 = 2;
 pub type _bindgen_ty_9 = ::std::os::raw::c_uint;
-pub const AKEY_EVENT_FLAG_WOKE_HERE: ::std::os::raw::c_uint = 1;
-pub const AKEY_EVENT_FLAG_SOFT_KEYBOARD: ::std::os::raw::c_uint = 2;
-pub const AKEY_EVENT_FLAG_KEEP_TOUCH_MODE: ::std::os::raw::c_uint = 4;
-pub const AKEY_EVENT_FLAG_FROM_SYSTEM: ::std::os::raw::c_uint = 8;
-pub const AKEY_EVENT_FLAG_EDITOR_ACTION: ::std::os::raw::c_uint = 16;
-pub const AKEY_EVENT_FLAG_CANCELED: ::std::os::raw::c_uint = 32;
-pub const AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY: ::std::os::raw::c_uint = 64;
-pub const AKEY_EVENT_FLAG_LONG_PRESS: ::std::os::raw::c_uint = 128;
-pub const AKEY_EVENT_FLAG_CANCELED_LONG_PRESS: ::std::os::raw::c_uint = 256;
-pub const AKEY_EVENT_FLAG_TRACKING: ::std::os::raw::c_uint = 512;
-pub const AKEY_EVENT_FLAG_FALLBACK: ::std::os::raw::c_uint = 1024;
+pub const AKEY_EVENT_FLAG_WOKE_HERE: _bindgen_ty_10 = 1;
+pub const AKEY_EVENT_FLAG_SOFT_KEYBOARD: _bindgen_ty_10 = 2;
+pub const AKEY_EVENT_FLAG_KEEP_TOUCH_MODE: _bindgen_ty_10 = 4;
+pub const AKEY_EVENT_FLAG_FROM_SYSTEM: _bindgen_ty_10 = 8;
+pub const AKEY_EVENT_FLAG_EDITOR_ACTION: _bindgen_ty_10 = 16;
+pub const AKEY_EVENT_FLAG_CANCELED: _bindgen_ty_10 = 32;
+pub const AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY: _bindgen_ty_10 = 64;
+pub const AKEY_EVENT_FLAG_LONG_PRESS: _bindgen_ty_10 = 128;
+pub const AKEY_EVENT_FLAG_CANCELED_LONG_PRESS: _bindgen_ty_10 = 256;
+pub const AKEY_EVENT_FLAG_TRACKING: _bindgen_ty_10 = 512;
+pub const AKEY_EVENT_FLAG_FALLBACK: _bindgen_ty_10 = 1024;
 pub type _bindgen_ty_10 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_ACTION_MASK: ::std::os::raw::c_uint = 255;
-pub const AMOTION_EVENT_ACTION_POINTER_INDEX_MASK: ::std::os::raw::c_uint = 65280;
-pub const AMOTION_EVENT_ACTION_DOWN: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_ACTION_UP: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_ACTION_MOVE: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_ACTION_CANCEL: ::std::os::raw::c_uint = 3;
-pub const AMOTION_EVENT_ACTION_OUTSIDE: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_ACTION_POINTER_DOWN: ::std::os::raw::c_uint = 5;
-pub const AMOTION_EVENT_ACTION_POINTER_UP: ::std::os::raw::c_uint = 6;
-pub const AMOTION_EVENT_ACTION_HOVER_MOVE: ::std::os::raw::c_uint = 7;
-pub const AMOTION_EVENT_ACTION_SCROLL: ::std::os::raw::c_uint = 8;
-pub const AMOTION_EVENT_ACTION_HOVER_ENTER: ::std::os::raw::c_uint = 9;
-pub const AMOTION_EVENT_ACTION_HOVER_EXIT: ::std::os::raw::c_uint = 10;
-pub const AMOTION_EVENT_ACTION_BUTTON_PRESS: ::std::os::raw::c_uint = 11;
-pub const AMOTION_EVENT_ACTION_BUTTON_RELEASE: ::std::os::raw::c_uint = 12;
+pub const AMOTION_EVENT_ACTION_MASK: _bindgen_ty_11 = 255;
+pub const AMOTION_EVENT_ACTION_POINTER_INDEX_MASK: _bindgen_ty_11 = 65280;
+pub const AMOTION_EVENT_ACTION_DOWN: _bindgen_ty_11 = 0;
+pub const AMOTION_EVENT_ACTION_UP: _bindgen_ty_11 = 1;
+pub const AMOTION_EVENT_ACTION_MOVE: _bindgen_ty_11 = 2;
+pub const AMOTION_EVENT_ACTION_CANCEL: _bindgen_ty_11 = 3;
+pub const AMOTION_EVENT_ACTION_OUTSIDE: _bindgen_ty_11 = 4;
+pub const AMOTION_EVENT_ACTION_POINTER_DOWN: _bindgen_ty_11 = 5;
+pub const AMOTION_EVENT_ACTION_POINTER_UP: _bindgen_ty_11 = 6;
+pub const AMOTION_EVENT_ACTION_HOVER_MOVE: _bindgen_ty_11 = 7;
+pub const AMOTION_EVENT_ACTION_SCROLL: _bindgen_ty_11 = 8;
+pub const AMOTION_EVENT_ACTION_HOVER_ENTER: _bindgen_ty_11 = 9;
+pub const AMOTION_EVENT_ACTION_HOVER_EXIT: _bindgen_ty_11 = 10;
+pub const AMOTION_EVENT_ACTION_BUTTON_PRESS: _bindgen_ty_11 = 11;
+pub const AMOTION_EVENT_ACTION_BUTTON_RELEASE: _bindgen_ty_11 = 12;
 pub type _bindgen_ty_11 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED: ::std::os::raw::c_uint = 1;
+pub const AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED: _bindgen_ty_12 = 1;
 pub type _bindgen_ty_12 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_EDGE_FLAG_NONE: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_EDGE_FLAG_TOP: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_EDGE_FLAG_BOTTOM: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_EDGE_FLAG_LEFT: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_EDGE_FLAG_RIGHT: ::std::os::raw::c_uint = 8;
+pub const AMOTION_EVENT_EDGE_FLAG_NONE: _bindgen_ty_13 = 0;
+pub const AMOTION_EVENT_EDGE_FLAG_TOP: _bindgen_ty_13 = 1;
+pub const AMOTION_EVENT_EDGE_FLAG_BOTTOM: _bindgen_ty_13 = 2;
+pub const AMOTION_EVENT_EDGE_FLAG_LEFT: _bindgen_ty_13 = 4;
+pub const AMOTION_EVENT_EDGE_FLAG_RIGHT: _bindgen_ty_13 = 8;
 pub type _bindgen_ty_13 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_AXIS_X: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_AXIS_Y: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_AXIS_PRESSURE: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_AXIS_SIZE: ::std::os::raw::c_uint = 3;
-pub const AMOTION_EVENT_AXIS_TOUCH_MAJOR: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_AXIS_TOUCH_MINOR: ::std::os::raw::c_uint = 5;
-pub const AMOTION_EVENT_AXIS_TOOL_MAJOR: ::std::os::raw::c_uint = 6;
-pub const AMOTION_EVENT_AXIS_TOOL_MINOR: ::std::os::raw::c_uint = 7;
-pub const AMOTION_EVENT_AXIS_ORIENTATION: ::std::os::raw::c_uint = 8;
-pub const AMOTION_EVENT_AXIS_VSCROLL: ::std::os::raw::c_uint = 9;
-pub const AMOTION_EVENT_AXIS_HSCROLL: ::std::os::raw::c_uint = 10;
-pub const AMOTION_EVENT_AXIS_Z: ::std::os::raw::c_uint = 11;
-pub const AMOTION_EVENT_AXIS_RX: ::std::os::raw::c_uint = 12;
-pub const AMOTION_EVENT_AXIS_RY: ::std::os::raw::c_uint = 13;
-pub const AMOTION_EVENT_AXIS_RZ: ::std::os::raw::c_uint = 14;
-pub const AMOTION_EVENT_AXIS_HAT_X: ::std::os::raw::c_uint = 15;
-pub const AMOTION_EVENT_AXIS_HAT_Y: ::std::os::raw::c_uint = 16;
-pub const AMOTION_EVENT_AXIS_LTRIGGER: ::std::os::raw::c_uint = 17;
-pub const AMOTION_EVENT_AXIS_RTRIGGER: ::std::os::raw::c_uint = 18;
-pub const AMOTION_EVENT_AXIS_THROTTLE: ::std::os::raw::c_uint = 19;
-pub const AMOTION_EVENT_AXIS_RUDDER: ::std::os::raw::c_uint = 20;
-pub const AMOTION_EVENT_AXIS_WHEEL: ::std::os::raw::c_uint = 21;
-pub const AMOTION_EVENT_AXIS_GAS: ::std::os::raw::c_uint = 22;
-pub const AMOTION_EVENT_AXIS_BRAKE: ::std::os::raw::c_uint = 23;
-pub const AMOTION_EVENT_AXIS_DISTANCE: ::std::os::raw::c_uint = 24;
-pub const AMOTION_EVENT_AXIS_TILT: ::std::os::raw::c_uint = 25;
-pub const AMOTION_EVENT_AXIS_SCROLL: ::std::os::raw::c_uint = 26;
-pub const AMOTION_EVENT_AXIS_RELATIVE_X: ::std::os::raw::c_uint = 27;
-pub const AMOTION_EVENT_AXIS_RELATIVE_Y: ::std::os::raw::c_uint = 28;
-pub const AMOTION_EVENT_AXIS_GENERIC_1: ::std::os::raw::c_uint = 32;
-pub const AMOTION_EVENT_AXIS_GENERIC_2: ::std::os::raw::c_uint = 33;
-pub const AMOTION_EVENT_AXIS_GENERIC_3: ::std::os::raw::c_uint = 34;
-pub const AMOTION_EVENT_AXIS_GENERIC_4: ::std::os::raw::c_uint = 35;
-pub const AMOTION_EVENT_AXIS_GENERIC_5: ::std::os::raw::c_uint = 36;
-pub const AMOTION_EVENT_AXIS_GENERIC_6: ::std::os::raw::c_uint = 37;
-pub const AMOTION_EVENT_AXIS_GENERIC_7: ::std::os::raw::c_uint = 38;
-pub const AMOTION_EVENT_AXIS_GENERIC_8: ::std::os::raw::c_uint = 39;
-pub const AMOTION_EVENT_AXIS_GENERIC_9: ::std::os::raw::c_uint = 40;
-pub const AMOTION_EVENT_AXIS_GENERIC_10: ::std::os::raw::c_uint = 41;
-pub const AMOTION_EVENT_AXIS_GENERIC_11: ::std::os::raw::c_uint = 42;
-pub const AMOTION_EVENT_AXIS_GENERIC_12: ::std::os::raw::c_uint = 43;
-pub const AMOTION_EVENT_AXIS_GENERIC_13: ::std::os::raw::c_uint = 44;
-pub const AMOTION_EVENT_AXIS_GENERIC_14: ::std::os::raw::c_uint = 45;
-pub const AMOTION_EVENT_AXIS_GENERIC_15: ::std::os::raw::c_uint = 46;
-pub const AMOTION_EVENT_AXIS_GENERIC_16: ::std::os::raw::c_uint = 47;
+pub const AMOTION_EVENT_AXIS_X: _bindgen_ty_14 = 0;
+pub const AMOTION_EVENT_AXIS_Y: _bindgen_ty_14 = 1;
+pub const AMOTION_EVENT_AXIS_PRESSURE: _bindgen_ty_14 = 2;
+pub const AMOTION_EVENT_AXIS_SIZE: _bindgen_ty_14 = 3;
+pub const AMOTION_EVENT_AXIS_TOUCH_MAJOR: _bindgen_ty_14 = 4;
+pub const AMOTION_EVENT_AXIS_TOUCH_MINOR: _bindgen_ty_14 = 5;
+pub const AMOTION_EVENT_AXIS_TOOL_MAJOR: _bindgen_ty_14 = 6;
+pub const AMOTION_EVENT_AXIS_TOOL_MINOR: _bindgen_ty_14 = 7;
+pub const AMOTION_EVENT_AXIS_ORIENTATION: _bindgen_ty_14 = 8;
+pub const AMOTION_EVENT_AXIS_VSCROLL: _bindgen_ty_14 = 9;
+pub const AMOTION_EVENT_AXIS_HSCROLL: _bindgen_ty_14 = 10;
+pub const AMOTION_EVENT_AXIS_Z: _bindgen_ty_14 = 11;
+pub const AMOTION_EVENT_AXIS_RX: _bindgen_ty_14 = 12;
+pub const AMOTION_EVENT_AXIS_RY: _bindgen_ty_14 = 13;
+pub const AMOTION_EVENT_AXIS_RZ: _bindgen_ty_14 = 14;
+pub const AMOTION_EVENT_AXIS_HAT_X: _bindgen_ty_14 = 15;
+pub const AMOTION_EVENT_AXIS_HAT_Y: _bindgen_ty_14 = 16;
+pub const AMOTION_EVENT_AXIS_LTRIGGER: _bindgen_ty_14 = 17;
+pub const AMOTION_EVENT_AXIS_RTRIGGER: _bindgen_ty_14 = 18;
+pub const AMOTION_EVENT_AXIS_THROTTLE: _bindgen_ty_14 = 19;
+pub const AMOTION_EVENT_AXIS_RUDDER: _bindgen_ty_14 = 20;
+pub const AMOTION_EVENT_AXIS_WHEEL: _bindgen_ty_14 = 21;
+pub const AMOTION_EVENT_AXIS_GAS: _bindgen_ty_14 = 22;
+pub const AMOTION_EVENT_AXIS_BRAKE: _bindgen_ty_14 = 23;
+pub const AMOTION_EVENT_AXIS_DISTANCE: _bindgen_ty_14 = 24;
+pub const AMOTION_EVENT_AXIS_TILT: _bindgen_ty_14 = 25;
+pub const AMOTION_EVENT_AXIS_SCROLL: _bindgen_ty_14 = 26;
+pub const AMOTION_EVENT_AXIS_RELATIVE_X: _bindgen_ty_14 = 27;
+pub const AMOTION_EVENT_AXIS_RELATIVE_Y: _bindgen_ty_14 = 28;
+pub const AMOTION_EVENT_AXIS_GENERIC_1: _bindgen_ty_14 = 32;
+pub const AMOTION_EVENT_AXIS_GENERIC_2: _bindgen_ty_14 = 33;
+pub const AMOTION_EVENT_AXIS_GENERIC_3: _bindgen_ty_14 = 34;
+pub const AMOTION_EVENT_AXIS_GENERIC_4: _bindgen_ty_14 = 35;
+pub const AMOTION_EVENT_AXIS_GENERIC_5: _bindgen_ty_14 = 36;
+pub const AMOTION_EVENT_AXIS_GENERIC_6: _bindgen_ty_14 = 37;
+pub const AMOTION_EVENT_AXIS_GENERIC_7: _bindgen_ty_14 = 38;
+pub const AMOTION_EVENT_AXIS_GENERIC_8: _bindgen_ty_14 = 39;
+pub const AMOTION_EVENT_AXIS_GENERIC_9: _bindgen_ty_14 = 40;
+pub const AMOTION_EVENT_AXIS_GENERIC_10: _bindgen_ty_14 = 41;
+pub const AMOTION_EVENT_AXIS_GENERIC_11: _bindgen_ty_14 = 42;
+pub const AMOTION_EVENT_AXIS_GENERIC_12: _bindgen_ty_14 = 43;
+pub const AMOTION_EVENT_AXIS_GENERIC_13: _bindgen_ty_14 = 44;
+pub const AMOTION_EVENT_AXIS_GENERIC_14: _bindgen_ty_14 = 45;
+pub const AMOTION_EVENT_AXIS_GENERIC_15: _bindgen_ty_14 = 46;
+pub const AMOTION_EVENT_AXIS_GENERIC_16: _bindgen_ty_14 = 47;
 pub type _bindgen_ty_14 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_BUTTON_PRIMARY: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_BUTTON_SECONDARY: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_BUTTON_TERTIARY: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_BUTTON_BACK: ::std::os::raw::c_uint = 8;
-pub const AMOTION_EVENT_BUTTON_FORWARD: ::std::os::raw::c_uint = 16;
-pub const AMOTION_EVENT_BUTTON_STYLUS_PRIMARY: ::std::os::raw::c_uint = 32;
-pub const AMOTION_EVENT_BUTTON_STYLUS_SECONDARY: ::std::os::raw::c_uint = 64;
+pub const AMOTION_EVENT_BUTTON_PRIMARY: _bindgen_ty_15 = 1;
+pub const AMOTION_EVENT_BUTTON_SECONDARY: _bindgen_ty_15 = 2;
+pub const AMOTION_EVENT_BUTTON_TERTIARY: _bindgen_ty_15 = 4;
+pub const AMOTION_EVENT_BUTTON_BACK: _bindgen_ty_15 = 8;
+pub const AMOTION_EVENT_BUTTON_FORWARD: _bindgen_ty_15 = 16;
+pub const AMOTION_EVENT_BUTTON_STYLUS_PRIMARY: _bindgen_ty_15 = 32;
+pub const AMOTION_EVENT_BUTTON_STYLUS_SECONDARY: _bindgen_ty_15 = 64;
 pub type _bindgen_ty_15 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_TOOL_TYPE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_TOOL_TYPE_FINGER: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_TOOL_TYPE_STYLUS: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_TOOL_TYPE_MOUSE: ::std::os::raw::c_uint = 3;
-pub const AMOTION_EVENT_TOOL_TYPE_ERASER: ::std::os::raw::c_uint = 4;
+pub const AMOTION_EVENT_TOOL_TYPE_UNKNOWN: _bindgen_ty_16 = 0;
+pub const AMOTION_EVENT_TOOL_TYPE_FINGER: _bindgen_ty_16 = 1;
+pub const AMOTION_EVENT_TOOL_TYPE_STYLUS: _bindgen_ty_16 = 2;
+pub const AMOTION_EVENT_TOOL_TYPE_MOUSE: _bindgen_ty_16 = 3;
+pub const AMOTION_EVENT_TOOL_TYPE_ERASER: _bindgen_ty_16 = 4;
+pub const AMOTION_EVENT_TOOL_TYPE_PALM: _bindgen_ty_16 = 5;
 pub type _bindgen_ty_16 = ::std::os::raw::c_uint;
-pub const AINPUT_SOURCE_CLASS_MASK: ::std::os::raw::c_uint = 255;
-pub const AINPUT_SOURCE_CLASS_NONE: ::std::os::raw::c_uint = 0;
-pub const AINPUT_SOURCE_CLASS_BUTTON: ::std::os::raw::c_uint = 1;
-pub const AINPUT_SOURCE_CLASS_POINTER: ::std::os::raw::c_uint = 2;
-pub const AINPUT_SOURCE_CLASS_NAVIGATION: ::std::os::raw::c_uint = 4;
-pub const AINPUT_SOURCE_CLASS_POSITION: ::std::os::raw::c_uint = 8;
-pub const AINPUT_SOURCE_CLASS_JOYSTICK: ::std::os::raw::c_uint = 16;
+pub const AMotionClassification_AMOTION_EVENT_CLASSIFICATION_NONE: AMotionClassification = 0;
+pub const AMotionClassification_AMOTION_EVENT_CLASSIFICATION_AMBIGUOUS_GESTURE:
+    AMotionClassification = 1;
+pub const AMotionClassification_AMOTION_EVENT_CLASSIFICATION_DEEP_PRESS: AMotionClassification = 2;
+pub type AMotionClassification = u32;
+pub const AINPUT_SOURCE_CLASS_MASK: _bindgen_ty_17 = 255;
+pub const AINPUT_SOURCE_CLASS_NONE: _bindgen_ty_17 = 0;
+pub const AINPUT_SOURCE_CLASS_BUTTON: _bindgen_ty_17 = 1;
+pub const AINPUT_SOURCE_CLASS_POINTER: _bindgen_ty_17 = 2;
+pub const AINPUT_SOURCE_CLASS_NAVIGATION: _bindgen_ty_17 = 4;
+pub const AINPUT_SOURCE_CLASS_POSITION: _bindgen_ty_17 = 8;
+pub const AINPUT_SOURCE_CLASS_JOYSTICK: _bindgen_ty_17 = 16;
 pub type _bindgen_ty_17 = ::std::os::raw::c_uint;
-pub const AINPUT_SOURCE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AINPUT_SOURCE_KEYBOARD: ::std::os::raw::c_uint = 257;
-pub const AINPUT_SOURCE_DPAD: ::std::os::raw::c_uint = 513;
-pub const AINPUT_SOURCE_GAMEPAD: ::std::os::raw::c_uint = 1025;
-pub const AINPUT_SOURCE_TOUCHSCREEN: ::std::os::raw::c_uint = 4098;
-pub const AINPUT_SOURCE_MOUSE: ::std::os::raw::c_uint = 8194;
-pub const AINPUT_SOURCE_STYLUS: ::std::os::raw::c_uint = 16386;
-pub const AINPUT_SOURCE_BLUETOOTH_STYLUS: ::std::os::raw::c_uint = 49154;
-pub const AINPUT_SOURCE_TRACKBALL: ::std::os::raw::c_uint = 65540;
-pub const AINPUT_SOURCE_MOUSE_RELATIVE: ::std::os::raw::c_uint = 131076;
-pub const AINPUT_SOURCE_TOUCHPAD: ::std::os::raw::c_uint = 1048584;
-pub const AINPUT_SOURCE_TOUCH_NAVIGATION: ::std::os::raw::c_uint = 2097152;
-pub const AINPUT_SOURCE_JOYSTICK: ::std::os::raw::c_uint = 16777232;
-pub const AINPUT_SOURCE_ROTARY_ENCODER: ::std::os::raw::c_uint = 4194304;
-pub const AINPUT_SOURCE_ANY: ::std::os::raw::c_uint = 4294967040;
+pub const AINPUT_SOURCE_UNKNOWN: _bindgen_ty_18 = 0;
+pub const AINPUT_SOURCE_KEYBOARD: _bindgen_ty_18 = 257;
+pub const AINPUT_SOURCE_DPAD: _bindgen_ty_18 = 513;
+pub const AINPUT_SOURCE_GAMEPAD: _bindgen_ty_18 = 1025;
+pub const AINPUT_SOURCE_TOUCHSCREEN: _bindgen_ty_18 = 4098;
+pub const AINPUT_SOURCE_MOUSE: _bindgen_ty_18 = 8194;
+pub const AINPUT_SOURCE_STYLUS: _bindgen_ty_18 = 16386;
+pub const AINPUT_SOURCE_BLUETOOTH_STYLUS: _bindgen_ty_18 = 49154;
+pub const AINPUT_SOURCE_TRACKBALL: _bindgen_ty_18 = 65540;
+pub const AINPUT_SOURCE_MOUSE_RELATIVE: _bindgen_ty_18 = 131076;
+pub const AINPUT_SOURCE_TOUCHPAD: _bindgen_ty_18 = 1048584;
+pub const AINPUT_SOURCE_TOUCH_NAVIGATION: _bindgen_ty_18 = 2097152;
+pub const AINPUT_SOURCE_JOYSTICK: _bindgen_ty_18 = 16777232;
+pub const AINPUT_SOURCE_HDMI: _bindgen_ty_18 = 33554433;
+pub const AINPUT_SOURCE_SENSOR: _bindgen_ty_18 = 67108864;
+pub const AINPUT_SOURCE_ROTARY_ENCODER: _bindgen_ty_18 = 4194304;
+pub const AINPUT_SOURCE_ANY: _bindgen_ty_18 = 4294967040;
 pub type _bindgen_ty_18 = ::std::os::raw::c_uint;
-pub const AINPUT_KEYBOARD_TYPE_NONE: ::std::os::raw::c_uint = 0;
-pub const AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC: ::std::os::raw::c_uint = 1;
-pub const AINPUT_KEYBOARD_TYPE_ALPHABETIC: ::std::os::raw::c_uint = 2;
+pub const AINPUT_KEYBOARD_TYPE_NONE: _bindgen_ty_19 = 0;
+pub const AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC: _bindgen_ty_19 = 1;
+pub const AINPUT_KEYBOARD_TYPE_ALPHABETIC: _bindgen_ty_19 = 2;
 pub type _bindgen_ty_19 = ::std::os::raw::c_uint;
-pub const AINPUT_MOTION_RANGE_X: ::std::os::raw::c_uint = 0;
-pub const AINPUT_MOTION_RANGE_Y: ::std::os::raw::c_uint = 1;
-pub const AINPUT_MOTION_RANGE_PRESSURE: ::std::os::raw::c_uint = 2;
-pub const AINPUT_MOTION_RANGE_SIZE: ::std::os::raw::c_uint = 3;
-pub const AINPUT_MOTION_RANGE_TOUCH_MAJOR: ::std::os::raw::c_uint = 4;
-pub const AINPUT_MOTION_RANGE_TOUCH_MINOR: ::std::os::raw::c_uint = 5;
-pub const AINPUT_MOTION_RANGE_TOOL_MAJOR: ::std::os::raw::c_uint = 6;
-pub const AINPUT_MOTION_RANGE_TOOL_MINOR: ::std::os::raw::c_uint = 7;
-pub const AINPUT_MOTION_RANGE_ORIENTATION: ::std::os::raw::c_uint = 8;
+pub const AINPUT_MOTION_RANGE_X: _bindgen_ty_20 = 0;
+pub const AINPUT_MOTION_RANGE_Y: _bindgen_ty_20 = 1;
+pub const AINPUT_MOTION_RANGE_PRESSURE: _bindgen_ty_20 = 2;
+pub const AINPUT_MOTION_RANGE_SIZE: _bindgen_ty_20 = 3;
+pub const AINPUT_MOTION_RANGE_TOUCH_MAJOR: _bindgen_ty_20 = 4;
+pub const AINPUT_MOTION_RANGE_TOUCH_MINOR: _bindgen_ty_20 = 5;
+pub const AINPUT_MOTION_RANGE_TOOL_MAJOR: _bindgen_ty_20 = 6;
+pub const AINPUT_MOTION_RANGE_TOOL_MINOR: _bindgen_ty_20 = 7;
+pub const AINPUT_MOTION_RANGE_ORIENTATION: _bindgen_ty_20 = 8;
 pub type _bindgen_ty_20 = ::std::os::raw::c_uint;
 extern "C" {
     pub fn AInputEvent_getType(event: *const AInputEvent) -> i32;
@@ -1377,6 +1565,9 @@ extern "C" {
 extern "C" {
     pub fn AInputEvent_getSource(event: *const AInputEvent) -> i32;
 }
+extern "C" {
+    pub fn AInputEvent_release(event: *const AInputEvent);
+}
 extern "C" {
     pub fn AKeyEvent_getAction(key_event: *const AInputEvent) -> i32;
 }
@@ -1401,6 +1592,9 @@ extern "C" {
 extern "C" {
     pub fn AKeyEvent_getEventTime(key_event: *const AInputEvent) -> i64;
 }
+extern "C" {
+    pub fn AKeyEvent_fromJava(env: *mut JNIEnv, keyEvent: jobject) -> *const AInputEvent;
+}
 extern "C" {
     pub fn AMotionEvent_getAction(motion_event: *const AInputEvent) -> i32;
 }
@@ -1435,168 +1629,169 @@ extern "C" {
     pub fn AMotionEvent_getYPrecision(motion_event: *const AInputEvent) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getPointerCount(motion_event: *const AInputEvent) -> size_t;
+    pub fn AMotionEvent_getPointerCount(motion_event: *const AInputEvent) -> usize;
 }
 extern "C" {
-    pub fn AMotionEvent_getPointerId(
-        motion_event: *const AInputEvent,
-        pointer_index: size_t,
-    ) -> i32;
+    pub fn AMotionEvent_getPointerId(motion_event: *const AInputEvent, pointer_index: usize)
+        -> i32;
 }
 extern "C" {
-    pub fn AMotionEvent_getToolType(motion_event: *const AInputEvent, pointer_index: size_t)
-        -> i32;
+    pub fn AMotionEvent_getToolType(motion_event: *const AInputEvent, pointer_index: usize) -> i32;
 }
 extern "C" {
-    pub fn AMotionEvent_getRawX(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getRawX(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getRawY(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getRawY(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getX(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getX(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getY(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getY(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getPressure(motion_event: *const AInputEvent, pointer_index: size_t)
-        -> f32;
+    pub fn AMotionEvent_getPressure(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getSize(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getSize(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getTouchMajor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getTouchMinor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getToolMajor(
-        motion_event: *const AInputEvent,
-        pointer_index: size_t,
-    ) -> f32;
+    pub fn AMotionEvent_getToolMajor(motion_event: *const AInputEvent, pointer_index: usize)
+        -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getToolMinor(
-        motion_event: *const AInputEvent,
-        pointer_index: size_t,
-    ) -> f32;
+    pub fn AMotionEvent_getToolMinor(motion_event: *const AInputEvent, pointer_index: usize)
+        -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getOrientation(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getAxisValue(
         motion_event: *const AInputEvent,
         axis: i32,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getHistorySize(motion_event: *const AInputEvent) -> size_t;
+    pub fn AMotionEvent_getHistorySize(motion_event: *const AInputEvent) -> usize;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalEventTime(
         motion_event: *const AInputEvent,
-        history_index: size_t,
+        history_index: usize,
     ) -> i64;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalRawX(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalRawY(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalX(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalY(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalPressure(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalSize(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalTouchMajor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalTouchMinor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalToolMajor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalToolMinor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalOrientation(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalAxisValue(
         motion_event: *const AInputEvent,
         axis: i32,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
+extern "C" {
+    pub fn AMotionEvent_getActionButton(motion_event: *const AInputEvent) -> i32;
+}
+extern "C" {
+    pub fn AMotionEvent_getClassification(motion_event: *const AInputEvent) -> i32;
+}
+extern "C" {
+    pub fn AMotionEvent_fromJava(env: *mut JNIEnv, motionEvent: jobject) -> *const AInputEvent;
+}
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct AInputQueue {
@@ -1630,6 +1825,9 @@ extern "C" {
         handled: ::std::os::raw::c_int,
     );
 }
+extern "C" {
+    pub fn AInputQueue_fromJava(env: *mut JNIEnv, inputQueue: jobject) -> *mut AInputQueue;
+}
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct imaxdiv_t {
@@ -1638,6 +1836,8 @@ pub struct imaxdiv_t {
 }
 #[test]
 fn bindgen_test_layout_imaxdiv_t() {
+    const UNINIT: ::std::mem::MaybeUninit<imaxdiv_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<imaxdiv_t>(),
         16usize,
@@ -1649,7 +1849,7 @@ fn bindgen_test_layout_imaxdiv_t() {
         concat!("Alignment of ", stringify!(imaxdiv_t))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<imaxdiv_t>())).quot as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).quot) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1659,7 +1859,7 @@ fn bindgen_test_layout_imaxdiv_t() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<imaxdiv_t>())).rem as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rem) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -1704,11 +1904,52 @@ extern "C" {
     ) -> uintmax_t;
 }
 pub const ADataSpace_ADATASPACE_UNKNOWN: ADataSpace = 0;
+pub const ADataSpace_STANDARD_MASK: ADataSpace = 4128768;
+pub const ADataSpace_STANDARD_UNSPECIFIED: ADataSpace = 0;
+pub const ADataSpace_STANDARD_BT709: ADataSpace = 65536;
+pub const ADataSpace_STANDARD_BT601_625: ADataSpace = 131072;
+pub const ADataSpace_STANDARD_BT601_625_UNADJUSTED: ADataSpace = 196608;
+pub const ADataSpace_STANDARD_BT601_525: ADataSpace = 262144;
+pub const ADataSpace_STANDARD_BT601_525_UNADJUSTED: ADataSpace = 327680;
+pub const ADataSpace_STANDARD_BT2020: ADataSpace = 393216;
+pub const ADataSpace_STANDARD_BT2020_CONSTANT_LUMINANCE: ADataSpace = 458752;
+pub const ADataSpace_STANDARD_BT470M: ADataSpace = 524288;
+pub const ADataSpace_STANDARD_FILM: ADataSpace = 589824;
+pub const ADataSpace_STANDARD_DCI_P3: ADataSpace = 655360;
+pub const ADataSpace_STANDARD_ADOBE_RGB: ADataSpace = 720896;
+pub const ADataSpace_TRANSFER_MASK: ADataSpace = 130023424;
+pub const ADataSpace_TRANSFER_UNSPECIFIED: ADataSpace = 0;
+pub const ADataSpace_TRANSFER_LINEAR: ADataSpace = 4194304;
+pub const ADataSpace_TRANSFER_SRGB: ADataSpace = 8388608;
+pub const ADataSpace_TRANSFER_SMPTE_170M: ADataSpace = 12582912;
+pub const ADataSpace_TRANSFER_GAMMA2_2: ADataSpace = 16777216;
+pub const ADataSpace_TRANSFER_GAMMA2_6: ADataSpace = 20971520;
+pub const ADataSpace_TRANSFER_GAMMA2_8: ADataSpace = 25165824;
+pub const ADataSpace_TRANSFER_ST2084: ADataSpace = 29360128;
+pub const ADataSpace_TRANSFER_HLG: ADataSpace = 33554432;
+pub const ADataSpace_RANGE_MASK: ADataSpace = 939524096;
+pub const ADataSpace_RANGE_UNSPECIFIED: ADataSpace = 0;
+pub const ADataSpace_RANGE_FULL: ADataSpace = 134217728;
+pub const ADataSpace_RANGE_LIMITED: ADataSpace = 268435456;
+pub const ADataSpace_RANGE_EXTENDED: ADataSpace = 402653184;
 pub const ADataSpace_ADATASPACE_SCRGB_LINEAR: ADataSpace = 406913024;
 pub const ADataSpace_ADATASPACE_SRGB: ADataSpace = 142671872;
 pub const ADataSpace_ADATASPACE_SCRGB: ADataSpace = 411107328;
 pub const ADataSpace_ADATASPACE_DISPLAY_P3: ADataSpace = 143261696;
 pub const ADataSpace_ADATASPACE_BT2020_PQ: ADataSpace = 163971072;
+pub const ADataSpace_ADATASPACE_BT2020_ITU_PQ: ADataSpace = 298188800;
+pub const ADataSpace_ADATASPACE_ADOBE_RGB: ADataSpace = 151715840;
+pub const ADataSpace_ADATASPACE_JFIF: ADataSpace = 146931712;
+pub const ADataSpace_ADATASPACE_BT601_625: ADataSpace = 281149440;
+pub const ADataSpace_ADATASPACE_BT601_525: ADataSpace = 281280512;
+pub const ADataSpace_ADATASPACE_BT2020: ADataSpace = 147193856;
+pub const ADataSpace_ADATASPACE_BT709: ADataSpace = 281083904;
+pub const ADataSpace_ADATASPACE_DCI_P3: ADataSpace = 155844608;
+pub const ADataSpace_ADATASPACE_SRGB_LINEAR: ADataSpace = 138477568;
+pub const ADataSpace_ADATASPACE_BT2020_HLG: ADataSpace = 168165376;
+pub const ADataSpace_ADATASPACE_BT2020_ITU_HLG: ADataSpace = 302383104;
+pub const ADataSpace_DEPTH: ADataSpace = 4096;
+pub const ADataSpace_DYNAMIC_DEPTH: ADataSpace = 4098;
 pub type ADataSpace = ::std::os::raw::c_uint;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM: AHardwareBuffer_Format = 1;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM: AHardwareBuffer_Format = 2;
@@ -1728,6 +1969,8 @@ pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT: AHard
     52;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer_Format = 53;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = 35;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_YCbCr_P010: AHardwareBuffer_Format = 54;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8_UNORM: AHardwareBuffer_Format = 56;
 pub type AHardwareBuffer_Format = ::std::os::raw::c_uint;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_NEVER:
     AHardwareBuffer_UsageFlags = 0;
@@ -1820,6 +2063,8 @@ pub struct AHardwareBuffer_Desc {
 }
 #[test]
 fn bindgen_test_layout_AHardwareBuffer_Desc() {
+    const UNINIT: ::std::mem::MaybeUninit<AHardwareBuffer_Desc> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Desc>(),
         40usize,
@@ -1831,7 +2076,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         concat!("Alignment of ", stringify!(AHardwareBuffer_Desc))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).width as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).width) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1841,7 +2086,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).height as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).height) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -1851,7 +2096,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).layers as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).layers) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -1861,7 +2106,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).format as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).format) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -1871,7 +2116,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).usage as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).usage) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -1881,7 +2126,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).stride as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).stride) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -1891,7 +2136,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).rfu0 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rfu0) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -1901,7 +2146,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).rfu1 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rfu1) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -1920,6 +2165,9 @@ pub struct AHardwareBuffer_Plane {
 }
 #[test]
 fn bindgen_test_layout_AHardwareBuffer_Plane() {
+    const UNINIT: ::std::mem::MaybeUninit<AHardwareBuffer_Plane> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Plane>(),
         16usize,
@@ -1931,7 +2179,7 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
         concat!("Alignment of ", stringify!(AHardwareBuffer_Plane))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Plane>())).data as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1941,9 +2189,7 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<AHardwareBuffer_Plane>())).pixelStride as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).pixelStride) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -1953,7 +2199,7 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Plane>())).rowStride as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rowStride) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -1971,6 +2217,9 @@ pub struct AHardwareBuffer_Planes {
 }
 #[test]
 fn bindgen_test_layout_AHardwareBuffer_Planes() {
+    const UNINIT: ::std::mem::MaybeUninit<AHardwareBuffer_Planes> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Planes>(),
         72usize,
@@ -1982,9 +2231,7 @@ fn bindgen_test_layout_AHardwareBuffer_Planes() {
         concat!("Alignment of ", stringify!(AHardwareBuffer_Planes))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<AHardwareBuffer_Planes>())).planeCount as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).planeCount) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1994,7 +2241,7 @@ fn bindgen_test_layout_AHardwareBuffer_Planes() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Planes>())).planes as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).planes) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -2036,15 +2283,6 @@ extern "C" {
         outVirtualAddress: *mut *mut ::std::os::raw::c_void,
     ) -> ::std::os::raw::c_int;
 }
-extern "C" {
-    pub fn AHardwareBuffer_lockPlanes(
-        buffer: *mut AHardwareBuffer,
-        usage: u64,
-        fence: i32,
-        rect: *const ARect,
-        outPlanes: *mut AHardwareBuffer_Planes,
-    ) -> ::std::os::raw::c_int;
-}
 extern "C" {
     pub fn AHardwareBuffer_unlock(
         buffer: *mut AHardwareBuffer,
@@ -2063,6 +2301,15 @@ extern "C" {
         outBuffer: *mut *mut AHardwareBuffer,
     ) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn AHardwareBuffer_lockPlanes(
+        buffer: *mut AHardwareBuffer,
+        usage: u64,
+        fence: i32,
+        rect: *const ARect,
+        outPlanes: *mut AHardwareBuffer_Planes,
+    ) -> ::std::os::raw::c_int;
+}
 extern "C" {
     pub fn AHardwareBuffer_isSupported(desc: *const AHardwareBuffer_Desc) -> ::std::os::raw::c_int;
 }
@@ -2077,1183 +2324,892 @@ extern "C" {
         outBytesPerStride: *mut i32,
     ) -> ::std::os::raw::c_int;
 }
-pub type va_list = [u64; 4usize];
-pub type __gnuc_va_list = [u64; 4usize];
+extern "C" {
+    pub fn AHardwareBuffer_getId(
+        buffer: *const AHardwareBuffer,
+        outId: *mut u64,
+    ) -> ::std::os::raw::c_int;
+}
+#[doc = " \\brief Describe information about a pointer, found in a\n GameActivityMotionEvent.\n\n You can read values directly from this structure, or use helper functions\n (`GameActivityPointerAxes_getX`, `GameActivityPointerAxes_getY` and\n `GameActivityPointerAxes_getAxisValue`).\n\n The X axis and Y axis are enabled by default but any other axis that you want\n to read **must** be enabled first, using\n `GameActivityPointerAxes_enableAxis`.\n\n \\see GameActivityMotionEvent"]
 #[repr(C)]
-pub struct JavaVMAttachArgs {
-    pub version: jint,
-    pub name: *const ::std::os::raw::c_char,
-    pub group: jobject,
+#[derive(Debug, Copy, Clone)]
+pub struct GameActivityPointerAxes {
+    pub id: i32,
+    pub toolType: i32,
+    pub axisValues: [f32; 48usize],
+    pub rawX: f32,
+    pub rawY: f32,
 }
 #[test]
-fn bindgen_test_layout_JavaVMAttachArgs() {
+fn bindgen_test_layout_GameActivityPointerAxes() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityPointerAxes> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<JavaVMAttachArgs>(),
-        24usize,
-        concat!("Size of: ", stringify!(JavaVMAttachArgs))
+        ::std::mem::size_of::<GameActivityPointerAxes>(),
+        208usize,
+        concat!("Size of: ", stringify!(GameActivityPointerAxes))
     );
     assert_eq!(
-        ::std::mem::align_of::<JavaVMAttachArgs>(),
-        8usize,
-        concat!("Alignment of ", stringify!(JavaVMAttachArgs))
+        ::std::mem::align_of::<GameActivityPointerAxes>(),
+        4usize,
+        concat!("Alignment of ", stringify!(GameActivityPointerAxes))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMAttachArgs>())).version as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(version)
+            stringify!(id)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMAttachArgs>())).name as *const _ as usize },
-        8usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).toolType) as usize - ptr as usize },
+        4usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(name)
+            stringify!(toolType)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMAttachArgs>())).group as *const _ as usize },
-        16usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).axisValues) as usize - ptr as usize },
+        8usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(group)
+            stringify!(axisValues)
         )
     );
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct JavaVMOption {
-    pub optionString: *const ::std::os::raw::c_char,
-    pub extraInfo: *mut ::std::os::raw::c_void,
-}
-#[test]
-fn bindgen_test_layout_JavaVMOption() {
-    assert_eq!(
-        ::std::mem::size_of::<JavaVMOption>(),
-        16usize,
-        concat!("Size of: ", stringify!(JavaVMOption))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<JavaVMOption>(),
-        8usize,
-        concat!("Alignment of ", stringify!(JavaVMOption))
-    );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMOption>())).optionString as *const _ as usize },
-        0usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).rawX) as usize - ptr as usize },
+        200usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMOption),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(optionString)
+            stringify!(rawX)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMOption>())).extraInfo as *const _ as usize },
-        8usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).rawY) as usize - ptr as usize },
+        204usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMOption),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(extraInfo)
+            stringify!(rawY)
         )
     );
 }
+extern "C" {
+    #[doc = " \\brief Enable the specified axis, so that its value is reported in the\n GameActivityPointerAxes structures stored in a motion event.\n\n You must enable any axis that you want to read, apart from\n `AMOTION_EVENT_AXIS_X` and `AMOTION_EVENT_AXIS_Y` that are enabled by\n default.\n\n If the axis index is out of range, nothing is done."]
+    pub fn GameActivityPointerAxes_enableAxis(axis: i32);
+}
+extern "C" {
+    #[doc = " \\brief Disable the specified axis. Its value won't be reported in the\n GameActivityPointerAxes structures stored in a motion event anymore.\n\n Apart from X and Y, any axis that you want to read **must** be enabled first,\n using `GameActivityPointerAxes_enableAxis`.\n\n If the axis index is out of range, nothing is done."]
+    pub fn GameActivityPointerAxes_disableAxis(axis: i32);
+}
+extern "C" {
+    #[doc = " \\brief Get the value of the requested axis.\n\n Apart from X and Y, any axis that you want to read **must** be enabled first,\n using `GameActivityPointerAxes_enableAxis`.\n\n Find the valid enums for the axis (`AMOTION_EVENT_AXIS_X`,\n `AMOTION_EVENT_AXIS_Y`, `AMOTION_EVENT_AXIS_PRESSURE`...)\n in https://developer.android.com/ndk/reference/group/input.\n\n @param pointerInfo The structure containing information about the pointer,\n obtained from GameActivityMotionEvent.\n @param axis The axis to get the value from\n @return The value of the axis, or 0 if the axis is invalid or was not\n enabled."]
+    pub fn GameActivityPointerAxes_getAxisValue(
+        pointerInfo: *const GameActivityPointerAxes,
+        axis: i32,
+    ) -> f32;
+}
+#[doc = " \\brief Describe a motion event that happened on the GameActivity SurfaceView.\n\n This is 1:1 mapping to the information contained in a Java `MotionEvent`\n (see https://developer.android.com/reference/android/view/MotionEvent)."]
 #[repr(C)]
-pub struct JavaVMInitArgs {
-    pub version: jint,
-    pub nOptions: jint,
-    pub options: *mut JavaVMOption,
-    pub ignoreUnrecognized: jboolean,
+#[derive(Debug, Copy, Clone)]
+pub struct GameActivityMotionEvent {
+    pub deviceId: i32,
+    pub source: i32,
+    pub action: i32,
+    pub eventTime: i64,
+    pub downTime: i64,
+    pub flags: i32,
+    pub metaState: i32,
+    pub actionButton: i32,
+    pub buttonState: i32,
+    pub classification: i32,
+    pub edgeFlags: i32,
+    pub pointerCount: u32,
+    pub pointers: [GameActivityPointerAxes; 8usize],
+    pub historySize: ::std::os::raw::c_int,
+    pub historicalEventTimesMillis: *mut i64,
+    pub historicalEventTimesNanos: *mut i64,
+    pub historicalAxisValues: *mut f32,
+    pub precisionX: f32,
+    pub precisionY: f32,
 }
 #[test]
-fn bindgen_test_layout_JavaVMInitArgs() {
+fn bindgen_test_layout_GameActivityMotionEvent() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityMotionEvent> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<JavaVMInitArgs>(),
-        24usize,
-        concat!("Size of: ", stringify!(JavaVMInitArgs))
+        ::std::mem::size_of::<GameActivityMotionEvent>(),
+        1760usize,
+        concat!("Size of: ", stringify!(GameActivityMotionEvent))
     );
     assert_eq!(
-        ::std::mem::align_of::<JavaVMInitArgs>(),
+        ::std::mem::align_of::<GameActivityMotionEvent>(),
         8usize,
-        concat!("Alignment of ", stringify!(JavaVMInitArgs))
+        concat!("Alignment of ", stringify!(GameActivityMotionEvent))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMInitArgs>())).version as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMInitArgs),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(version)
+            stringify!(deviceId)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMInitArgs>())).nOptions as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMInitArgs),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(nOptions)
+            stringify!(source)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMInitArgs>())).options as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMInitArgs),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(options)
+            stringify!(action)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<JavaVMInitArgs>())).ignoreUnrecognized as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMInitArgs),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(ignoreUnrecognized)
+            stringify!(eventTime)
         )
     );
-}
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
-    GameCommonInsetsType = 3;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
-#[doc = " The type of a component for which to retrieve insets. See"]
-#[doc = " https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
-pub type GameCommonInsetsType = ::std::os::raw::c_uint;
-#[doc = " This struct holds a span within a region of text from start (inclusive) to"]
-#[doc = " end (exclusive). An empty span or cursor position is specified with"]
-#[doc = " start==end. An undefined span is specified with start = end = SPAN_UNDEFINED."]
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameTextInputSpan {
-    #[doc = " The start of the region (inclusive)."]
-    pub start: i32,
-    #[doc = " The end of the region (exclusive)."]
-    pub end: i32,
-}
-#[test]
-fn bindgen_test_layout_GameTextInputSpan() {
     assert_eq!(
-        ::std::mem::size_of::<GameTextInputSpan>(),
-        8usize,
-        concat!("Size of: ", stringify!(GameTextInputSpan))
+        unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
+        24usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(downTime)
+        )
     );
     assert_eq!(
-        ::std::mem::align_of::<GameTextInputSpan>(),
-        4usize,
-        concat!("Alignment of ", stringify!(GameTextInputSpan))
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
+        32usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(flags)
+        )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputSpan>())).start as *const _ as usize },
-        0usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
+        36usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputSpan),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(start)
+            stringify!(metaState)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputSpan>())).end as *const _ as usize },
-        4usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).actionButton) as usize - ptr as usize },
+        40usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputSpan),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(end)
+            stringify!(actionButton)
         )
     );
-}
-pub const GameTextInputSpanFlag_SPAN_UNDEFINED: GameTextInputSpanFlag = -1;
-#[doc = " Values with special meaning in a GameTextInputSpan."]
-pub type GameTextInputSpanFlag = ::std::os::raw::c_int;
-#[doc = " This struct holds the state of an editable section of text."]
-#[doc = " The text can have a selection and a composing region defined on it."]
-#[doc = " A composing region is used by IMEs that allow input using multiple steps to"]
-#[doc = " compose a glyph or word. Use functions GameTextInput_getState and"]
-#[doc = " GameTextInput_setState to read and modify the state that an IME is editing."]
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameTextInputState {
-    #[doc = " Text owned by the state, as a modified UTF-8 string. Null-terminated."]
-    #[doc = " https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8"]
-    pub text_UTF8: *const ::std::os::raw::c_char,
-    #[doc = " Length in bytes of text_UTF8, *not* including the null at end."]
-    pub text_length: i32,
-    #[doc = " A selection defined on the text."]
-    pub selection: GameTextInputSpan,
-    #[doc = " A composing region defined on the text."]
-    pub composingRegion: GameTextInputSpan,
-}
-#[test]
-fn bindgen_test_layout_GameTextInputState() {
     assert_eq!(
-        ::std::mem::size_of::<GameTextInputState>(),
-        32usize,
-        concat!("Size of: ", stringify!(GameTextInputState))
+        unsafe { ::std::ptr::addr_of!((*ptr).buttonState) as usize - ptr as usize },
+        44usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(buttonState)
+        )
     );
     assert_eq!(
-        ::std::mem::align_of::<GameTextInputState>(),
-        8usize,
-        concat!("Alignment of ", stringify!(GameTextInputState))
+        unsafe { ::std::ptr::addr_of!((*ptr).classification) as usize - ptr as usize },
+        48usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(classification)
+        )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputState>())).text_UTF8 as *const _ as usize },
-        0usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).edgeFlags) as usize - ptr as usize },
+        52usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputState),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(text_UTF8)
+            stringify!(edgeFlags)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputState>())).text_length as *const _ as usize },
-        8usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pointerCount) as usize - ptr as usize },
+        56usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputState),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(text_length)
+            stringify!(pointerCount)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputState>())).selection as *const _ as usize },
-        12usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pointers) as usize - ptr as usize },
+        60usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputState),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(selection)
+            stringify!(pointers)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameTextInputState>())).composingRegion as *const _ as usize
-        },
-        20usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).historySize) as usize - ptr as usize },
+        1724usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputState),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(composingRegion)
+            stringify!(historySize)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesMillis) as usize - ptr as usize },
+        1728usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(historicalEventTimesMillis)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesNanos) as usize - ptr as usize },
+        1736usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(historicalEventTimesNanos)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).historicalAxisValues) as usize - ptr as usize },
+        1744usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(historicalAxisValues)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).precisionX) as usize - ptr as usize },
+        1752usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(precisionX)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).precisionY) as usize - ptr as usize },
+        1756usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(precisionY)
         )
     );
-}
-#[doc = " A callback called by GameTextInput_getState."]
-#[doc = " @param context User-defined context."]
-#[doc = " @param state State, owned by the library, that will be valid for the duration"]
-#[doc = " of the callback."]
-pub type GameTextInputGetStateCallback = ::std::option::Option<
-    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, state: *const GameTextInputState),
->;
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameTextInput {
-    _unused: [u8; 0],
 }
 extern "C" {
-    #[doc = " Initialize the GameTextInput library."]
-    #[doc = " If called twice without GameTextInput_destroy being called, the same pointer"]
-    #[doc = " will be returned and a warning will be issued."]
-    #[doc = " @param env A JNI env valid on the calling thread."]
-    #[doc = " @param max_string_size The maximum length of a string that can be edited. If"]
-    #[doc = " zero, the maximum defaults to 65536 bytes. A buffer of this size is allocated"]
-    #[doc = " at initialization."]
-    #[doc = " @return A handle to the library."]
-    pub fn GameTextInput_init(env: *mut JNIEnv, max_string_size: u32) -> *mut GameTextInput;
+    pub fn GameActivityMotionEvent_getHistoricalAxisValue(
+        event: *const GameActivityMotionEvent,
+        axis: ::std::os::raw::c_int,
+        pointerIndex: ::std::os::raw::c_int,
+        historyPos: ::std::os::raw::c_int,
+    ) -> f32;
 }
 extern "C" {
-    #[doc = " When using GameTextInput, you need to create a gametextinput.InputConnection"]
-    #[doc = " on the Java side and pass it using this function to the library, unless using"]
-    #[doc = " GameActivity in which case this will be done for you. See the GameActivity"]
-    #[doc = " source code or GameTextInput samples for examples of usage."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param inputConnection A gametextinput.InputConnection object."]
-    pub fn GameTextInput_setInputConnection(input: *mut GameTextInput, inputConnection: jobject);
+    #[doc = " \\brief Handle the freeing of the GameActivityMotionEvent struct."]
+    pub fn GameActivityMotionEvent_destroy(c_event: *mut GameActivityMotionEvent);
 }
 extern "C" {
-    #[doc = " Unless using GameActivity, it is required to call this function from your"]
-    #[doc = " Java gametextinput.Listener.stateChanged method to convert eventState and"]
-    #[doc = " trigger any event callbacks. When using GameActivity, this does not need to"]
-    #[doc = " be called as event processing is handled by the Activity."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param eventState A Java gametextinput.State object."]
-    pub fn GameTextInput_processEvent(input: *mut GameTextInput, eventState: jobject);
+    #[doc = " \\brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`.\n\n This is done automatically by the GameActivity: see `onTouchEvent` to set\n a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
+    pub fn GameActivityMotionEvent_fromJava(
+        env: *mut JNIEnv,
+        motionEvent: jobject,
+        out_event: *mut GameActivityMotionEvent,
+    );
 }
-extern "C" {
-    #[doc = " Free any resources owned by the GameTextInput library."]
-    #[doc = " Any subsequent calls to the library will fail until GameTextInput_init is"]
-    #[doc = " called again."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    pub fn GameTextInput_destroy(input: *mut GameTextInput);
-}
-pub const ShowImeFlags_SHOW_IME_UNDEFINED: ShowImeFlags = 0;
-pub const ShowImeFlags_SHOW_IMPLICIT: ShowImeFlags = 1;
-pub const ShowImeFlags_SHOW_FORCED: ShowImeFlags = 2;
-#[doc = " Flags to be passed to GameTextInput_showIme."]
-pub type ShowImeFlags = ::std::os::raw::c_uint;
-extern "C" {
-    #[doc = " Show the IME. Calls InputMethodManager.showSoftInput()."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param flags Defined in ShowImeFlags above. For more information see:"]
-    #[doc = " https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
-    pub fn GameTextInput_showIme(input: *mut GameTextInput, flags: u32);
-}
-pub const HideImeFlags_HIDE_IME_UNDEFINED: HideImeFlags = 0;
-pub const HideImeFlags_HIDE_IMPLICIT_ONLY: HideImeFlags = 1;
-pub const HideImeFlags_HIDE_NOT_ALWAYS: HideImeFlags = 2;
-#[doc = " Flags to be passed to GameTextInput_hideIme."]
-pub type HideImeFlags = ::std::os::raw::c_uint;
-extern "C" {
-    #[doc = " Show the IME. Calls InputMethodManager.hideSoftInputFromWindow()."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param flags Defined in HideImeFlags above. For more information see:"]
-    #[doc = " https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
-    pub fn GameTextInput_hideIme(input: *mut GameTextInput, flags: u32);
-}
-extern "C" {
-    #[doc = " Call a callback with the current GameTextInput state, which may have been"]
-    #[doc = " modified by changes in the IME and calls to GameTextInput_setState. We use a"]
-    #[doc = " callback rather than returning the state in order to simplify ownership of"]
-    #[doc = " text_UTF8 strings. These strings are only valid during the calling of the"]
-    #[doc = " callback."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param callback A function that will be called with valid state."]
-    #[doc = " @param context Context used by the callback."]
-    pub fn GameTextInput_getState(
-        input: *mut GameTextInput,
-        callback: GameTextInputGetStateCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
-}
-extern "C" {
-    #[doc = " Set the current GameTextInput state. This state is reflected to any active"]
-    #[doc = " IME."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param state The state to set. Ownership is maintained by the caller and must"]
-    #[doc = " remain valid for the duration of the call."]
-    pub fn GameTextInput_setState(input: *mut GameTextInput, state: *const GameTextInputState);
-}
-#[doc = " Type of the callback needed by GameTextInput_setEventCallback that will be"]
-#[doc = " called every time the IME state changes."]
-#[doc = " @param context User-defined context set in GameTextInput_setEventCallback."]
-#[doc = " @param current_state Current IME state, owned by the library and valid during"]
-#[doc = " the callback."]
-pub type GameTextInputEventCallback = ::std::option::Option<
-    unsafe extern "C" fn(
-        context: *mut ::std::os::raw::c_void,
-        current_state: *const GameTextInputState,
-    ),
->;
-extern "C" {
-    #[doc = " Optionally set a callback to be called whenever the IME state changes."]
-    #[doc = " Not necessary if you are using GameActivity, which handles these callbacks"]
-    #[doc = " for you."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param callback Called by the library when the IME state changes."]
-    #[doc = " @param context Context passed as first argument to the callback."]
-    pub fn GameTextInput_setEventCallback(
-        input: *mut GameTextInput,
-        callback: GameTextInputEventCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
-}
-#[doc = " Type of the callback needed by GameTextInput_setImeInsetsCallback that will"]
-#[doc = " be called every time the IME window insets change."]
-#[doc = " @param context User-defined context set in"]
-#[doc = " GameTextInput_setImeWIndowInsetsCallback."]
-#[doc = " @param current_insets Current IME insets, owned by the library and valid"]
-#[doc = " during the callback."]
-pub type GameTextInputImeInsetsCallback = ::std::option::Option<
-    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, current_insets: *const ARect),
->;
-extern "C" {
-    #[doc = " Optionally set a callback to be called whenever the IME insets change."]
-    #[doc = " Not necessary if you are using GameActivity, which handles these callbacks"]
-    #[doc = " for you."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param callback Called by the library when the IME insets change."]
-    #[doc = " @param context Context passed as first argument to the callback."]
-    pub fn GameTextInput_setImeInsetsCallback(
-        input: *mut GameTextInput,
-        callback: GameTextInputImeInsetsCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
-}
-extern "C" {
-    #[doc = " Get the current window insets for the IME."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param insets Filled with the current insets by this function."]
-    pub fn GameTextInput_getImeInsets(input: *const GameTextInput, insets: *mut ARect);
-}
-extern "C" {
-    #[doc = " Unless using GameActivity, it is required to call this function from your"]
-    #[doc = " Java gametextinput.Listener.onImeInsetsChanged method to"]
-    #[doc = " trigger any event callbacks. When using GameActivity, this does not need to"]
-    #[doc = " be called as insets processing is handled by the Activity."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param eventState A Java gametextinput.State object."]
-    pub fn GameTextInput_processImeInsets(input: *mut GameTextInput, insets: *const ARect);
-}
-extern "C" {
-    #[doc = " Convert a GameTextInputState struct to a Java gametextinput.State object."]
-    #[doc = " Don't forget to delete the returned Java local ref when you're done."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param state Input state to convert."]
-    #[doc = " @return A Java object of class gametextinput.State. The caller is required to"]
-    #[doc = " delete this local reference."]
-    pub fn GameTextInputState_toJava(
-        input: *const GameTextInput,
-        state: *const GameTextInputState,
-    ) -> jobject;
-}
-extern "C" {
-    #[doc = " Convert from a Java gametextinput.State object into a C GameTextInputState"]
-    #[doc = " struct."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param state A Java gametextinput.State object."]
-    #[doc = " @param callback A function called with the C struct, valid for the duration"]
-    #[doc = " of the call."]
-    #[doc = " @param context Context passed to the callback."]
-    pub fn GameTextInputState_fromJava(
-        input: *const GameTextInput,
-        state: jobject,
-        callback: GameTextInputGetStateCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
-}
-#[doc = " This structure defines the native side of an android.app.GameActivity."]
-#[doc = " It is created by the framework, and handed to the application's native"]
-#[doc = " code as it is being launched."]
-#[repr(C)]
-pub struct GameActivity {
-    #[doc = " Pointer to the callback function table of the native application."]
-    #[doc = " You can set the functions here to your own callbacks.  The callbacks"]
-    #[doc = " pointer itself here should not be changed; it is allocated and managed"]
-    #[doc = " for you by the framework."]
-    pub callbacks: *mut GameActivityCallbacks,
-    #[doc = " The global handle on the process's Java VM."]
-    pub vm: *mut JavaVM,
-    #[doc = " JNI context for the main thread of the app.  Note that this field"]
-    #[doc = " can ONLY be used from the main thread of the process; that is, the"]
-    #[doc = " thread that calls into the GameActivityCallbacks."]
-    pub env: *mut JNIEnv,
-    #[doc = " The GameActivity object handle."]
-    pub javaGameActivity: jobject,
-    #[doc = " Path to this application's internal data directory."]
-    pub internalDataPath: *const ::std::os::raw::c_char,
-    #[doc = " Path to this application's external (removable/mountable) data directory."]
-    pub externalDataPath: *const ::std::os::raw::c_char,
-    #[doc = " The platform's SDK version code."]
-    pub sdkVersion: i32,
-    #[doc = " This is the native instance of the application.  It is not used by"]
-    #[doc = " the framework, but can be set by the application to its own instance"]
-    #[doc = " state."]
-    pub instance: *mut ::std::os::raw::c_void,
-    #[doc = " Pointer to the Asset Manager instance for the application.  The"]
-    #[doc = " application uses this to access binary assets bundled inside its own .apk"]
-    #[doc = " file."]
-    pub assetManager: *mut AAssetManager,
-    #[doc = " Available starting with Honeycomb: path to the directory containing"]
-    #[doc = " the application's OBB files (if any).  If the app doesn't have any"]
-    #[doc = " OBB files, this directory may not exist."]
-    pub obbPath: *const ::std::os::raw::c_char,
+#[doc = " \\brief Describe a key event that happened on the GameActivity SurfaceView.\n\n This is 1:1 mapping to the information contained in a Java `KeyEvent`\n (see https://developer.android.com/reference/android/view/KeyEvent).\n The only exception is the event times, which are reported as\n nanoseconds in this struct."]
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct GameActivityKeyEvent {
+    pub deviceId: i32,
+    pub source: i32,
+    pub action: i32,
+    pub eventTime: i64,
+    pub downTime: i64,
+    pub flags: i32,
+    pub metaState: i32,
+    pub modifiers: i32,
+    pub repeatCount: i32,
+    pub keyCode: i32,
+    pub scanCode: i32,
+    pub unicodeChar: i32,
 }
 #[test]
-fn bindgen_test_layout_GameActivity() {
+fn bindgen_test_layout_GameActivityKeyEvent() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityKeyEvent> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<GameActivity>(),
-        80usize,
-        concat!("Size of: ", stringify!(GameActivity))
+        ::std::mem::size_of::<GameActivityKeyEvent>(),
+        64usize,
+        concat!("Size of: ", stringify!(GameActivityKeyEvent))
     );
     assert_eq!(
-        ::std::mem::align_of::<GameActivity>(),
+        ::std::mem::align_of::<GameActivityKeyEvent>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameActivity))
+        concat!("Alignment of ", stringify!(GameActivityKeyEvent))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).callbacks as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(callbacks)
+            stringify!(deviceId)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityKeyEvent),
+            "::",
+            stringify!(source)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).vm as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(vm)
+            stringify!(action)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).env as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(env)
+            stringify!(eventTime)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).javaGameActivity as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(javaGameActivity)
+            stringify!(downTime)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).internalDataPath as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(internalDataPath)
+            stringify!(flags)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
+        36usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityKeyEvent),
+            "::",
+            stringify!(metaState)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).externalDataPath as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).modifiers) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(externalDataPath)
+            stringify!(modifiers)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).sdkVersion as *const _ as usize },
-        48usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).repeatCount) as usize - ptr as usize },
+        44usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(sdkVersion)
+            stringify!(repeatCount)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).instance as *const _ as usize },
-        56usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyCode) as usize - ptr as usize },
+        48usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(instance)
+            stringify!(keyCode)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).assetManager as *const _ as usize },
-        64usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).scanCode) as usize - ptr as usize },
+        52usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(assetManager)
+            stringify!(scanCode)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).obbPath as *const _ as usize },
-        72usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).unicodeChar) as usize - ptr as usize },
+        56usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(obbPath)
+            stringify!(unicodeChar)
         )
     );
 }
-#[doc = " \\brief Describe information about a pointer, found in a"]
-#[doc = " GameActivityMotionEvent."]
-#[doc = ""]
-#[doc = " You can read values directly from this structure, or use helper functions"]
-#[doc = " (`GameActivityPointerAxes_getX`, `GameActivityPointerAxes_getY` and"]
-#[doc = " `GameActivityPointerAxes_getAxisValue`)."]
-#[doc = ""]
-#[doc = " The X axis and Y axis are enabled by default but any other axis that you want"]
-#[doc = " to read **must** be enabled first, using"]
-#[doc = " `GameActivityPointerAxes_enableAxis`."]
-#[doc = ""]
-#[doc = " \\see GameActivityMotionEvent"]
+extern "C" {
+    #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.\n\n This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`\n to set a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
+    pub fn GameActivityKeyEvent_fromJava(
+        env: *mut JNIEnv,
+        motionEvent: jobject,
+        out_event: *mut GameActivityKeyEvent,
+    );
+}
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
+    GameCommonInsetsType = 3;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
+#[doc = " The type of a component for which to retrieve insets. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
+pub type GameCommonInsetsType = ::std::os::raw::c_uint;
+#[doc = " This struct holds a span within a region of text from start (inclusive) to\n end (exclusive). An empty span or cursor position is specified with\n start==end. An undefined span is specified with start = end = SPAN_UNDEFINED."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct GameActivityPointerAxes {
-    pub id: i32,
-    pub toolType: i32,
-    pub axisValues: [f32; 48usize],
-    pub rawX: f32,
-    pub rawY: f32,
+pub struct GameTextInputSpan {
+    #[doc = " The start of the region (inclusive)."]
+    pub start: i32,
+    #[doc = " The end of the region (exclusive)."]
+    pub end: i32,
 }
 #[test]
-fn bindgen_test_layout_GameActivityPointerAxes() {
+fn bindgen_test_layout_GameTextInputSpan() {
+    const UNINIT: ::std::mem::MaybeUninit<GameTextInputSpan> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<GameActivityPointerAxes>(),
-        208usize,
-        concat!("Size of: ", stringify!(GameActivityPointerAxes))
+        ::std::mem::size_of::<GameTextInputSpan>(),
+        8usize,
+        concat!("Size of: ", stringify!(GameTextInputSpan))
     );
     assert_eq!(
-        ::std::mem::align_of::<GameActivityPointerAxes>(),
+        ::std::mem::align_of::<GameTextInputSpan>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameActivityPointerAxes))
+        concat!("Alignment of ", stringify!(GameTextInputSpan))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityPointerAxes>())).id as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).start) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameTextInputSpan),
             "::",
-            stringify!(id)
+            stringify!(start)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityPointerAxes>())).toolType as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).end) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameTextInputSpan),
             "::",
-            stringify!(toolType)
+            stringify!(end)
         )
     );
+}
+pub const GameTextInputSpanFlag_SPAN_UNDEFINED: GameTextInputSpanFlag = -1;
+#[doc = " Values with special meaning in a GameTextInputSpan."]
+pub type GameTextInputSpanFlag = ::std::os::raw::c_int;
+#[doc = " This struct holds the state of an editable section of text.\n The text can have a selection and a composing region defined on it.\n A composing region is used by IMEs that allow input using multiple steps to\n compose a glyph or word. Use functions GameTextInput_getState and\n GameTextInput_setState to read and modify the state that an IME is editing."]
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct GameTextInputState {
+    #[doc = " Text owned by the state, as a modified UTF-8 string. Null-terminated.\n https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8"]
+    pub text_UTF8: *const ::std::os::raw::c_char,
+    #[doc = " Length in bytes of text_UTF8, *not* including the null at end."]
+    pub text_length: i32,
+    #[doc = " A selection defined on the text."]
+    pub selection: GameTextInputSpan,
+    #[doc = " A composing region defined on the text."]
+    pub composingRegion: GameTextInputSpan,
+}
+#[test]
+fn bindgen_test_layout_GameTextInputState() {
+    const UNINIT: ::std::mem::MaybeUninit<GameTextInputState> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<GameTextInputState>(),
+        32usize,
+        concat!("Size of: ", stringify!(GameTextInputState))
+    );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityPointerAxes>())).axisValues as *const _ as usize
-        },
+        ::std::mem::align_of::<GameTextInputState>(),
         8usize,
+        concat!("Alignment of ", stringify!(GameTextInputState))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).text_UTF8) as usize - ptr as usize },
+        0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(axisValues)
+            stringify!(text_UTF8)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityPointerAxes>())).rawX as *const _ as usize },
-        200usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).text_length) as usize - ptr as usize },
+        8usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(rawX)
+            stringify!(text_length)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityPointerAxes>())).rawY as *const _ as usize },
-        204usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).selection) as usize - ptr as usize },
+        12usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(rawY)
-        )
-    );
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameActivityHistoricalPointerAxes {
-    pub eventTime: i64,
-    pub axisValues: [f32; 48usize],
-}
-#[test]
-fn bindgen_test_layout_GameActivityHistoricalPointerAxes() {
-    assert_eq!(
-        ::std::mem::size_of::<GameActivityHistoricalPointerAxes>(),
-        200usize,
-        concat!("Size of: ", stringify!(GameActivityHistoricalPointerAxes))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<GameActivityHistoricalPointerAxes>(),
-        8usize,
-        concat!(
-            "Alignment of ",
-            stringify!(GameActivityHistoricalPointerAxes)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityHistoricalPointerAxes>())).eventTime as *const _
-                as usize
-        },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityHistoricalPointerAxes),
-            "::",
-            stringify!(eventTime)
+            stringify!(selection)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityHistoricalPointerAxes>())).axisValues as *const _
-                as usize
-        },
-        8usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).composingRegion) as usize - ptr as usize },
+        20usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityHistoricalPointerAxes),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(axisValues)
+            stringify!(composingRegion)
         )
     );
 }
+#[doc = " A callback called by GameTextInput_getState.\n @param context User-defined context.\n @param state State, owned by the library, that will be valid for the duration\n of the callback."]
+pub type GameTextInputGetStateCallback = ::std::option::Option<
+    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, state: *const GameTextInputState),
+>;
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct GameTextInput {
+    _unused: [u8; 0],
+}
 extern "C" {
-    #[doc = " \\brief Enable the specified axis, so that its value is reported in the"]
-    #[doc = " GameActivityPointerAxes structures stored in a motion event."]
-    #[doc = ""]
-    #[doc = " You must enable any axis that you want to read, apart from"]
-    #[doc = " `AMOTION_EVENT_AXIS_X` and `AMOTION_EVENT_AXIS_Y` that are enabled by"]
-    #[doc = " default."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityPointerAxes_enableAxis(axis: i32);
+    #[doc = " Initialize the GameTextInput library.\n If called twice without GameTextInput_destroy being called, the same pointer\n will be returned and a warning will be issued.\n @param env A JNI env valid on the calling thread.\n @param max_string_size The maximum length of a string that can be edited. If\n zero, the maximum defaults to 65536 bytes. A buffer of this size is allocated\n at initialization.\n @return A handle to the library."]
+    pub fn GameTextInput_init(env: *mut JNIEnv, max_string_size: u32) -> *mut GameTextInput;
 }
 extern "C" {
-    #[doc = " \\brief Disable the specified axis. Its value won't be reported in the"]
-    #[doc = " GameActivityPointerAxes structures stored in a motion event anymore."]
-    #[doc = ""]
-    #[doc = " Apart from X and Y, any axis that you want to read **must** be enabled first,"]
-    #[doc = " using `GameActivityPointerAxes_enableAxis`."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityPointerAxes_disableAxis(axis: i32);
+    #[doc = " When using GameTextInput, you need to create a gametextinput.InputConnection\n on the Java side and pass it using this function to the library, unless using\n GameActivity in which case this will be done for you. See the GameActivity\n source code or GameTextInput samples for examples of usage.\n @param input A valid GameTextInput library handle.\n @param inputConnection A gametextinput.InputConnection object."]
+    pub fn GameTextInput_setInputConnection(input: *mut GameTextInput, inputConnection: jobject);
 }
 extern "C" {
-    #[doc = " \\brief Enable the specified axis, so that its value is reported in the"]
-    #[doc = " GameActivityHistoricalPointerAxes structures associated with a motion event."]
-    #[doc = ""]
-    #[doc = " You must enable any axis that you want to read (no axes are enabled by"]
-    #[doc = " default)."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityHistoricalPointerAxes_enableAxis(axis: i32);
+    #[doc = " Unless using GameActivity, it is required to call this function from your\n Java gametextinput.Listener.stateChanged method to convert eventState and\n trigger any event callbacks. When using GameActivity, this does not need to\n be called as event processing is handled by the Activity.\n @param input A valid GameTextInput library handle.\n @param eventState A Java gametextinput.State object."]
+    pub fn GameTextInput_processEvent(input: *mut GameTextInput, eventState: jobject);
 }
 extern "C" {
-    #[doc = " \\brief Disable the specified axis. Its value won't be reported in the"]
-    #[doc = " GameActivityHistoricalPointerAxes structures associated with motion events"]
-    #[doc = " anymore."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityHistoricalPointerAxes_disableAxis(axis: i32);
+    #[doc = " Free any resources owned by the GameTextInput library.\n Any subsequent calls to the library will fail until GameTextInput_init is\n called again.\n @param input A valid GameTextInput library handle."]
+    pub fn GameTextInput_destroy(input: *mut GameTextInput);
 }
-#[doc = " \\brief Describe a motion event that happened on the GameActivity SurfaceView."]
-#[doc = ""]
-#[doc = " This is 1:1 mapping to the information contained in a Java `MotionEvent`"]
-#[doc = " (see https://developer.android.com/reference/android/view/MotionEvent)."]
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameActivityMotionEvent {
-    pub deviceId: i32,
-    pub source: i32,
-    pub action: i32,
-    pub eventTime: i64,
-    pub downTime: i64,
-    pub flags: i32,
-    pub metaState: i32,
-    pub actionButton: i32,
-    pub buttonState: i32,
-    pub classification: i32,
-    pub edgeFlags: i32,
-    pub pointerCount: u32,
-    pub pointers: [GameActivityPointerAxes; 8usize],
-    pub precisionX: f32,
-    pub precisionY: f32,
-    pub historicalStart: i16,
-    pub historicalCount: i16,
+pub const ShowImeFlags_SHOW_IME_UNDEFINED: ShowImeFlags = 0;
+pub const ShowImeFlags_SHOW_IMPLICIT: ShowImeFlags = 1;
+pub const ShowImeFlags_SHOW_FORCED: ShowImeFlags = 2;
+#[doc = " Flags to be passed to GameTextInput_showIme."]
+pub type ShowImeFlags = ::std::os::raw::c_uint;
+extern "C" {
+    #[doc = " Show the IME. Calls InputMethodManager.showSoftInput().\n @param input A valid GameTextInput library handle.\n @param flags Defined in ShowImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
+    pub fn GameTextInput_showIme(input: *mut GameTextInput, flags: u32);
 }
-#[test]
-fn bindgen_test_layout_GameActivityMotionEvent() {
-    assert_eq!(
-        ::std::mem::size_of::<GameActivityMotionEvent>(),
-        1736usize,
-        concat!("Size of: ", stringify!(GameActivityMotionEvent))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<GameActivityMotionEvent>(),
-        8usize,
-        concat!("Alignment of ", stringify!(GameActivityMotionEvent))
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).deviceId as *const _ as usize
-        },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(deviceId)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityMotionEvent>())).source as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(source)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityMotionEvent>())).action as *const _ as usize },
-        8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(action)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).eventTime as *const _ as usize
-        },
-        16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(eventTime)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).downTime as *const _ as usize
-        },
-        24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(downTime)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityMotionEvent>())).flags as *const _ as usize },
-        32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(flags)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).metaState as *const _ as usize
-        },
-        36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(metaState)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).actionButton as *const _ as usize
-        },
-        40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(actionButton)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).buttonState as *const _ as usize
-        },
-        44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(buttonState)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).classification as *const _ as usize
-        },
-        48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(classification)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).edgeFlags as *const _ as usize
-        },
-        52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(edgeFlags)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).pointerCount as *const _ as usize
-        },
-        56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(pointerCount)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).pointers as *const _ as usize
-        },
-        60usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(pointers)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).precisionX as *const _ as usize
-        },
-        1724usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(precisionX)
-        )
+pub const HideImeFlags_HIDE_IME_UNDEFINED: HideImeFlags = 0;
+pub const HideImeFlags_HIDE_IMPLICIT_ONLY: HideImeFlags = 1;
+pub const HideImeFlags_HIDE_NOT_ALWAYS: HideImeFlags = 2;
+#[doc = " Flags to be passed to GameTextInput_hideIme."]
+pub type HideImeFlags = ::std::os::raw::c_uint;
+extern "C" {
+    #[doc = " Show the IME. Calls InputMethodManager.hideSoftInputFromWindow().\n @param input A valid GameTextInput library handle.\n @param flags Defined in HideImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
+    pub fn GameTextInput_hideIme(input: *mut GameTextInput, flags: u32);
+}
+extern "C" {
+    #[doc = " Restarts the input method. Calls InputMethodManager.restartInput().\n @param input A valid GameTextInput library handle."]
+    pub fn GameTextInput_restartInput(input: *mut GameTextInput);
+}
+extern "C" {
+    #[doc = " Call a callback with the current GameTextInput state, which may have been\n modified by changes in the IME and calls to GameTextInput_setState. We use a\n callback rather than returning the state in order to simplify ownership of\n text_UTF8 strings. These strings are only valid during the calling of the\n callback.\n @param input A valid GameTextInput library handle.\n @param callback A function that will be called with valid state.\n @param context Context used by the callback."]
+    pub fn GameTextInput_getState(
+        input: *mut GameTextInput,
+        callback: GameTextInputGetStateCallback,
+        context: *mut ::std::os::raw::c_void,
     );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).precisionY as *const _ as usize
-        },
-        1728usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(precisionY)
-        )
+}
+extern "C" {
+    #[doc = " Set the current GameTextInput state. This state is reflected to any active\n IME.\n @param input A valid GameTextInput library handle.\n @param state The state to set. Ownership is maintained by the caller and must\n remain valid for the duration of the call."]
+    pub fn GameTextInput_setState(input: *mut GameTextInput, state: *const GameTextInputState);
+}
+#[doc = " Type of the callback needed by GameTextInput_setEventCallback that will be\n called every time the IME state changes.\n @param context User-defined context set in GameTextInput_setEventCallback.\n @param current_state Current IME state, owned by the library and valid during\n the callback."]
+pub type GameTextInputEventCallback = ::std::option::Option<
+    unsafe extern "C" fn(
+        context: *mut ::std::os::raw::c_void,
+        current_state: *const GameTextInputState,
+    ),
+>;
+extern "C" {
+    #[doc = " Optionally set a callback to be called whenever the IME state changes.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME state changes.\n @param context Context passed as first argument to the callback."]
+    pub fn GameTextInput_setEventCallback(
+        input: *mut GameTextInput,
+        callback: GameTextInputEventCallback,
+        context: *mut ::std::os::raw::c_void,
     );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).historicalStart as *const _ as usize
-        },
-        1732usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalStart)
-        )
+}
+#[doc = " Type of the callback needed by GameTextInput_setImeInsetsCallback that will\n be called every time the IME window insets change.\n @param context User-defined context set in\n GameTextInput_setImeWIndowInsetsCallback.\n @param current_insets Current IME insets, owned by the library and valid\n during the callback."]
+pub type GameTextInputImeInsetsCallback = ::std::option::Option<
+    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, current_insets: *const ARect),
+>;
+extern "C" {
+    #[doc = " Optionally set a callback to be called whenever the IME insets change.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME insets change.\n @param context Context passed as first argument to the callback."]
+    pub fn GameTextInput_setImeInsetsCallback(
+        input: *mut GameTextInput,
+        callback: GameTextInputImeInsetsCallback,
+        context: *mut ::std::os::raw::c_void,
     );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).historicalCount as *const _ as usize
-        },
-        1734usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalCount)
-        )
+}
+extern "C" {
+    #[doc = " Get the current window insets for the IME.\n @param input A valid GameTextInput library handle.\n @param insets Filled with the current insets by this function."]
+    pub fn GameTextInput_getImeInsets(input: *const GameTextInput, insets: *mut ARect);
+}
+extern "C" {
+    #[doc = " Unless using GameActivity, it is required to call this function from your\n Java gametextinput.Listener.onImeInsetsChanged method to\n trigger any event callbacks. When using GameActivity, this does not need to\n be called as insets processing is handled by the Activity.\n @param input A valid GameTextInput library handle.\n @param eventState A Java gametextinput.State object."]
+    pub fn GameTextInput_processImeInsets(input: *mut GameTextInput, insets: *const ARect);
+}
+extern "C" {
+    #[doc = " Convert a GameTextInputState struct to a Java gametextinput.State object.\n Don't forget to delete the returned Java local ref when you're done.\n @param input A valid GameTextInput library handle.\n @param state Input state to convert.\n @return A Java object of class gametextinput.State. The caller is required to\n delete this local reference."]
+    pub fn GameTextInputState_toJava(
+        input: *const GameTextInput,
+        state: *const GameTextInputState,
+    ) -> jobject;
+}
+extern "C" {
+    #[doc = " Convert from a Java gametextinput.State object into a C GameTextInputState\n struct.\n @param input A valid GameTextInput library handle.\n @param state A Java gametextinput.State object.\n @param callback A function called with the C struct, valid for the duration\n of the call.\n @param context Context passed to the callback."]
+    pub fn GameTextInputState_fromJava(
+        input: *const GameTextInput,
+        state: jobject,
+        callback: GameTextInputGetStateCallback,
+        context: *mut ::std::os::raw::c_void,
     );
 }
-#[doc = " \\brief Describe a key event that happened on the GameActivity SurfaceView."]
-#[doc = ""]
-#[doc = " This is 1:1 mapping to the information contained in a Java `KeyEvent`"]
-#[doc = " (see https://developer.android.com/reference/android/view/KeyEvent)."]
+#[doc = " This structure defines the native side of an android.app.GameActivity.\n It is created by the framework, and handed to the application's native\n code as it is being launched."]
 #[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameActivityKeyEvent {
-    pub deviceId: i32,
-    pub source: i32,
-    pub action: i32,
-    pub eventTime: i64,
-    pub downTime: i64,
-    pub flags: i32,
-    pub metaState: i32,
-    pub modifiers: i32,
-    pub repeatCount: i32,
-    pub keyCode: i32,
-    pub scanCode: i32,
+pub struct GameActivity {
+    #[doc = " Pointer to the callback function table of the native application.\n You can set the functions here to your own callbacks.  The callbacks\n pointer itself here should not be changed; it is allocated and managed\n for you by the framework."]
+    pub callbacks: *mut GameActivityCallbacks,
+    #[doc = " The global handle on the process's Java VM."]
+    pub vm: *mut JavaVM,
+    #[doc = " JNI context for the main thread of the app.  Note that this field\n can ONLY be used from the main thread of the process; that is, the\n thread that calls into the GameActivityCallbacks."]
+    pub env: *mut JNIEnv,
+    #[doc = " The GameActivity object handle."]
+    pub javaGameActivity: jobject,
+    #[doc = " Path to this application's internal data directory."]
+    pub internalDataPath: *const ::std::os::raw::c_char,
+    #[doc = " Path to this application's external (removable/mountable) data directory."]
+    pub externalDataPath: *const ::std::os::raw::c_char,
+    #[doc = " The platform's SDK version code."]
+    pub sdkVersion: i32,
+    #[doc = " This is the native instance of the application.  It is not used by\n the framework, but can be set by the application to its own instance\n state."]
+    pub instance: *mut ::std::os::raw::c_void,
+    #[doc = " Pointer to the Asset Manager instance for the application.  The\n application uses this to access binary assets bundled inside its own .apk\n file."]
+    pub assetManager: *mut AAssetManager,
+    #[doc = " Available starting with Honeycomb: path to the directory containing\n the application's OBB files (if any).  If the app doesn't have any\n OBB files, this directory may not exist."]
+    pub obbPath: *const ::std::os::raw::c_char,
 }
 #[test]
-fn bindgen_test_layout_GameActivityKeyEvent() {
+fn bindgen_test_layout_GameActivity() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivity> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<GameActivityKeyEvent>(),
-        56usize,
-        concat!("Size of: ", stringify!(GameActivityKeyEvent))
+        ::std::mem::size_of::<GameActivity>(),
+        80usize,
+        concat!("Size of: ", stringify!(GameActivity))
     );
     assert_eq!(
-        ::std::mem::align_of::<GameActivityKeyEvent>(),
+        ::std::mem::align_of::<GameActivity>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameActivityKeyEvent))
+        concat!("Alignment of ", stringify!(GameActivity))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).deviceId as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).callbacks) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(deviceId)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).source as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(source)
+            stringify!(callbacks)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).action as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).vm) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(action)
+            stringify!(vm)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).eventTime as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).env) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(eventTime)
+            stringify!(env)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).downTime as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).javaGameActivity) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(downTime)
+            stringify!(javaGameActivity)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).internalDataPath) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(flags)
+            stringify!(internalDataPath)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).metaState as *const _ as usize },
-        36usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).externalDataPath) as usize - ptr as usize },
+        40usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(metaState)
+            stringify!(externalDataPath)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).modifiers as *const _ as usize },
-        40usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).sdkVersion) as usize - ptr as usize },
+        48usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(modifiers)
+            stringify!(sdkVersion)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityKeyEvent>())).repeatCount as *const _ as usize
-        },
-        44usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).instance) as usize - ptr as usize },
+        56usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(repeatCount)
+            stringify!(instance)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).keyCode as *const _ as usize },
-        48usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).assetManager) as usize - ptr as usize },
+        64usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(keyCode)
+            stringify!(assetManager)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).scanCode as *const _ as usize },
-        52usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).obbPath) as usize - ptr as usize },
+        72usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(scanCode)
+            stringify!(obbPath)
         )
     );
 }
-#[doc = " A function the user should call from their callback with the data, its length"]
-#[doc = " and the library- supplied context."]
+#[doc = " A function the user should call from their callback with the data, its length\n and the library- supplied context."]
 pub type SaveInstanceStateRecallback = ::std::option::Option<
     unsafe extern "C" fn(
         bytes: *const ::std::os::raw::c_char,
@@ -3265,18 +3221,11 @@ pub type SaveInstanceStateRecallback = ::std::option::Option<
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct GameActivityCallbacks {
-    #[doc = " GameActivity has started.  See Java documentation for Activity.onStart()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has started.  See Java documentation for Activity.onStart()\n for more information."]
     pub onStart: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " GameActivity has resumed.  See Java documentation for Activity.onResume()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has resumed.  See Java documentation for Activity.onResume()\n for more information."]
     pub onResume: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " The framework is asking GameActivity to save its current instance state."]
-    #[doc = " See the Java documentation for Activity.onSaveInstanceState() for more"]
-    #[doc = " information. The user should call the recallback with their data, its"]
-    #[doc = " length and the provided context; they retain ownership of the data. Note"]
-    #[doc = " that the saved state will be persisted, so it can not contain any active"]
-    #[doc = " entities (pointers to memory, file descriptors, etc)."]
+    #[doc = " The framework is asking GameActivity to save its current instance state.\n See the Java documentation for Activity.onSaveInstanceState() for more\n information. The user should call the recallback with their data, its\n length and the provided context; they retain ownership of the data. Note\n that the saved state will be persisted, so it can not contain any active\n entities (pointers to memory, file descriptors, etc)."]
     pub onSaveInstanceState: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
@@ -3284,27 +3233,20 @@ pub struct GameActivityCallbacks {
             context: *mut ::std::os::raw::c_void,
         ),
     >,
-    #[doc = " GameActivity has paused.  See Java documentation for Activity.onPause()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has paused.  See Java documentation for Activity.onPause()\n for more information."]
     pub onPause: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " GameActivity has stopped.  See Java documentation for Activity.onStop()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has stopped.  See Java documentation for Activity.onStop()\n for more information."]
     pub onStop: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " GameActivity is being destroyed.  See Java documentation for"]
-    #[doc = " Activity.onDestroy() for more information."]
+    #[doc = " GameActivity is being destroyed.  See Java documentation for\n Activity.onDestroy() for more information."]
     pub onDestroy: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " Focus has changed in this GameActivity's window.  This is often used,"]
-    #[doc = " for example, to pause a game when it loses input focus."]
+    #[doc = " Focus has changed in this GameActivity's window.  This is often used,\n for example, to pause a game when it loses input focus."]
     pub onWindowFocusChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity, hasFocus: bool)>,
-    #[doc = " The drawing window for this native activity has been created.  You"]
-    #[doc = " can use the given native window object to start drawing."]
+    #[doc = " The drawing window for this native activity has been created.  You\n can use the given native window object to start drawing."]
     pub onNativeWindowCreated: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The drawing window for this native activity has been resized.  You should"]
-    #[doc = " retrieve the new size from the window and ensure that your rendering in"]
-    #[doc = " it now matches."]
+    #[doc = " The drawing window for this native activity has been resized.  You should\n retrieve the new size from the window and ensure that your rendering in\n it now matches."]
     pub onNativeWindowResized: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
@@ -3313,77 +3255,62 @@ pub struct GameActivityCallbacks {
             newHeight: i32,
         ),
     >,
-    #[doc = " The drawing window for this native activity needs to be redrawn.  To"]
-    #[doc = " avoid transient artifacts during screen changes (such resizing after"]
-    #[doc = " rotation), applications should not return from this function until they"]
-    #[doc = " have finished drawing their window in its current state."]
+    #[doc = " The drawing window for this native activity needs to be redrawn.  To\n avoid transient artifacts during screen changes (such resizing after\n rotation), applications should not return from this function until they\n have finished drawing their window in its current state."]
     pub onNativeWindowRedrawNeeded: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The drawing window for this native activity is going to be destroyed."]
-    #[doc = " You MUST ensure that you do not touch the window object after returning"]
-    #[doc = " from this function: in the common case of drawing to the window from"]
-    #[doc = " another thread, that means the implementation of this callback must"]
-    #[doc = " properly synchronize with the other thread to stop its drawing before"]
-    #[doc = " returning from here."]
+    #[doc = " The drawing window for this native activity is going to be destroyed.\n You MUST ensure that you do not touch the window object after returning\n from this function: in the common case of drawing to the window from\n another thread, that means the implementation of this callback must\n properly synchronize with the other thread to stop its drawing before\n returning from here."]
     pub onNativeWindowDestroyed: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The current device AConfiguration has changed.  The new configuration can"]
-    #[doc = " be retrieved from assetManager."]
+    #[doc = " The current device AConfiguration has changed.  The new configuration can\n be retrieved from assetManager."]
     pub onConfigurationChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " The system is running low on memory.  Use this callback to release"]
-    #[doc = " resources you do not need, to help the system avoid killing more"]
-    #[doc = " important processes."]
+    #[doc = " The system is running low on memory.  Use this callback to release\n resources you do not need, to help the system avoid killing more\n important processes."]
     pub onTrimMemory: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, level: ::std::os::raw::c_int),
     >,
-    #[doc = " Callback called for every MotionEvent done on the GameActivity"]
-    #[doc = " SurfaceView. Ownership of `event` is maintained by the library and it is"]
-    #[doc = " only valid during the callback."]
+    #[doc = " Callback called for every MotionEvent done on the GameActivity\n SurfaceView. Ownership of `event` is maintained by the library and it is\n only valid during the callback."]
     pub onTouchEvent: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
             event: *const GameActivityMotionEvent,
-            historical: *const GameActivityHistoricalPointerAxes,
-            historicalLen: ::std::os::raw::c_int,
         ) -> bool,
     >,
-    #[doc = " Callback called for every key down event on the GameActivity SurfaceView."]
-    #[doc = " Ownership of `event` is maintained by the library and it is only valid"]
-    #[doc = " during the callback."]
+    #[doc = " Callback called for every key down event on the GameActivity SurfaceView.\n Ownership of `event` is maintained by the library and it is only valid\n during the callback."]
     pub onKeyDown: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
             event: *const GameActivityKeyEvent,
         ) -> bool,
     >,
-    #[doc = " Callback called for every key up event on the GameActivity SurfaceView."]
-    #[doc = " Ownership of `event` is maintained by the library and it is only valid"]
-    #[doc = " during the callback."]
+    #[doc = " Callback called for every key up event on the GameActivity SurfaceView.\n Ownership of `event` is maintained by the library and it is only valid\n during the callback."]
     pub onKeyUp: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
             event: *const GameActivityKeyEvent,
         ) -> bool,
     >,
-    #[doc = " Callback called for every soft-keyboard text input event."]
-    #[doc = " Ownership of `state` is maintained by the library and it is only valid"]
-    #[doc = " during the callback."]
+    #[doc = " Callback called for every soft-keyboard text input event.\n Ownership of `state` is maintained by the library and it is only valid\n during the callback."]
     pub onTextInputEvent: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, state: *const GameTextInputState),
     >,
-    #[doc = " Callback called when WindowInsets of the main app window have changed."]
-    #[doc = " Call GameActivity_getWindowInsets to retrieve the insets themselves."]
+    #[doc = " Callback called when WindowInsets of the main app window have changed.\n Call GameActivity_getWindowInsets to retrieve the insets themselves."]
     pub onWindowInsetsChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
+    #[doc = " Callback called when the rectangle in the window where the content\n should be placed has changed."]
+    pub onContentRectChanged: ::std::option::Option<
+        unsafe extern "C" fn(activity: *mut GameActivity, rect: *const ARect),
+    >,
 }
 #[test]
 fn bindgen_test_layout_GameActivityCallbacks() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityCallbacks> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<GameActivityCallbacks>(),
-        144usize,
+        152usize,
         concat!("Size of: ", stringify!(GameActivityCallbacks))
     );
     assert_eq!(
@@ -3392,7 +3319,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         concat!("Alignment of ", stringify!(GameActivityCallbacks))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onStart as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onStart) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -3402,7 +3329,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onResume as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onResume) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -3412,10 +3339,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onSaveInstanceState as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onSaveInstanceState) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -3425,7 +3349,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onPause as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onPause) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -3435,7 +3359,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onStop as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onStop) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -3445,7 +3369,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onDestroy as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onDestroy) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -3455,10 +3379,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onWindowFocusChanged as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onWindowFocusChanged) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -3468,10 +3389,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowCreated as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowCreated) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -3481,10 +3399,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowResized as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowResized) as usize - ptr as usize },
         64usize,
         concat!(
             "Offset of field: ",
@@ -3494,10 +3409,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowRedrawNeeded as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowRedrawNeeded) as usize - ptr as usize },
         72usize,
         concat!(
             "Offset of field: ",
@@ -3507,10 +3419,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowDestroyed as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowDestroyed) as usize - ptr as usize },
         80usize,
         concat!(
             "Offset of field: ",
@@ -3520,10 +3429,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onConfigurationChanged as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onConfigurationChanged) as usize - ptr as usize },
         88usize,
         concat!(
             "Offset of field: ",
@@ -3533,9 +3439,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onTrimMemory as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onTrimMemory) as usize - ptr as usize },
         96usize,
         concat!(
             "Offset of field: ",
@@ -3545,9 +3449,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onTouchEvent as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onTouchEvent) as usize - ptr as usize },
         104usize,
         concat!(
             "Offset of field: ",
@@ -3557,7 +3459,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onKeyDown as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onKeyDown) as usize - ptr as usize },
         112usize,
         concat!(
             "Offset of field: ",
@@ -3567,7 +3469,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onKeyUp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onKeyUp) as usize - ptr as usize },
         120usize,
         concat!(
             "Offset of field: ",
@@ -3577,9 +3479,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onTextInputEvent as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onTextInputEvent) as usize - ptr as usize },
         128usize,
         concat!(
             "Offset of field: ",
@@ -3589,10 +3489,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onWindowInsetsChanged as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onWindowInsetsChanged) as usize - ptr as usize },
         136usize,
         concat!(
             "Offset of field: ",
@@ -3601,269 +3498,124 @@ fn bindgen_test_layout_GameActivityCallbacks() {
             stringify!(onWindowInsetsChanged)
         )
     );
-}
-extern "C" {
-    #[doc = " \\brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`."]
-    #[doc = ""]
-    #[doc = " This is done automatically by the GameActivity: see `onTouchEvent` to set"]
-    #[doc = " a callback to consume the received events."]
-    #[doc = " This function can be used if you re-implement events handling in your own"]
-    #[doc = " activity. On return, the out_event->historicalStart will be zero, and should"]
-    #[doc = " be updated to index into whatever buffer out_historical is copied."]
-    #[doc = " On return the length of out_historical is"]
-    #[doc = " (out_event->pointerCount x out_event->historicalCount) and is in a"]
-    #[doc = " pointer-major order (i.e. all axis for a pointer are contiguous)"]
-    #[doc = " Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityMotionEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityMotionEvent,
-        out_historical: *mut GameActivityHistoricalPointerAxes,
-    ) -> ::std::os::raw::c_int;
-}
-extern "C" {
-    #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`."]
-    #[doc = ""]
-    #[doc = " This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`"]
-    #[doc = " to set a callback to consume the received events."]
-    #[doc = " This function can be used if you re-implement events handling in your own"]
-    #[doc = " activity."]
-    #[doc = " Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityKeyEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityKeyEvent,
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).onContentRectChanged) as usize - ptr as usize },
+        144usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityCallbacks),
+            "::",
+            stringify!(onContentRectChanged)
+        )
     );
 }
-#[doc = " This is the function that must be in the native code to instantiate the"]
-#[doc = " application's native activity.  It is called with the activity instance (see"]
-#[doc = " above); if the code is being instantiated from a previously saved instance,"]
-#[doc = " the savedState will be non-NULL and point to the saved data.  You must make"]
-#[doc = " any copy of this data you need -- it will be released after you return from"]
-#[doc = " this function."]
+#[doc = " This is the function that must be in the native code to instantiate the\n application's native activity.  It is called with the activity instance (see\n above); if the code is being instantiated from a previously saved instance,\n the savedState will be non-NULL and point to the saved data.  You must make\n any copy of this data you need -- it will be released after you return from\n this function."]
 pub type GameActivity_createFunc = ::std::option::Option<
     unsafe extern "C" fn(
         activity: *mut GameActivity,
         savedState: *mut ::std::os::raw::c_void,
-        savedStateSize: size_t,
+        savedStateSize: usize,
     ),
 >;
 extern "C" {
-    #[doc = " Finish the given activity.  Its finish() method will be called, causing it"]
-    #[doc = " to be stopped and destroyed.  Note that this method can be called from"]
-    #[doc = " *any* thread; it will send a message to the main thread of the process"]
-    #[doc = " where the Java finish call will take place."]
+    #[doc = " Finish the given activity.  Its finish() method will be called, causing it\n to be stopped and destroyed.  Note that this method can be called from\n *any* thread; it will send a message to the main thread of the process\n where the Java finish call will take place."]
     pub fn GameActivity_finish(activity: *mut GameActivity);
 }
-#[doc = " As long as this window is visible to the user, allow the lock"]
-#[doc = " screen to activate while the screen is on.  This can be used"]
-#[doc = " independently, or in combination with {@link"]
-#[doc = " GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} and/or {@link"]
-#[doc = " GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}"]
+#[doc = " As long as this window is visible to the user, allow the lock\n screen to activate while the screen is on.  This can be used\n independently, or in combination with {@link\n GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} and/or {@link\n GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}"]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_ALLOW_LOCK_WHILE_SCREEN_ON:
     GameActivitySetWindowFlags = 1;
 #[doc = " Everything behind this window will be dimmed."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DIM_BEHIND: GameActivitySetWindowFlags = 2;
-#[doc = " Blur everything behind this window."]
-#[doc = " @deprecated Blurring is no longer supported."]
+#[doc = " Blur everything behind this window.\n @deprecated Blurring is no longer supported."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_BLUR_BEHIND: GameActivitySetWindowFlags = 4;
-#[doc = " This window won't ever get key input focus, so the"]
-#[doc = " user can not send key or other button events to it.  Those will"]
-#[doc = " instead go to whatever focusable window is behind it.  This flag"]
-#[doc = " will also enable {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL} whether or not"]
-#[doc = " that is explicitly set."]
-#[doc = ""]
-#[doc = " Setting this flag also implies that the window will not need to"]
-#[doc = " interact with"]
-#[doc = " a soft input method, so it will be Z-ordered and positioned"]
-#[doc = " independently of any active input method (typically this means it"]
-#[doc = " gets Z-ordered on top of the input method, so it can use the full"]
-#[doc = " screen for its content and cover the input method if needed.  You"]
-#[doc = " can use {@link GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM} to modify this"]
-#[doc = " behavior."]
+#[doc = " This window won't ever get key input focus, so the\n user can not send key or other button events to it.  Those will\n instead go to whatever focusable window is behind it.  This flag\n will also enable {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL} whether or not\n that is explicitly set.\n\n Setting this flag also implies that the window will not need to\n interact with\n a soft input method, so it will be Z-ordered and positioned\n independently of any active input method (typically this means it\n gets Z-ordered on top of the input method, so it can use the full\n screen for its content and cover the input method if needed.  You\n can use {@link GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM} to modify this\n behavior."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_NOT_FOCUSABLE: GameActivitySetWindowFlags =
     8;
 #[doc = " This window can never receive touch events."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_NOT_TOUCHABLE: GameActivitySetWindowFlags =
     16;
-#[doc = " Even when this window is focusable (its"]
-#[doc = " {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set), allow any pointer"]
-#[doc = " events outside of the window to be sent to the windows behind it."]
-#[doc = " Otherwise it will consume all pointer events itself, regardless of"]
-#[doc = " whether they are inside of the window."]
+#[doc = " Even when this window is focusable (its\n {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set), allow any pointer\n events outside of the window to be sent to the windows behind it.\n Otherwise it will consume all pointer events itself, regardless of\n whether they are inside of the window."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL: GameActivitySetWindowFlags =
     32;
-#[doc = " When set, if the device is asleep when the touch"]
-#[doc = " screen is pressed, you will receive this first touch event.  Usually"]
-#[doc = " the first touch event is consumed by the system since the user can"]
-#[doc = " not see what they are pressing on."]
-#[doc = ""]
-#[doc = " @deprecated This flag has no effect."]
+#[doc = " When set, if the device is asleep when the touch\n screen is pressed, you will receive this first touch event.  Usually\n the first touch event is consumed by the system since the user can\n not see what they are pressing on.\n\n @deprecated This flag has no effect."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_TOUCHABLE_WHEN_WAKING:
     GameActivitySetWindowFlags = 64;
-#[doc = " As long as this window is visible to the user, keep"]
-#[doc = " the device's screen turned on and bright."]
+#[doc = " As long as this window is visible to the user, keep\n the device's screen turned on and bright."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_KEEP_SCREEN_ON: GameActivitySetWindowFlags =
     128;
-#[doc = " Place the window within the entire screen, ignoring"]
-#[doc = " decorations around the border (such as the status bar).  The"]
-#[doc = " window must correctly position its contents to take the screen"]
-#[doc = " decoration into account."]
+#[doc = " Place the window within the entire screen, ignoring\n decorations around the border (such as the status bar).  The\n window must correctly position its contents to take the screen\n decoration into account."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN:
     GameActivitySetWindowFlags = 256;
 #[doc = " Allows the window to extend outside of the screen."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_LAYOUT_NO_LIMITS:
     GameActivitySetWindowFlags = 512;
-#[doc = " Hide all screen decorations (such as the status"]
-#[doc = " bar) while this window is displayed.  This allows the window to"]
-#[doc = " use the entire display space for itself -- the status bar will"]
-#[doc = " be hidden when an app window with this flag set is on the top"]
-#[doc = " layer. A fullscreen window will ignore a value of {@link"]
-#[doc = " GAMEACTIVITY_SOFT_INPUT_ADJUST_RESIZE}; the window will stay"]
-#[doc = " fullscreen and will not resize."]
+#[doc = " Hide all screen decorations (such as the status\n bar) while this window is displayed.  This allows the window to\n use the entire display space for itself -- the status bar will\n be hidden when an app window with this flag set is on the top\n layer. A fullscreen window will ignore a value of {@link\n GAMEACTIVITY_SOFT_INPUT_ADJUST_RESIZE}; the window will stay\n fullscreen and will not resize."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_FULLSCREEN: GameActivitySetWindowFlags =
     1024;
-#[doc = " Override {@link GAMEACTIVITY_FLAG_FULLSCREEN} and force the"]
-#[doc = " screen decorations (such as the status bar) to be shown."]
+#[doc = " Override {@link GAMEACTIVITY_FLAG_FULLSCREEN} and force the\n screen decorations (such as the status bar) to be shown."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_FORCE_NOT_FULLSCREEN:
     GameActivitySetWindowFlags = 2048;
-#[doc = " Turn on dithering when compositing this window to"]
-#[doc = " the screen."]
-#[doc = " @deprecated This flag is no longer used."]
+#[doc = " Turn on dithering when compositing this window to\n the screen.\n @deprecated This flag is no longer used."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DITHER: GameActivitySetWindowFlags = 4096;
-#[doc = " Treat the content of the window as secure, preventing"]
-#[doc = " it from appearing in screenshots or from being viewed on non-secure"]
-#[doc = " displays."]
+#[doc = " Treat the content of the window as secure, preventing\n it from appearing in screenshots or from being viewed on non-secure\n displays."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SECURE: GameActivitySetWindowFlags = 8192;
-#[doc = " A special mode where the layout parameters are used"]
-#[doc = " to perform scaling of the surface when it is composited to the"]
-#[doc = " screen."]
+#[doc = " A special mode where the layout parameters are used\n to perform scaling of the surface when it is composited to the\n screen."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SCALED: GameActivitySetWindowFlags = 16384;
-#[doc = " Intended for windows that will often be used when the user is"]
-#[doc = " holding the screen against their face, it will aggressively"]
-#[doc = " filter the event stream to prevent unintended presses in this"]
-#[doc = " situation that may not be desired for a particular window, when"]
-#[doc = " such an event stream is detected, the application will receive"]
-#[doc = " a {@link AMOTION_EVENT_ACTION_CANCEL} to indicate this so"]
-#[doc = " applications can handle this accordingly by taking no action on"]
-#[doc = " the event until the finger is released."]
+#[doc = " Intended for windows that will often be used when the user is\n holding the screen against their face, it will aggressively\n filter the event stream to prevent unintended presses in this\n situation that may not be desired for a particular window, when\n such an event stream is detected, the application will receive\n a {@link AMOTION_EVENT_ACTION_CANCEL} to indicate this so\n applications can handle this accordingly by taking no action on\n the event until the finger is released."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_IGNORE_CHEEK_PRESSES:
     GameActivitySetWindowFlags = 32768;
-#[doc = " A special option only for use in combination with"]
-#[doc = " {@link GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN}.  When requesting layout in"]
-#[doc = " the screen your window may appear on top of or behind screen decorations"]
-#[doc = " such as the status bar.  By also including this flag, the window"]
-#[doc = " manager will report the inset rectangle needed to ensure your"]
-#[doc = " content is not covered by screen decorations."]
+#[doc = " A special option only for use in combination with\n {@link GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN}.  When requesting layout in\n the screen your window may appear on top of or behind screen decorations\n such as the status bar.  By also including this flag, the window\n manager will report the inset rectangle needed to ensure your\n content is not covered by screen decorations."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_LAYOUT_INSET_DECOR:
     GameActivitySetWindowFlags = 65536;
-#[doc = " Invert the state of {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} with"]
-#[doc = " respect to how this window interacts with the current method."]
-#[doc = " That is, if FLAG_NOT_FOCUSABLE is set and this flag is set,"]
-#[doc = " then the window will behave as if it needs to interact with the"]
-#[doc = " input method and thus be placed behind/away from it; if {@link"]
-#[doc = " GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set and this flag is set,"]
-#[doc = " then the window will behave as if it doesn't need to interact"]
-#[doc = " with the input method and can be placed to use more space and"]
-#[doc = " cover the input method."]
+#[doc = " Invert the state of {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} with\n respect to how this window interacts with the current method.\n That is, if FLAG_NOT_FOCUSABLE is set and this flag is set,\n then the window will behave as if it needs to interact with the\n input method and thus be placed behind/away from it; if {@link\n GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set and this flag is set,\n then the window will behave as if it doesn't need to interact\n with the input method and can be placed to use more space and\n cover the input method."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM:
     GameActivitySetWindowFlags = 131072;
-#[doc = " If you have set {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL}, you"]
-#[doc = " can set this flag to receive a single special MotionEvent with"]
-#[doc = " the action"]
-#[doc = " {@link AMOTION_EVENT_ACTION_OUTSIDE} for"]
-#[doc = " touches that occur outside of your window.  Note that you will not"]
-#[doc = " receive the full down/move/up gesture, only the location of the"]
-#[doc = " first down as an {@link AMOTION_EVENT_ACTION_OUTSIDE}."]
+#[doc = " If you have set {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL}, you\n can set this flag to receive a single special MotionEvent with\n the action\n {@link AMOTION_EVENT_ACTION_OUTSIDE} for\n touches that occur outside of your window.  Note that you will not\n receive the full down/move/up gesture, only the location of the\n first down as an {@link AMOTION_EVENT_ACTION_OUTSIDE}."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_WATCH_OUTSIDE_TOUCH:
     GameActivitySetWindowFlags = 262144;
-#[doc = " Special flag to let windows be shown when the screen"]
-#[doc = " is locked. This will let application windows take precedence over"]
-#[doc = " key guard or any other lock screens. Can be used with"]
-#[doc = " {@link GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} to turn screen on and display"]
-#[doc = " windows directly before showing the key guard window.  Can be used with"]
-#[doc = " {@link GAMEACTIVITY_FLAG_DISMISS_KEYGUARD} to automatically fully"]
-#[doc = " dismisss non-secure keyguards.  This flag only applies to the top-most"]
-#[doc = " full-screen window."]
+#[doc = " Special flag to let windows be shown when the screen\n is locked. This will let application windows take precedence over\n key guard or any other lock screens. Can be used with\n {@link GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} to turn screen on and display\n windows directly before showing the key guard window.  Can be used with\n {@link GAMEACTIVITY_FLAG_DISMISS_KEYGUARD} to automatically fully\n dismisss non-secure keyguards.  This flag only applies to the top-most\n full-screen window."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED:
     GameActivitySetWindowFlags = 524288;
-#[doc = " Ask that the system wallpaper be shown behind"]
-#[doc = " your window.  The window surface must be translucent to be able"]
-#[doc = " to actually see the wallpaper behind it; this flag just ensures"]
-#[doc = " that the wallpaper surface will be there if this window actually"]
-#[doc = " has translucent regions."]
+#[doc = " Ask that the system wallpaper be shown behind\n your window.  The window surface must be translucent to be able\n to actually see the wallpaper behind it; this flag just ensures\n that the wallpaper surface will be there if this window actually\n has translucent regions."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SHOW_WALLPAPER: GameActivitySetWindowFlags =
     1048576;
-#[doc = " When set as a window is being added or made"]
-#[doc = " visible, once the window has been shown then the system will"]
-#[doc = " poke the power manager's user activity (as if the user had woken"]
-#[doc = " up the device) to turn the screen on."]
+#[doc = " When set as a window is being added or made\n visible, once the window has been shown then the system will\n poke the power manager's user activity (as if the user had woken\n up the device) to turn the screen on."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_TURN_SCREEN_ON: GameActivitySetWindowFlags =
     2097152;
-#[doc = " When set the window will cause the keyguard to"]
-#[doc = " be dismissed, only if it is not a secure lock keyguard.  Because such"]
-#[doc = " a keyguard is not needed for security, it will never re-appear if"]
-#[doc = " the user navigates to another window (in contrast to"]
-#[doc = " {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}, which will only temporarily"]
-#[doc = " hide both secure and non-secure keyguards but ensure they reappear"]
-#[doc = " when the user moves to another UI that doesn't hide them)."]
-#[doc = " If the keyguard is currently active and is secure (requires an"]
-#[doc = " unlock pattern) than the user will still need to confirm it before"]
-#[doc = " seeing this window, unless {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED} has"]
-#[doc = " also been set."]
+#[doc = " When set the window will cause the keyguard to\n be dismissed, only if it is not a secure lock keyguard.  Because such\n a keyguard is not needed for security, it will never re-appear if\n the user navigates to another window (in contrast to\n {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}, which will only temporarily\n hide both secure and non-secure keyguards but ensure they reappear\n when the user moves to another UI that doesn't hide them).\n If the keyguard is currently active and is secure (requires an\n unlock pattern) than the user will still need to confirm it before\n seeing this window, unless {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED} has\n also been set."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DISMISS_KEYGUARD:
     GameActivitySetWindowFlags = 4194304;
-#[doc = " Flags for GameActivity_setWindowFlags,"]
-#[doc = " as per the Java API at android.view.WindowManager.LayoutParams."]
+#[doc = " Flags for GameActivity_setWindowFlags,\n as per the Java API at android.view.WindowManager.LayoutParams."]
 pub type GameActivitySetWindowFlags = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Change the window flags of the given activity.  Calls getWindow().setFlags()"]
-    #[doc = " of the given activity."]
-    #[doc = " Note that some flags must be set before the window decoration is created,"]
-    #[doc = " see"]
-    #[doc = " https://developer.android.com/reference/android/view/Window#setFlags(int,%20int)."]
-    #[doc = " Note also that this method can be called from"]
-    #[doc = " *any* thread; it will send a message to the main thread of the process"]
-    #[doc = " where the Java finish call will take place."]
+    #[doc = " Change the window flags of the given activity.  Calls getWindow().setFlags()\n of the given activity.\n Note that some flags must be set before the window decoration is created,\n see\n https://developer.android.com/reference/android/view/Window#setFlags(int,%20int).\n Note also that this method can be called from\n *any* thread; it will send a message to the main thread of the process\n where the Java finish call will take place."]
     pub fn GameActivity_setWindowFlags(
         activity: *mut GameActivity,
         addFlags: u32,
         removeFlags: u32,
     );
 }
-#[doc = " Implicit request to show the input window, not as the result"]
-#[doc = " of a direct request by the user."]
+#[doc = " Implicit request to show the input window, not as the result\n of a direct request by the user."]
 pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT:
     GameActivityShowSoftInputFlags = 1;
-#[doc = " The user has forced the input method open (such as by"]
-#[doc = " long-pressing menu) so it should not be closed until they"]
-#[doc = " explicitly do so."]
+#[doc = " The user has forced the input method open (such as by\n long-pressing menu) so it should not be closed until they\n explicitly do so."]
 pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED:
     GameActivityShowSoftInputFlags = 2;
-#[doc = " Flags for GameActivity_showSoftInput; see the Java InputMethodManager"]
-#[doc = " API for documentation."]
+#[doc = " Flags for GameActivity_showSoftInput; see the Java InputMethodManager\n API for documentation."]
 pub type GameActivityShowSoftInputFlags = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Show the IME while in the given activity.  Calls"]
-    #[doc = " InputMethodManager.showSoftInput() for the given activity.  Note that this"]
-    #[doc = " method can be called from *any* thread; it will send a message to the main"]
-    #[doc = " thread of the process where the Java call will take place."]
+    #[doc = " Show the IME while in the given activity.  Calls\n InputMethodManager.showSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java call will take place."]
     pub fn GameActivity_showSoftInput(activity: *mut GameActivity, flags: u32);
 }
 extern "C" {
-    #[doc = " Set the text entry state (see documentation of the GameTextInputState struct"]
-    #[doc = " in the Game Text Input library reference)."]
-    #[doc = ""]
-    #[doc = " Ownership of the state is maintained by the caller."]
+    #[doc = " Set the text entry state (see documentation of the GameTextInputState struct\n in the Game Text Input library reference).\n\n Ownership of the state is maintained by the caller."]
     pub fn GameActivity_setTextInputState(
         activity: *mut GameActivity,
         state: *const GameTextInputState,
     );
 }
 extern "C" {
-    #[doc = " Get the last-received text entry state (see documentation of the"]
-    #[doc = " GameTextInputState struct in the Game Text Input library reference)."]
-    #[doc = ""]
+    #[doc = " Get the last-received text entry state (see documentation of the\n GameTextInputState struct in the Game Text Input library reference).\n"]
     pub fn GameActivity_getTextInputState(
         activity: *mut GameActivity,
         callback: GameTextInputGetStateCallback,
@@ -3874,29 +3626,20 @@ extern "C" {
     #[doc = " Get a pointer to the GameTextInput library instance."]
     pub fn GameActivity_getTextInput(activity: *const GameActivity) -> *mut GameTextInput;
 }
-#[doc = " The soft input window should only be hidden if it was not"]
-#[doc = " explicitly shown by the user."]
+#[doc = " The soft input window should only be hidden if it was not\n explicitly shown by the user."]
 pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_ONLY:
     GameActivityHideSoftInputFlags = 1;
-#[doc = " The soft input window should normally be hidden, unless it was"]
-#[doc = " originally shown with {@link GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED}."]
+#[doc = " The soft input window should normally be hidden, unless it was\n originally shown with {@link GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED}."]
 pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS:
     GameActivityHideSoftInputFlags = 2;
-#[doc = " Flags for GameActivity_hideSoftInput; see the Java InputMethodManager"]
-#[doc = " API for documentation."]
+#[doc = " Flags for GameActivity_hideSoftInput; see the Java InputMethodManager\n API for documentation."]
 pub type GameActivityHideSoftInputFlags = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Hide the IME while in the given activity.  Calls"]
-    #[doc = " InputMethodManager.hideSoftInput() for the given activity.  Note that this"]
-    #[doc = " method can be called from *any* thread; it will send a message to the main"]
-    #[doc = " thread of the process where the Java finish call will take place."]
+    #[doc = " Hide the IME while in the given activity.  Calls\n InputMethodManager.hideSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java finish call will take place."]
     pub fn GameActivity_hideSoftInput(activity: *mut GameActivity, flags: u32);
 }
 extern "C" {
-    #[doc = " Get the current window insets of the particular component. See"]
-    #[doc = " https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
-    #[doc = " for more details."]
-    #[doc = " You can use these insets to influence what you show on the screen."]
+    #[doc = " Get the current window insets of the particular component. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type\n for more details.\n You can use these insets to influence what you show on the screen."]
     pub fn GameActivity_getWindowInsets(
         activity: *mut GameActivity,
         type_: GameCommonInsetsType,
@@ -3904,14 +3647,7 @@ extern "C" {
     );
 }
 extern "C" {
-    #[doc = " Set options on how the IME behaves when it is requested for text input."]
-    #[doc = " See"]
-    #[doc = " https://developer.android.com/reference/android/view/inputmethod/EditorInfo"]
-    #[doc = " for the meaning of inputType, actionId and imeOptions."]
-    #[doc = ""]
-    #[doc = " Note that this function will attach the current thread to the JVM if it is"]
-    #[doc = " not already attached, so the caller must detach the thread from the JVM"]
-    #[doc = " before the thread is destroyed using DetachCurrentThread."]
+    #[doc = " Set options on how the IME behaves when it is requested for text input.\n See\n https://developer.android.com/reference/android/view/inputmethod/EditorInfo\n for the meaning of inputType, actionId and imeOptions.\n\n Note that this function will attach the current thread to the JVM if it is\n not already attached, so the caller must detach the thread from the JVM\n before the thread is destroyed using DetachCurrentThread."]
     pub fn GameActivity_setImeEditorInfo(
         activity: *mut GameActivity,
         inputType: ::std::os::raw::c_int,
@@ -3919,92 +3655,152 @@ extern "C" {
         imeOptions: ::std::os::raw::c_int,
     );
 }
-pub const ACONFIGURATION_ORIENTATION_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_ORIENTATION_PORT: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_ORIENTATION_LAND: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_ORIENTATION_SQUARE: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_TOUCHSCREEN_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_TOUCHSCREEN_NOTOUCH: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_TOUCHSCREEN_STYLUS: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_TOUCHSCREEN_FINGER: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_DENSITY_DEFAULT: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_DENSITY_LOW: ::std::os::raw::c_uint = 120;
-pub const ACONFIGURATION_DENSITY_MEDIUM: ::std::os::raw::c_uint = 160;
-pub const ACONFIGURATION_DENSITY_TV: ::std::os::raw::c_uint = 213;
-pub const ACONFIGURATION_DENSITY_HIGH: ::std::os::raw::c_uint = 240;
-pub const ACONFIGURATION_DENSITY_XHIGH: ::std::os::raw::c_uint = 320;
-pub const ACONFIGURATION_DENSITY_XXHIGH: ::std::os::raw::c_uint = 480;
-pub const ACONFIGURATION_DENSITY_XXXHIGH: ::std::os::raw::c_uint = 640;
-pub const ACONFIGURATION_DENSITY_ANY: ::std::os::raw::c_uint = 65534;
-pub const ACONFIGURATION_DENSITY_NONE: ::std::os::raw::c_uint = 65535;
-pub const ACONFIGURATION_KEYBOARD_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_KEYBOARD_NOKEYS: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_KEYBOARD_QWERTY: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_KEYBOARD_12KEY: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_NAVIGATION_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_NAVIGATION_NONAV: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_NAVIGATION_DPAD: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_NAVIGATION_TRACKBALL: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_NAVIGATION_WHEEL: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_KEYSHIDDEN_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_KEYSHIDDEN_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_KEYSHIDDEN_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_KEYSHIDDEN_SOFT: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_NAVHIDDEN_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_NAVHIDDEN_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_NAVHIDDEN_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREENSIZE_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREENSIZE_SMALL: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_SCREENSIZE_NORMAL: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREENSIZE_LARGE: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_SCREENSIZE_XLARGE: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_SCREENLONG_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREENLONG_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_SCREENLONG_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREENROUND_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREENROUND_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_SCREENROUND_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_WIDE_COLOR_GAMUT_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_WIDE_COLOR_GAMUT_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_WIDE_COLOR_GAMUT_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_HDR_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_HDR_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_HDR_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_UI_MODE_TYPE_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_UI_MODE_TYPE_NORMAL: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_UI_MODE_TYPE_DESK: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_UI_MODE_TYPE_CAR: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_UI_MODE_TYPE_TELEVISION: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_UI_MODE_TYPE_APPLIANCE: ::std::os::raw::c_uint = 5;
-pub const ACONFIGURATION_UI_MODE_TYPE_WATCH: ::std::os::raw::c_uint = 6;
-pub const ACONFIGURATION_UI_MODE_TYPE_VR_HEADSET: ::std::os::raw::c_uint = 7;
-pub const ACONFIGURATION_UI_MODE_NIGHT_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_UI_MODE_NIGHT_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_UI_MODE_NIGHT_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREEN_WIDTH_DP_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREEN_HEIGHT_DP_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_LAYOUTDIR_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_LAYOUTDIR_LTR: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_LAYOUTDIR_RTL: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_MCC: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_MNC: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_LOCALE: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_TOUCHSCREEN: ::std::os::raw::c_uint = 8;
-pub const ACONFIGURATION_KEYBOARD: ::std::os::raw::c_uint = 16;
-pub const ACONFIGURATION_KEYBOARD_HIDDEN: ::std::os::raw::c_uint = 32;
-pub const ACONFIGURATION_NAVIGATION: ::std::os::raw::c_uint = 64;
-pub const ACONFIGURATION_ORIENTATION: ::std::os::raw::c_uint = 128;
-pub const ACONFIGURATION_DENSITY: ::std::os::raw::c_uint = 256;
-pub const ACONFIGURATION_SCREEN_SIZE: ::std::os::raw::c_uint = 512;
-pub const ACONFIGURATION_VERSION: ::std::os::raw::c_uint = 1024;
-pub const ACONFIGURATION_SCREEN_LAYOUT: ::std::os::raw::c_uint = 2048;
-pub const ACONFIGURATION_UI_MODE: ::std::os::raw::c_uint = 4096;
-pub const ACONFIGURATION_SMALLEST_SCREEN_SIZE: ::std::os::raw::c_uint = 8192;
-pub const ACONFIGURATION_LAYOUTDIR: ::std::os::raw::c_uint = 16384;
-pub const ACONFIGURATION_SCREEN_ROUND: ::std::os::raw::c_uint = 32768;
-pub const ACONFIGURATION_COLOR_MODE: ::std::os::raw::c_uint = 65536;
-pub const ACONFIGURATION_MNC_ZERO: ::std::os::raw::c_uint = 65535;
+extern "C" {
+    #[doc = " These are getters for Configuration class members. They may be called from\n any thread."]
+    pub fn GameActivity_getOrientation(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getColorMode(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getDensityDpi(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getFontScale(activity: *mut GameActivity) -> f32;
+}
+extern "C" {
+    pub fn GameActivity_getFontWeightAdjustment(
+        activity: *mut GameActivity,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getHardKeyboardHidden(activity: *mut GameActivity)
+        -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getKeyboard(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getKeyboardHidden(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getMcc(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getMnc(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getNavigation(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getNavigationHidden(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getScreenHeightDp(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getScreenLayout(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getScreenWidthDp(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getSmallestScreenWidthDp(
+        activity: *mut GameActivity,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getTouchscreen(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getUIMode(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+pub const ACONFIGURATION_ORIENTATION_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_ORIENTATION_PORT: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_ORIENTATION_LAND: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_ORIENTATION_SQUARE: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_TOUCHSCREEN_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_TOUCHSCREEN_NOTOUCH: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_TOUCHSCREEN_STYLUS: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_TOUCHSCREEN_FINGER: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_DENSITY_DEFAULT: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_DENSITY_LOW: _bindgen_ty_21 = 120;
+pub const ACONFIGURATION_DENSITY_MEDIUM: _bindgen_ty_21 = 160;
+pub const ACONFIGURATION_DENSITY_TV: _bindgen_ty_21 = 213;
+pub const ACONFIGURATION_DENSITY_HIGH: _bindgen_ty_21 = 240;
+pub const ACONFIGURATION_DENSITY_XHIGH: _bindgen_ty_21 = 320;
+pub const ACONFIGURATION_DENSITY_XXHIGH: _bindgen_ty_21 = 480;
+pub const ACONFIGURATION_DENSITY_XXXHIGH: _bindgen_ty_21 = 640;
+pub const ACONFIGURATION_DENSITY_ANY: _bindgen_ty_21 = 65534;
+pub const ACONFIGURATION_DENSITY_NONE: _bindgen_ty_21 = 65535;
+pub const ACONFIGURATION_KEYBOARD_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_KEYBOARD_NOKEYS: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_KEYBOARD_QWERTY: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_KEYBOARD_12KEY: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_NAVIGATION_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_NAVIGATION_NONAV: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_NAVIGATION_DPAD: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_NAVIGATION_TRACKBALL: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_NAVIGATION_WHEEL: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_KEYSHIDDEN_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_KEYSHIDDEN_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_KEYSHIDDEN_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_KEYSHIDDEN_SOFT: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_NAVHIDDEN_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_NAVHIDDEN_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_NAVHIDDEN_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREENSIZE_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREENSIZE_SMALL: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_SCREENSIZE_NORMAL: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREENSIZE_LARGE: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_SCREENSIZE_XLARGE: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_SCREENLONG_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREENLONG_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_SCREENLONG_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREENROUND_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREENROUND_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_SCREENROUND_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_WIDE_COLOR_GAMUT_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_WIDE_COLOR_GAMUT_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_WIDE_COLOR_GAMUT_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_HDR_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_HDR_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_HDR_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_UI_MODE_TYPE_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_UI_MODE_TYPE_NORMAL: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_UI_MODE_TYPE_DESK: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_UI_MODE_TYPE_CAR: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_UI_MODE_TYPE_TELEVISION: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_UI_MODE_TYPE_APPLIANCE: _bindgen_ty_21 = 5;
+pub const ACONFIGURATION_UI_MODE_TYPE_WATCH: _bindgen_ty_21 = 6;
+pub const ACONFIGURATION_UI_MODE_TYPE_VR_HEADSET: _bindgen_ty_21 = 7;
+pub const ACONFIGURATION_UI_MODE_NIGHT_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_UI_MODE_NIGHT_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_UI_MODE_NIGHT_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREEN_WIDTH_DP_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREEN_HEIGHT_DP_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_LAYOUTDIR_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_LAYOUTDIR_LTR: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_LAYOUTDIR_RTL: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_MCC: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_MNC: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_LOCALE: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_TOUCHSCREEN: _bindgen_ty_21 = 8;
+pub const ACONFIGURATION_KEYBOARD: _bindgen_ty_21 = 16;
+pub const ACONFIGURATION_KEYBOARD_HIDDEN: _bindgen_ty_21 = 32;
+pub const ACONFIGURATION_NAVIGATION: _bindgen_ty_21 = 64;
+pub const ACONFIGURATION_ORIENTATION: _bindgen_ty_21 = 128;
+pub const ACONFIGURATION_DENSITY: _bindgen_ty_21 = 256;
+pub const ACONFIGURATION_SCREEN_SIZE: _bindgen_ty_21 = 512;
+pub const ACONFIGURATION_VERSION: _bindgen_ty_21 = 1024;
+pub const ACONFIGURATION_SCREEN_LAYOUT: _bindgen_ty_21 = 2048;
+pub const ACONFIGURATION_UI_MODE: _bindgen_ty_21 = 4096;
+pub const ACONFIGURATION_SMALLEST_SCREEN_SIZE: _bindgen_ty_21 = 8192;
+pub const ACONFIGURATION_LAYOUTDIR: _bindgen_ty_21 = 16384;
+pub const ACONFIGURATION_SCREEN_ROUND: _bindgen_ty_21 = 32768;
+pub const ACONFIGURATION_COLOR_MODE: _bindgen_ty_21 = 65536;
+pub const ACONFIGURATION_MNC_ZERO: _bindgen_ty_21 = 65535;
 pub type _bindgen_ty_21 = ::std::os::raw::c_uint;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -4015,6 +3811,8 @@ pub struct pollfd {
 }
 #[test]
 fn bindgen_test_layout_pollfd() {
+    const UNINIT: ::std::mem::MaybeUninit<pollfd> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<pollfd>(),
         8usize,
@@ -4026,7 +3824,7 @@ fn bindgen_test_layout_pollfd() {
         concat!("Alignment of ", stringify!(pollfd))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<pollfd>())).fd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4036,7 +3834,7 @@ fn bindgen_test_layout_pollfd() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<pollfd>())).events as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).events) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4046,7 +3844,7 @@ fn bindgen_test_layout_pollfd() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<pollfd>())).revents as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).revents) as usize - ptr as usize },
         6usize,
         concat!(
             "Offset of field: ",
@@ -4070,6 +3868,8 @@ pub struct sigcontext {
 }
 #[test]
 fn bindgen_test_layout_sigcontext() {
+    const UNINIT: ::std::mem::MaybeUninit<sigcontext> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigcontext>(),
         4384usize,
@@ -4081,7 +3881,7 @@ fn bindgen_test_layout_sigcontext() {
         concat!("Alignment of ", stringify!(sigcontext))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).fault_address as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fault_address) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4091,7 +3891,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).regs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).regs) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4101,7 +3901,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).sp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sp) as usize - ptr as usize },
         256usize,
         concat!(
             "Offset of field: ",
@@ -4111,7 +3911,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).pc as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).pc) as usize - ptr as usize },
         264usize,
         concat!(
             "Offset of field: ",
@@ -4121,7 +3921,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).pstate as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).pstate) as usize - ptr as usize },
         272usize,
         concat!(
             "Offset of field: ",
@@ -4131,7 +3931,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).__reserved as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__reserved) as usize - ptr as usize },
         288usize,
         concat!(
             "Offset of field: ",
@@ -4149,6 +3949,8 @@ pub struct _aarch64_ctx {
 }
 #[test]
 fn bindgen_test_layout__aarch64_ctx() {
+    const UNINIT: ::std::mem::MaybeUninit<_aarch64_ctx> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_aarch64_ctx>(),
         8usize,
@@ -4160,7 +3962,7 @@ fn bindgen_test_layout__aarch64_ctx() {
         concat!("Alignment of ", stringify!(_aarch64_ctx))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_aarch64_ctx>())).magic as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).magic) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4170,7 +3972,7 @@ fn bindgen_test_layout__aarch64_ctx() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_aarch64_ctx>())).size as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).size) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4191,6 +3993,8 @@ pub struct fpsimd_context {
 }
 #[test]
 fn bindgen_test_layout_fpsimd_context() {
+    const UNINIT: ::std::mem::MaybeUninit<fpsimd_context> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<fpsimd_context>(),
         528usize,
@@ -4202,7 +4006,7 @@ fn bindgen_test_layout_fpsimd_context() {
         concat!("Alignment of ", stringify!(fpsimd_context))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<fpsimd_context>())).head as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).head) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4212,7 +4016,7 @@ fn bindgen_test_layout_fpsimd_context() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<fpsimd_context>())).fpsr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpsr) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4222,7 +4026,7 @@ fn bindgen_test_layout_fpsimd_context() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<fpsimd_context>())).fpcr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpcr) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -4232,7 +4036,7 @@ fn bindgen_test_layout_fpsimd_context() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<fpsimd_context>())).vregs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).vregs) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4250,6 +4054,8 @@ pub struct esr_context {
 }
 #[test]
 fn bindgen_test_layout_esr_context() {
+    const UNINIT: ::std::mem::MaybeUninit<esr_context> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<esr_context>(),
         16usize,
@@ -4261,7 +4067,7 @@ fn bindgen_test_layout_esr_context() {
         concat!("Alignment of ", stringify!(esr_context))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<esr_context>())).head as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).head) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4271,7 +4077,7 @@ fn bindgen_test_layout_esr_context() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<esr_context>())).esr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).esr) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4291,6 +4097,8 @@ pub struct extra_context {
 }
 #[test]
 fn bindgen_test_layout_extra_context() {
+    const UNINIT: ::std::mem::MaybeUninit<extra_context> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<extra_context>(),
         32usize,
@@ -4302,7 +4110,7 @@ fn bindgen_test_layout_extra_context() {
         concat!("Alignment of ", stringify!(extra_context))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<extra_context>())).head as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).head) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4312,7 +4120,7 @@ fn bindgen_test_layout_extra_context() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<extra_context>())).datap as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).datap) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4322,7 +4130,7 @@ fn bindgen_test_layout_extra_context() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<extra_context>())).size as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).size) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4332,7 +4140,7 @@ fn bindgen_test_layout_extra_context() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<extra_context>())).__reserved as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__reserved) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -4351,6 +4159,8 @@ pub struct sve_context {
 }
 #[test]
 fn bindgen_test_layout_sve_context() {
+    const UNINIT: ::std::mem::MaybeUninit<sve_context> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sve_context>(),
         16usize,
@@ -4362,7 +4172,7 @@ fn bindgen_test_layout_sve_context() {
         concat!("Alignment of ", stringify!(sve_context))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sve_context>())).head as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).head) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4372,7 +4182,7 @@ fn bindgen_test_layout_sve_context() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sve_context>())).vl as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).vl) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4382,7 +4192,7 @@ fn bindgen_test_layout_sve_context() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sve_context>())).__reserved as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__reserved) as usize - ptr as usize },
         10usize,
         concat!(
             "Offset of field: ",
@@ -4399,6 +4209,8 @@ pub struct sigset_t {
 }
 #[test]
 fn bindgen_test_layout_sigset_t() {
+    const UNINIT: ::std::mem::MaybeUninit<sigset_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigset_t>(),
         8usize,
@@ -4410,7 +4222,7 @@ fn bindgen_test_layout_sigset_t() {
         concat!("Alignment of ", stringify!(sigset_t))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigset_t>())).sig as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sig) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4435,6 +4247,8 @@ pub struct __kernel_sigaction {
 }
 #[test]
 fn bindgen_test_layout___kernel_sigaction() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_sigaction> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_sigaction>(),
         32usize,
@@ -4446,7 +4260,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         concat!("Alignment of ", stringify!(__kernel_sigaction))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>())).sa_handler as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4456,7 +4270,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>())).sa_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4466,7 +4280,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>())).sa_restorer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4476,7 +4290,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>())).sa_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -4487,13 +4301,16 @@ fn bindgen_test_layout___kernel_sigaction() {
     );
 }
 #[repr(C)]
+#[derive(Debug, Copy, Clone)]
 pub struct sigaltstack {
     pub ss_sp: *mut ::std::os::raw::c_void,
     pub ss_flags: ::std::os::raw::c_int,
-    pub ss_size: size_t,
+    pub ss_size: __kernel_size_t,
 }
 #[test]
 fn bindgen_test_layout_sigaltstack() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaltstack> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaltstack>(),
         24usize,
@@ -4505,7 +4322,7 @@ fn bindgen_test_layout_sigaltstack() {
         concat!("Alignment of ", stringify!(sigaltstack))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaltstack>())).ss_sp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss_sp) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4515,7 +4332,7 @@ fn bindgen_test_layout_sigaltstack() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaltstack>())).ss_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss_flags) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4525,7 +4342,7 @@ fn bindgen_test_layout_sigaltstack() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaltstack>())).ss_size as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss_size) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4544,6 +4361,8 @@ pub union sigval {
 }
 #[test]
 fn bindgen_test_layout_sigval() {
+    const UNINIT: ::std::mem::MaybeUninit<sigval> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigval>(),
         8usize,
@@ -4555,7 +4374,7 @@ fn bindgen_test_layout_sigval() {
         concat!("Alignment of ", stringify!(sigval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigval>())).sival_int as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sival_int) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4565,7 +4384,7 @@ fn bindgen_test_layout_sigval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigval>())).sival_ptr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sival_ptr) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4595,6 +4414,9 @@ pub struct __sifields__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_1>(),
         8usize,
@@ -4606,7 +4428,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_1>()))._pid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4616,7 +4438,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_1>()))._uid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4636,6 +4458,9 @@ pub struct __sifields__bindgen_ty_2 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_2() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_2> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_2>(),
         24usize,
@@ -4647,7 +4472,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_2))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4657,9 +4482,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._overrun as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._overrun) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4669,9 +4492,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._sigval as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4681,9 +4502,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._sys_private as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sys_private) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4702,6 +4521,9 @@ pub struct __sifields__bindgen_ty_3 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_3() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_3> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_3>(),
         16usize,
@@ -4713,7 +4535,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_3))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_3>()))._pid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4723,7 +4545,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_3>()))._uid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4733,9 +4555,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_3>()))._sigval as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4756,6 +4576,9 @@ pub struct __sifields__bindgen_ty_4 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_4() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_4> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_4>(),
         32usize,
@@ -4767,7 +4590,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_4))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._pid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4777,7 +4600,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._uid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4787,9 +4610,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._status as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._status) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4799,7 +4620,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._utime as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._utime) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4809,7 +4630,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._stime as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._stime) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -4828,9 +4649,11 @@ pub struct __sifields__bindgen_ty_5 {
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub union __sifields__bindgen_ty_5__bindgen_ty_1 {
+    pub _trapno: ::std::os::raw::c_int,
     pub _addr_lsb: ::std::os::raw::c_short,
     pub _addr_bnd: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1,
     pub _addr_pkey: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2,
+    pub _perf: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -4841,6 +4664,9 @@ pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>(),
         24usize,
@@ -4858,10 +4684,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>()))
-                ._dummy_bnd as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._dummy_bnd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4871,10 +4694,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>()))._lower
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._lower) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4884,10 +4704,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>()))._upper
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._upper) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4905,6 +4722,9 @@ pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>(),
         12usize,
@@ -4922,10 +4742,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>()))
-                ._dummy_pkey as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._dummy_pkey) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4935,10 +4752,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>()))._pkey
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pkey) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4948,8 +4762,59 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
         )
     );
 }
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3 {
+    pub _data: ::std::os::raw::c_ulong,
+    pub _type: __u32,
+}
+#[test]
+fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
+        16usize,
+        concat!(
+            "Size of: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
+        )
+    );
+    assert_eq!(
+        ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
+        8usize,
+        concat!(
+            "Alignment of ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._data) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
+            "::",
+            stringify!(_data)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._type) as usize - ptr as usize },
+        8usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
+            "::",
+            stringify!(_type)
+        )
+    );
+}
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1>(),
         24usize,
@@ -4967,10 +4832,17 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1>()))._addr_lsb as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._trapno) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
+            "::",
+            stringify!(_trapno)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr_lsb) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4980,10 +4852,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1>()))._addr_bnd as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr_bnd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4993,10 +4862,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1>()))._addr_pkey
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr_pkey) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5005,9 +4871,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
             stringify!(_addr_pkey)
         )
     );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._perf) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
+            "::",
+            stringify!(_perf)
+        )
+    );
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5>(),
         32usize,
@@ -5019,7 +4898,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_5))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_5>()))._addr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5037,6 +4916,9 @@ pub struct __sifields__bindgen_ty_6 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_6() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_6> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_6>(),
         16usize,
@@ -5048,7 +4930,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_6() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_6))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_6>()))._band as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._band) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5058,7 +4940,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_6() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_6>()))._fd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._fd) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5077,6 +4959,9 @@ pub struct __sifields__bindgen_ty_7 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_7() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_7> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_7>(),
         16usize,
@@ -5088,9 +4973,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_7))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_7>()))._call_addr as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._call_addr) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5100,9 +4983,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_7>()))._syscall as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._syscall) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5112,7 +4993,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_7>()))._arch as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._arch) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -5124,6 +5005,8 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
 }
 #[test]
 fn bindgen_test_layout___sifields() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields>(),
         32usize,
@@ -5135,7 +5018,7 @@ fn bindgen_test_layout___sifields() {
         concat!("Alignment of ", stringify!(__sifields))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._kill as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._kill) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5145,7 +5028,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._timer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._timer) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5155,7 +5038,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._rt as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._rt) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5165,7 +5048,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigchld as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigchld) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5175,7 +5058,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigfault as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigfault) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5185,7 +5068,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigpoll as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigpoll) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5195,7 +5078,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigsys as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigsys) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5226,6 +5109,9 @@ pub struct siginfo__bindgen_ty_1__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<siginfo__bindgen_ty_1__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1__bindgen_ty_1>(),
         48usize,
@@ -5240,10 +5126,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>())).si_signo as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).si_signo) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5253,10 +5136,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>())).si_errno as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).si_errno) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -5266,10 +5146,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>())).si_code as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).si_code) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5279,10 +5156,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>()))._sifields as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sifields) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -5294,6 +5168,9 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_siginfo__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<siginfo__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1>(),
         128usize,
@@ -5305,7 +5182,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(siginfo__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<siginfo__bindgen_ty_1>()))._si_pad as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._si_pad) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5352,6 +5229,9 @@ pub struct sigevent__bindgen_ty_1__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigevent__bindgen_ty_1__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1__bindgen_ty_1>(),
         16usize,
@@ -5369,10 +5249,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigevent__bindgen_ty_1__bindgen_ty_1>()))._function as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._function) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5382,10 +5259,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigevent__bindgen_ty_1__bindgen_ty_1>()))._attribute as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._attribute) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5397,6 +5271,9 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigevent__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigevent__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1>(),
         48usize,
@@ -5408,7 +5285,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(sigevent__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent__bindgen_ty_1>()))._pad as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pad) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5418,7 +5295,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent__bindgen_ty_1>()))._tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5428,9 +5305,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigevent__bindgen_ty_1>()))._sigev_thread as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigev_thread) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5442,6 +5317,8 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigevent() {
+    const UNINIT: ::std::mem::MaybeUninit<sigevent> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigevent>(),
         64usize,
@@ -5453,7 +5330,7 @@ fn bindgen_test_layout_sigevent() {
         concat!("Alignment of ", stringify!(sigevent))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>())).sigev_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sigev_value) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5463,7 +5340,7 @@ fn bindgen_test_layout_sigevent() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>())).sigev_signo as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sigev_signo) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5473,7 +5350,7 @@ fn bindgen_test_layout_sigevent() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>())).sigev_notify as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sigev_notify) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -5483,7 +5360,7 @@ fn bindgen_test_layout_sigevent() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>()))._sigev_un as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigev_un) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -5520,6 +5397,9 @@ pub union sigaction__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_sigaction__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction__bindgen_ty_1>(),
         8usize,
@@ -5531,9 +5411,7 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(sigaction__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction__bindgen_ty_1>())).sa_handler as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5543,9 +5421,7 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction__bindgen_ty_1>())).sa_sigaction as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5557,6 +5433,8 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigaction() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction>(),
         32usize,
@@ -5568,7 +5446,7 @@ fn bindgen_test_layout_sigaction() {
         concat!("Alignment of ", stringify!(sigaction))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction>())).sa_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5578,7 +5456,7 @@ fn bindgen_test_layout_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction>())).sa_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -5588,7 +5466,7 @@ fn bindgen_test_layout_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction>())).sa_restorer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -5620,6 +5498,9 @@ pub union sigaction64__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction64__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction64__bindgen_ty_1>(),
         8usize,
@@ -5631,9 +5512,7 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(sigaction64__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction64__bindgen_ty_1>())).sa_handler as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5643,9 +5522,7 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction64__bindgen_ty_1>())).sa_sigaction as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5657,6 +5534,8 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigaction64() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction64> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction64>(),
         32usize,
@@ -5668,7 +5547,7 @@ fn bindgen_test_layout_sigaction64() {
         concat!("Alignment of ", stringify!(sigaction64))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction64>())).sa_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5678,7 +5557,7 @@ fn bindgen_test_layout_sigaction64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction64>())).sa_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -5688,7 +5567,7 @@ fn bindgen_test_layout_sigaction64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction64>())).sa_restorer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -5706,6 +5585,8 @@ pub struct timespec {
 }
 #[test]
 fn bindgen_test_layout_timespec() {
+    const UNINIT: ::std::mem::MaybeUninit<timespec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<timespec>(),
         16usize,
@@ -5717,7 +5598,7 @@ fn bindgen_test_layout_timespec() {
         concat!("Alignment of ", stringify!(timespec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timespec>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5727,7 +5608,7 @@ fn bindgen_test_layout_timespec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timespec>())).tv_nsec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5747,6 +5628,8 @@ pub struct user_regs_struct {
 }
 #[test]
 fn bindgen_test_layout_user_regs_struct() {
+    const UNINIT: ::std::mem::MaybeUninit<user_regs_struct> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<user_regs_struct>(),
         272usize,
@@ -5758,7 +5641,7 @@ fn bindgen_test_layout_user_regs_struct() {
         concat!("Alignment of ", stringify!(user_regs_struct))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).regs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).regs) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5768,7 +5651,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).sp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sp) as usize - ptr as usize },
         248usize,
         concat!(
             "Offset of field: ",
@@ -5778,7 +5661,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).pc as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).pc) as usize - ptr as usize },
         256usize,
         concat!(
             "Offset of field: ",
@@ -5788,7 +5671,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).pstate as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).pstate) as usize - ptr as usize },
         264usize,
         concat!(
             "Offset of field: ",
@@ -5808,6 +5691,8 @@ pub struct user_fpsimd_struct {
 }
 #[test]
 fn bindgen_test_layout_user_fpsimd_struct() {
+    const UNINIT: ::std::mem::MaybeUninit<user_fpsimd_struct> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<user_fpsimd_struct>(),
         528usize,
@@ -5819,7 +5704,7 @@ fn bindgen_test_layout_user_fpsimd_struct() {
         concat!("Alignment of ", stringify!(user_fpsimd_struct))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpsimd_struct>())).vregs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).vregs) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5829,7 +5714,7 @@ fn bindgen_test_layout_user_fpsimd_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpsimd_struct>())).fpsr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpsr) as usize - ptr as usize },
         512usize,
         concat!(
             "Offset of field: ",
@@ -5839,7 +5724,7 @@ fn bindgen_test_layout_user_fpsimd_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpsimd_struct>())).fpcr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpcr) as usize - ptr as usize },
         516usize,
         concat!(
             "Offset of field: ",
@@ -5855,6 +5740,7 @@ pub type fpregset_t = user_fpsimd_struct;
 pub type mcontext_t = sigcontext;
 #[repr(C)]
 #[repr(align(16))]
+#[derive(Copy, Clone)]
 pub struct ucontext {
     pub uc_flags: ::std::os::raw::c_ulong,
     pub uc_link: *mut ucontext,
@@ -5872,6 +5758,9 @@ pub union ucontext__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_ucontext__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<ucontext__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<ucontext__bindgen_ty_1>(),
         8usize,
@@ -5883,9 +5772,7 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(ucontext__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<ucontext__bindgen_ty_1>())).uc_sigmask as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5895,9 +5782,7 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<ucontext__bindgen_ty_1>())).uc_sigmask64 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask64) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5909,6 +5794,8 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_ucontext() {
+    const UNINIT: ::std::mem::MaybeUninit<ucontext> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<ucontext>(),
         4560usize,
@@ -5920,7 +5807,7 @@ fn bindgen_test_layout_ucontext() {
         concat!("Alignment of ", stringify!(ucontext))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_flags) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5930,7 +5817,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_link as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_link) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5940,7 +5827,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_stack as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_stack) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -5950,7 +5837,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).__padding as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__padding) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -5960,7 +5847,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_mcontext as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_mcontext) as usize - ptr as usize },
         176usize,
         concat!(
             "Offset of field: ",
@@ -6174,6 +6061,8 @@ pub struct __kernel_timespec {
 }
 #[test]
 fn bindgen_test_layout___kernel_timespec() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_timespec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_timespec>(),
         16usize,
@@ -6185,7 +6074,7 @@ fn bindgen_test_layout___kernel_timespec() {
         concat!("Alignment of ", stringify!(__kernel_timespec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_timespec>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6195,7 +6084,7 @@ fn bindgen_test_layout___kernel_timespec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_timespec>())).tv_nsec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6213,6 +6102,8 @@ pub struct __kernel_itimerspec {
 }
 #[test]
 fn bindgen_test_layout___kernel_itimerspec() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_itimerspec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_itimerspec>(),
         32usize,
@@ -6224,7 +6115,7 @@ fn bindgen_test_layout___kernel_itimerspec() {
         concat!("Alignment of ", stringify!(__kernel_itimerspec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_itimerspec>())).it_interval as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6234,7 +6125,7 @@ fn bindgen_test_layout___kernel_itimerspec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_itimerspec>())).it_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -6246,40 +6137,43 @@ fn bindgen_test_layout___kernel_itimerspec() {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct __kernel_old_timeval {
-    pub tv_sec: __kernel_long_t,
-    pub tv_usec: __kernel_long_t,
+pub struct __kernel_old_timespec {
+    pub tv_sec: __kernel_old_time_t,
+    pub tv_nsec: ::std::os::raw::c_long,
 }
 #[test]
-fn bindgen_test_layout___kernel_old_timeval() {
+fn bindgen_test_layout___kernel_old_timespec() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_old_timespec> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<__kernel_old_timeval>(),
+        ::std::mem::size_of::<__kernel_old_timespec>(),
         16usize,
-        concat!("Size of: ", stringify!(__kernel_old_timeval))
+        concat!("Size of: ", stringify!(__kernel_old_timespec))
     );
     assert_eq!(
-        ::std::mem::align_of::<__kernel_old_timeval>(),
+        ::std::mem::align_of::<__kernel_old_timespec>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_old_timeval))
+        concat!("Alignment of ", stringify!(__kernel_old_timespec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_old_timeval>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(__kernel_old_timeval),
+            stringify!(__kernel_old_timespec),
             "::",
             stringify!(tv_sec)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_old_timeval>())).tv_usec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(__kernel_old_timeval),
+            stringify!(__kernel_old_timespec),
             "::",
-            stringify!(tv_usec)
+            stringify!(tv_nsec)
         )
     );
 }
@@ -6291,6 +6185,9 @@ pub struct __kernel_sock_timeval {
 }
 #[test]
 fn bindgen_test_layout___kernel_sock_timeval() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_sock_timeval> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_sock_timeval>(),
         16usize,
@@ -6302,7 +6199,7 @@ fn bindgen_test_layout___kernel_sock_timeval() {
         concat!("Alignment of ", stringify!(__kernel_sock_timeval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sock_timeval>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6312,7 +6209,7 @@ fn bindgen_test_layout___kernel_sock_timeval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sock_timeval>())).tv_usec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6325,11 +6222,13 @@ fn bindgen_test_layout___kernel_sock_timeval() {
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct timeval {
-    pub tv_sec: __kernel_time_t,
+    pub tv_sec: __kernel_old_time_t,
     pub tv_usec: __kernel_suseconds_t,
 }
 #[test]
 fn bindgen_test_layout_timeval() {
+    const UNINIT: ::std::mem::MaybeUninit<timeval> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<timeval>(),
         16usize,
@@ -6341,7 +6240,7 @@ fn bindgen_test_layout_timeval() {
         concat!("Alignment of ", stringify!(timeval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timeval>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6351,7 +6250,7 @@ fn bindgen_test_layout_timeval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timeval>())).tv_usec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6363,51 +6262,14 @@ fn bindgen_test_layout_timeval() {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct timezone {
-    pub tz_minuteswest: ::std::os::raw::c_int,
-    pub tz_dsttime: ::std::os::raw::c_int,
-}
-#[test]
-fn bindgen_test_layout_timezone() {
-    assert_eq!(
-        ::std::mem::size_of::<timezone>(),
-        8usize,
-        concat!("Size of: ", stringify!(timezone))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<timezone>(),
-        4usize,
-        concat!("Alignment of ", stringify!(timezone))
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timezone>())).tz_minuteswest as *const _ as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_minuteswest)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timezone>())).tz_dsttime as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_dsttime)
-        )
-    );
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
 pub struct itimerspec {
     pub it_interval: timespec,
     pub it_value: timespec,
 }
 #[test]
 fn bindgen_test_layout_itimerspec() {
+    const UNINIT: ::std::mem::MaybeUninit<itimerspec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<itimerspec>(),
         32usize,
@@ -6419,7 +6281,7 @@ fn bindgen_test_layout_itimerspec() {
         concat!("Alignment of ", stringify!(itimerspec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerspec>())).it_interval as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6429,7 +6291,7 @@ fn bindgen_test_layout_itimerspec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerspec>())).it_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -6447,6 +6309,8 @@ pub struct itimerval {
 }
 #[test]
 fn bindgen_test_layout_itimerval() {
+    const UNINIT: ::std::mem::MaybeUninit<itimerval> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<itimerval>(),
         32usize,
@@ -6458,7 +6322,7 @@ fn bindgen_test_layout_itimerval() {
         concat!("Alignment of ", stringify!(itimerval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerval>())).it_interval as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6468,7 +6332,7 @@ fn bindgen_test_layout_itimerval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerval>())).it_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -6478,6 +6342,47 @@ fn bindgen_test_layout_itimerval() {
         )
     );
 }
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct timezone {
+    pub tz_minuteswest: ::std::os::raw::c_int,
+    pub tz_dsttime: ::std::os::raw::c_int,
+}
+#[test]
+fn bindgen_test_layout_timezone() {
+    const UNINIT: ::std::mem::MaybeUninit<timezone> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<timezone>(),
+        8usize,
+        concat!("Size of: ", stringify!(timezone))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<timezone>(),
+        4usize,
+        concat!("Alignment of ", stringify!(timezone))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).tz_minuteswest) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(timezone),
+            "::",
+            stringify!(tz_minuteswest)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).tz_dsttime) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(timezone),
+            "::",
+            stringify!(tz_dsttime)
+        )
+    );
+}
 pub type fd_mask = ::std::os::raw::c_ulong;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -6486,6 +6391,8 @@ pub struct fd_set {
 }
 #[test]
 fn bindgen_test_layout_fd_set() {
+    const UNINIT: ::std::mem::MaybeUninit<fd_set> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<fd_set>(),
         128usize,
@@ -6497,7 +6404,7 @@ fn bindgen_test_layout_fd_set() {
         concat!("Alignment of ", stringify!(fd_set))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<fd_set>())).fds_bits as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6508,21 +6415,21 @@ fn bindgen_test_layout_fd_set() {
     );
 }
 extern "C" {
-    pub fn __FD_CLR_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: size_t);
+    pub fn __FD_CLR_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: usize);
 }
 extern "C" {
-    pub fn __FD_SET_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: size_t);
+    pub fn __FD_SET_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: usize);
 }
 extern "C" {
     pub fn __FD_ISSET_chk(
         arg1: ::std::os::raw::c_int,
         arg2: *const fd_set,
-        arg3: size_t,
+        arg3: usize,
     ) -> ::std::os::raw::c_int;
 }
 extern "C" {
     pub fn select(
-        __fd_count: ::std::os::raw::c_int,
+        __max_fd_plus_one: ::std::os::raw::c_int,
         __read_fds: *mut fd_set,
         __write_fds: *mut fd_set,
         __exception_fds: *mut fd_set,
@@ -6531,7 +6438,7 @@ extern "C" {
 }
 extern "C" {
     pub fn pselect(
-        __fd_count: ::std::os::raw::c_int,
+        __max_fd_plus_one: ::std::os::raw::c_int,
         __read_fds: *mut fd_set,
         __write_fds: *mut fd_set,
         __exception_fds: *mut fd_set,
@@ -6541,7 +6448,7 @@ extern "C" {
 }
 extern "C" {
     pub fn pselect64(
-        __fd_count: ::std::os::raw::c_int,
+        __max_fd_plus_one: ::std::os::raw::c_int,
         __read_fds: *mut fd_set,
         __write_fds: *mut fd_set,
         __exception_fds: *mut fd_set,
@@ -6606,6 +6513,8 @@ pub struct tm {
 }
 #[test]
 fn bindgen_test_layout_tm() {
+    const UNINIT: ::std::mem::MaybeUninit<tm> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<tm>(),
         56usize,
@@ -6617,7 +6526,7 @@ fn bindgen_test_layout_tm() {
         concat!("Alignment of ", stringify!(tm))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6627,7 +6536,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_min as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_min) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6637,7 +6546,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_hour as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_hour) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6647,7 +6556,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_mday as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_mday) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -6657,7 +6566,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_mon as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_mon) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -6667,7 +6576,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_year as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_year) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -6677,7 +6586,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_wday as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_wday) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -6687,7 +6596,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_yday as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_yday) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -6697,7 +6606,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_isdst as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_isdst) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -6707,7 +6616,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_gmtoff as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_gmtoff) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -6717,7 +6626,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_zone as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_zone) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -6781,19 +6690,19 @@ extern "C" {
 extern "C" {
     pub fn strftime(
         __buf: *mut ::std::os::raw::c_char,
-        __n: size_t,
+        __n: usize,
         __fmt: *const ::std::os::raw::c_char,
         __tm: *const tm,
-    ) -> size_t;
+    ) -> usize;
 }
 extern "C" {
     pub fn strftime_l(
         __buf: *mut ::std::os::raw::c_char,
-        __n: size_t,
+        __n: usize,
         __fmt: *const ::std::os::raw::c_char,
         __tm: *const tm,
         __l: locale_t,
-    ) -> size_t;
+    ) -> usize;
 }
 extern "C" {
     pub fn ctime(__t: *const time_t) -> *mut ::std::os::raw::c_char;
@@ -6901,12 +6810,17 @@ pub struct clone_args {
     pub stack: __u64,
     pub stack_size: __u64,
     pub tls: __u64,
+    pub set_tid: __u64,
+    pub set_tid_size: __u64,
+    pub cgroup: __u64,
 }
 #[test]
 fn bindgen_test_layout_clone_args() {
+    const UNINIT: ::std::mem::MaybeUninit<clone_args> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<clone_args>(),
-        64usize,
+        88usize,
         concat!("Size of: ", stringify!(clone_args))
     );
     assert_eq!(
@@ -6915,7 +6829,7 @@ fn bindgen_test_layout_clone_args() {
         concat!("Alignment of ", stringify!(clone_args))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6925,7 +6839,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).pidfd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).pidfd) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6935,7 +6849,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).child_tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).child_tid) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -6945,7 +6859,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).parent_tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).parent_tid) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -6955,7 +6869,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).exit_signal as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).exit_signal) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -6965,7 +6879,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).stack as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).stack) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -6975,7 +6889,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).stack_size as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).stack_size) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -6985,7 +6899,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).tls as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tls) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -6994,6 +6908,36 @@ fn bindgen_test_layout_clone_args() {
             stringify!(tls)
         )
     );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).set_tid) as usize - ptr as usize },
+        64usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(clone_args),
+            "::",
+            stringify!(set_tid)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).set_tid_size) as usize - ptr as usize },
+        72usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(clone_args),
+            "::",
+            stringify!(set_tid_size)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).cgroup) as usize - ptr as usize },
+        80usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(clone_args),
+            "::",
+            stringify!(cgroup)
+        )
+    );
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -7002,6 +6946,8 @@ pub struct sched_param {
 }
 #[test]
 fn bindgen_test_layout_sched_param() {
+    const UNINIT: ::std::mem::MaybeUninit<sched_param> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sched_param>(),
         4usize,
@@ -7013,7 +6959,7 @@ fn bindgen_test_layout_sched_param() {
         concat!("Alignment of ", stringify!(sched_param))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sched_param>())).sched_priority as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sched_priority) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7051,15 +6997,15 @@ extern "C" {
 extern "C" {
     pub fn sched_rr_get_interval(__pid: pid_t, __quantum: *mut timespec) -> ::std::os::raw::c_int;
 }
-pub const PTHREAD_MUTEX_NORMAL: ::std::os::raw::c_uint = 0;
-pub const PTHREAD_MUTEX_RECURSIVE: ::std::os::raw::c_uint = 1;
-pub const PTHREAD_MUTEX_ERRORCHECK: ::std::os::raw::c_uint = 2;
-pub const PTHREAD_MUTEX_ERRORCHECK_NP: ::std::os::raw::c_uint = 2;
-pub const PTHREAD_MUTEX_RECURSIVE_NP: ::std::os::raw::c_uint = 1;
-pub const PTHREAD_MUTEX_DEFAULT: ::std::os::raw::c_uint = 0;
+pub const PTHREAD_MUTEX_NORMAL: _bindgen_ty_22 = 0;
+pub const PTHREAD_MUTEX_RECURSIVE: _bindgen_ty_22 = 1;
+pub const PTHREAD_MUTEX_ERRORCHECK: _bindgen_ty_22 = 2;
+pub const PTHREAD_MUTEX_ERRORCHECK_NP: _bindgen_ty_22 = 2;
+pub const PTHREAD_MUTEX_RECURSIVE_NP: _bindgen_ty_22 = 1;
+pub const PTHREAD_MUTEX_DEFAULT: _bindgen_ty_22 = 0;
 pub type _bindgen_ty_22 = ::std::os::raw::c_uint;
-pub const PTHREAD_RWLOCK_PREFER_READER_NP: ::std::os::raw::c_uint = 0;
-pub const PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP: ::std::os::raw::c_uint = 1;
+pub const PTHREAD_RWLOCK_PREFER_READER_NP: _bindgen_ty_23 = 0;
+pub const PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP: _bindgen_ty_23 = 1;
 pub type _bindgen_ty_23 = ::std::os::raw::c_uint;
 pub type __pthread_cleanup_func_t =
     ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>;
@@ -7072,6 +7018,8 @@ pub struct __pthread_cleanup_t {
 }
 #[test]
 fn bindgen_test_layout___pthread_cleanup_t() {
+    const UNINIT: ::std::mem::MaybeUninit<__pthread_cleanup_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__pthread_cleanup_t>(),
         24usize,
@@ -7083,9 +7031,7 @@ fn bindgen_test_layout___pthread_cleanup_t() {
         concat!("Alignment of ", stringify!(__pthread_cleanup_t))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__pthread_cleanup_t>())).__cleanup_prev as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_prev) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7095,9 +7041,7 @@ fn bindgen_test_layout___pthread_cleanup_t() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__pthread_cleanup_t>())).__cleanup_routine as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_routine) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7107,9 +7051,7 @@ fn bindgen_test_layout___pthread_cleanup_t() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__pthread_cleanup_t>())).__cleanup_arg as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_arg) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -7129,24 +7071,23 @@ extern "C" {
 extern "C" {
     pub fn __pthread_cleanup_pop(arg1: *mut __pthread_cleanup_t, arg2: ::std::os::raw::c_int);
 }
-#[doc = " Data associated with an ALooper fd that will be returned as the \"outData\""]
-#[doc = " when that source has data ready."]
+#[doc = " Data associated with an ALooper fd that will be returned as the \"outData\"\n when that source has data ready."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct android_poll_source {
-    #[doc = " The identifier of this source.  May be LOOPER_ID_MAIN or"]
-    #[doc = " LOOPER_ID_INPUT."]
+    #[doc = " The identifier of this source.  May be LOOPER_ID_MAIN or\n LOOPER_ID_INPUT."]
     pub id: i32,
     #[doc = " The android_app this ident is associated with."]
     pub app: *mut android_app,
-    #[doc = " Function to call to perform the standard processing of data from"]
-    #[doc = " this source."]
+    #[doc = " Function to call to perform the standard processing of data from\n this source."]
     pub process: ::std::option::Option<
         unsafe extern "C" fn(app: *mut android_app, source: *mut android_poll_source),
     >,
 }
 #[test]
 fn bindgen_test_layout_android_poll_source() {
+    const UNINIT: ::std::mem::MaybeUninit<android_poll_source> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_poll_source>(),
         24usize,
@@ -7158,7 +7099,7 @@ fn bindgen_test_layout_android_poll_source() {
         concat!("Alignment of ", stringify!(android_poll_source))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_poll_source>())).id as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7168,7 +7109,7 @@ fn bindgen_test_layout_android_poll_source() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_poll_source>())).app as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).app) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7178,7 +7119,7 @@ fn bindgen_test_layout_android_poll_source() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_poll_source>())).process as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).process) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -7191,37 +7132,26 @@ fn bindgen_test_layout_android_poll_source() {
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct android_input_buffer {
-    #[doc = " Pointer to a read-only array of pointers to GameActivityMotionEvent."]
-    #[doc = " Only the first motionEventsCount events are valid."]
-    pub motionEvents: [GameActivityMotionEvent; 16usize],
+    #[doc = " Pointer to a read-only array of GameActivityMotionEvent.\n Only the first motionEventsCount events are valid."]
+    pub motionEvents: *mut GameActivityMotionEvent,
     #[doc = " The number of valid motion events in `motionEvents`."]
     pub motionEventsCount: u64,
-    #[doc = " Pointer to a read-only array of pointers to GameActivityHistoricalPointerAxes."]
-    #[doc = ""]
-    #[doc = " Only the first historicalSamplesCount samples are valid."]
-    #[doc = " Refer to event->historicalStart, event->pointerCount and event->historicalCount"]
-    #[doc = " to access the specific samples that relate to an event."]
-    #[doc = ""]
-    #[doc = " Each slice of samples for one event has a length of"]
-    #[doc = " (event->pointerCount and event->historicalCount) and is in pointer-major"]
-    #[doc = " order so the historic samples for each pointer are contiguous."]
-    #[doc = " E.g. you would access historic sample index 3 for pointer 2 of an event with:"]
-    #[doc = ""]
-    #[doc = "   historicalAxisSamples[event->historicalStart + (event->historicalCount * 2) + 3];"]
-    pub historicalAxisSamples: [GameActivityHistoricalPointerAxes; 64usize],
-    #[doc = " The number of valid historical samples in `historicalAxisSamples`."]
-    pub historicalSamplesCount: u64,
-    #[doc = " Pointer to a read-only array of pointers to GameActivityKeyEvent."]
-    #[doc = " Only the first keyEventsCount events are valid."]
-    pub keyEvents: [GameActivityKeyEvent; 4usize],
+    #[doc = " The size of the `motionEvents` buffer."]
+    pub motionEventsBufferSize: u64,
+    #[doc = " Pointer to a read-only array of GameActivityKeyEvent.\n Only the first keyEventsCount events are valid."]
+    pub keyEvents: *mut GameActivityKeyEvent,
     #[doc = " The number of valid \"Key\" events in `keyEvents`."]
     pub keyEventsCount: u64,
+    #[doc = " The size of the `keyEvents` buffer."]
+    pub keyEventsBufferSize: u64,
 }
 #[test]
 fn bindgen_test_layout_android_input_buffer() {
+    const UNINIT: ::std::mem::MaybeUninit<android_input_buffer> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_input_buffer>(),
-        40824usize,
+        48usize,
         concat!("Size of: ", stringify!(android_input_buffer))
     );
     assert_eq!(
@@ -7230,9 +7160,7 @@ fn bindgen_test_layout_android_input_buffer() {
         concat!("Alignment of ", stringify!(android_input_buffer))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).motionEvents as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEvents) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7242,10 +7170,8 @@ fn bindgen_test_layout_android_input_buffer() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).motionEventsCount as *const _ as usize
-        },
-        27776usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEventsCount) as usize - ptr as usize },
+        8usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
@@ -7254,153 +7180,81 @@ fn bindgen_test_layout_android_input_buffer() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).historicalAxisSamples as *const _
-                as usize
-        },
-        27784usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEventsBufferSize) as usize - ptr as usize },
+        16usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(historicalAxisSamples)
+            stringify!(motionEventsBufferSize)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).historicalSamplesCount as *const _
-                as usize
-        },
-        40584usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEvents) as usize - ptr as usize },
+        24usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(historicalSamplesCount)
+            stringify!(keyEvents)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_input_buffer>())).keyEvents as *const _ as usize },
-        40592usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEventsCount) as usize - ptr as usize },
+        32usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(keyEvents)
+            stringify!(keyEventsCount)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).keyEventsCount as *const _ as usize
-        },
-        40816usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEventsBufferSize) as usize - ptr as usize },
+        40usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(keyEventsCount)
+            stringify!(keyEventsBufferSize)
         )
     );
 }
-#[doc = " Function pointer declaration for the filtering of key events."]
-#[doc = " A function with this signature should be passed to"]
-#[doc = " android_app_set_key_event_filter and return false for any events that should"]
-#[doc = " not be handled by android_native_app_glue. These events will be handled by"]
-#[doc = " the system instead."]
+#[doc = " Function pointer declaration for the filtering of key events.\n A function with this signature should be passed to\n android_app_set_key_event_filter and return false for any events that should\n not be handled by android_native_app_glue. These events will be handled by\n the system instead."]
 pub type android_key_event_filter =
     ::std::option::Option<unsafe extern "C" fn(arg1: *const GameActivityKeyEvent) -> bool>;
-#[doc = " Function pointer definition for the filtering of motion events."]
-#[doc = " A function with this signature should be passed to"]
-#[doc = " android_app_set_motion_event_filter and return false for any events that"]
-#[doc = " should not be handled by android_native_app_glue. These events will be"]
-#[doc = " handled by the system instead."]
+#[doc = " Function pointer definition for the filtering of motion events.\n A function with this signature should be passed to\n android_app_set_motion_event_filter and return false for any events that\n should not be handled by android_native_app_glue. These events will be\n handled by the system instead."]
 pub type android_motion_event_filter =
     ::std::option::Option<unsafe extern "C" fn(arg1: *const GameActivityMotionEvent) -> bool>;
-#[doc = " The GameActivity interface provided by <game-activity/GameActivity.h>"]
-#[doc = " is based on a set of application-provided callbacks that will be called"]
-#[doc = " by the Activity's main thread when certain events occur."]
-#[doc = ""]
-#[doc = " This means that each one of this callbacks _should_ _not_ block, or they"]
-#[doc = " risk having the system force-close the application. This programming"]
-#[doc = " model is direct, lightweight, but constraining."]
-#[doc = ""]
-#[doc = " The 'android_native_app_glue' static library is used to provide a different"]
-#[doc = " execution model where the application can implement its own main event"]
-#[doc = " loop in a different thread instead. Here's how it works:"]
-#[doc = ""]
-#[doc = " 1/ The application must provide a function named \"android_main()\" that"]
-#[doc = "    will be called when the activity is created, in a new thread that is"]
-#[doc = "    distinct from the activity's main thread."]
-#[doc = ""]
-#[doc = " 2/ android_main() receives a pointer to a valid \"android_app\" structure"]
-#[doc = "    that contains references to other important objects, e.g. the"]
-#[doc = "    GameActivity obejct instance the application is running in."]
-#[doc = ""]
-#[doc = " 3/ the \"android_app\" object holds an ALooper instance that already"]
-#[doc = "    listens to activity lifecycle events (e.g. \"pause\", \"resume\")."]
-#[doc = "    See APP_CMD_XXX declarations below."]
-#[doc = ""]
-#[doc = "    This corresponds to an ALooper identifier returned by"]
-#[doc = "    ALooper_pollOnce with value LOOPER_ID_MAIN."]
-#[doc = ""]
-#[doc = "    Your application can use the same ALooper to listen to additional"]
-#[doc = "    file-descriptors.  They can either be callback based, or with return"]
-#[doc = "    identifiers starting with LOOPER_ID_USER."]
-#[doc = ""]
-#[doc = " 4/ Whenever you receive a LOOPER_ID_MAIN event,"]
-#[doc = "    the returned data will point to an android_poll_source structure.  You"]
-#[doc = "    can call the process() function on it, and fill in android_app->onAppCmd"]
-#[doc = "    to be called for your own processing of the event."]
-#[doc = ""]
-#[doc = "    Alternatively, you can call the low-level functions to read and process"]
-#[doc = "    the data directly...  look at the process_cmd() and process_input()"]
-#[doc = "    implementations in the glue to see how to do this."]
-#[doc = ""]
-#[doc = " See the sample named \"native-activity\" that comes with the NDK with a"]
-#[doc = " full usage example.  Also look at the documentation of GameActivity."]
+#[doc = " The GameActivity interface provided by <game-activity/GameActivity.h>\n is based on a set of application-provided callbacks that will be called\n by the Activity's main thread when certain events occur.\n\n This means that each one of this callbacks _should_ _not_ block, or they\n risk having the system force-close the application. This programming\n model is direct, lightweight, but constraining.\n\n The 'android_native_app_glue' static library is used to provide a different\n execution model where the application can implement its own main event\n loop in a different thread instead. Here's how it works:\n\n 1/ The application must provide a function named \"android_main()\" that\n    will be called when the activity is created, in a new thread that is\n    distinct from the activity's main thread.\n\n 2/ android_main() receives a pointer to a valid \"android_app\" structure\n    that contains references to other important objects, e.g. the\n    GameActivity obejct instance the application is running in.\n\n 3/ the \"android_app\" object holds an ALooper instance that already\n    listens to activity lifecycle events (e.g. \"pause\", \"resume\").\n    See APP_CMD_XXX declarations below.\n\n    This corresponds to an ALooper identifier returned by\n    ALooper_pollOnce with value LOOPER_ID_MAIN.\n\n    Your application can use the same ALooper to listen to additional\n    file-descriptors.  They can either be callback based, or with return\n    identifiers starting with LOOPER_ID_USER.\n\n 4/ Whenever you receive a LOOPER_ID_MAIN event,\n    the returned data will point to an android_poll_source structure.  You\n    can call the process() function on it, and fill in android_app->onAppCmd\n    to be called for your own processing of the event.\n\n    Alternatively, you can call the low-level functions to read and process\n    the data directly...  look at the process_cmd() and process_input()\n    implementations in the glue to see how to do this.\n\n See the sample named \"native-activity\" that comes with the NDK with a\n full usage example.  Also look at the documentation of GameActivity."]
 #[repr(C)]
 pub struct android_app {
     #[doc = " An optional pointer to application-defined state."]
     pub userData: *mut ::std::os::raw::c_void,
-    #[doc = " A required callback for processing main app commands (`APP_CMD_*`)."]
-    #[doc = " This is called each frame if there are app commands that need processing."]
+    #[doc = " A required callback for processing main app commands (`APP_CMD_*`).\n This is called each frame if there are app commands that need processing."]
     pub onAppCmd: ::std::option::Option<unsafe extern "C" fn(app: *mut android_app, cmd: i32)>,
     #[doc = " The GameActivity object instance that this app is running in."]
     pub activity: *mut GameActivity,
     #[doc = " The current configuration the app is running in."]
     pub config: *mut AConfiguration,
-    #[doc = " The last activity saved state, as provided at creation time."]
-    #[doc = " It is NULL if there was no state.  You can use this as you need; the"]
-    #[doc = " memory will remain around until you call android_app_exec_cmd() for"]
-    #[doc = " APP_CMD_RESUME, at which point it will be freed and savedState set to"]
-    #[doc = " NULL. These variables should only be changed when processing a"]
-    #[doc = " APP_CMD_SAVE_STATE, at which point they will be initialized to NULL and"]
-    #[doc = " you can malloc your state and place the information here.  In that case"]
-    #[doc = " the memory will be freed for you later."]
+    #[doc = " The last activity saved state, as provided at creation time.\n It is NULL if there was no state.  You can use this as you need; the\n memory will remain around until you call android_app_exec_cmd() for\n APP_CMD_RESUME, at which point it will be freed and savedState set to\n NULL. These variables should only be changed when processing a\n APP_CMD_SAVE_STATE, at which point they will be initialized to NULL and\n you can malloc your state and place the information here.  In that case\n the memory will be freed for you later."]
     pub savedState: *mut ::std::os::raw::c_void,
     #[doc = " The size of the activity saved state. It is 0 if `savedState` is NULL."]
-    pub savedStateSize: size_t,
+    pub savedStateSize: usize,
     #[doc = " The ALooper associated with the app's thread."]
     pub looper: *mut ALooper,
     #[doc = " When non-NULL, this is the window surface that the app can draw in."]
     pub window: *mut ANativeWindow,
-    #[doc = " Current content rectangle of the window; this is the area where the"]
-    #[doc = " window's content should be placed to be seen by the user."]
+    #[doc = " Current content rectangle of the window; this is the area where the\n window's content should be placed to be seen by the user."]
     pub contentRect: ARect,
-    #[doc = " Current state of the app's activity.  May be either APP_CMD_START,"]
-    #[doc = " APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP."]
+    #[doc = " Current state of the app's activity.  May be either APP_CMD_START,\n APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP."]
     pub activityState: ::std::os::raw::c_int,
-    #[doc = " This is non-zero when the application's GameActivity is being"]
-    #[doc = " destroyed and waiting for the app thread to complete."]
+    #[doc = " This is non-zero when the application's GameActivity is being\n destroyed and waiting for the app thread to complete."]
     pub destroyRequested: ::std::os::raw::c_int,
-    #[doc = " This is used for buffering input from GameActivity. Once ready, the"]
-    #[doc = " application thread switches the buffers and processes what was"]
-    #[doc = " accumulated."]
+    #[doc = " This is used for buffering input from GameActivity. Once ready, the\n application thread switches the buffers and processes what was\n accumulated."]
     pub inputBuffers: [android_input_buffer; 2usize],
     pub currentInputBuffer: ::std::os::raw::c_int,
-    #[doc = " 0 if no text input event is outstanding, 1 if it is."]
-    #[doc = " Use `GameActivity_getTextInputState` to get information"]
-    #[doc = " about the text entered by the user."]
+    #[doc = " 0 if no text input event is outstanding, 1 if it is.\n Use `GameActivity_getTextInputState` to get information\n about the text entered by the user."]
     pub textInputState: ::std::os::raw::c_int,
     #[doc = " @cond INTERNAL"]
     pub mutex: pthread_mutex_t,
@@ -7422,9 +7276,11 @@ pub struct android_app {
 }
 #[test]
 fn bindgen_test_layout_android_app() {
+    const UNINIT: ::std::mem::MaybeUninit<android_app> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_app>(),
-        81936usize,
+        384usize,
         concat!("Size of: ", stringify!(android_app))
     );
     assert_eq!(
@@ -7433,7 +7289,7 @@ fn bindgen_test_layout_android_app() {
         concat!("Alignment of ", stringify!(android_app))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).userData as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).userData) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7443,7 +7299,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).onAppCmd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onAppCmd) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7453,7 +7309,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).activity as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).activity) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -7463,7 +7319,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).config as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).config) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -7473,7 +7329,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).savedState as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).savedState) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -7483,7 +7339,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).savedStateSize as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).savedStateSize) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -7493,7 +7349,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).looper as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).looper) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -7503,7 +7359,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).window as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).window) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -7513,7 +7369,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).contentRect as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).contentRect) as usize - ptr as usize },
         64usize,
         concat!(
             "Offset of field: ",
@@ -7523,7 +7379,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).activityState as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).activityState) as usize - ptr as usize },
         80usize,
         concat!(
             "Offset of field: ",
@@ -7533,7 +7389,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).destroyRequested as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).destroyRequested) as usize - ptr as usize },
         84usize,
         concat!(
             "Offset of field: ",
@@ -7543,7 +7399,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).inputBuffers as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).inputBuffers) as usize - ptr as usize },
         88usize,
         concat!(
             "Offset of field: ",
@@ -7553,8 +7409,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).currentInputBuffer as *const _ as usize },
-        81736usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).currentInputBuffer) as usize - ptr as usize },
+        184usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7563,8 +7419,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).textInputState as *const _ as usize },
-        81740usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).textInputState) as usize - ptr as usize },
+        188usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7573,8 +7429,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).mutex as *const _ as usize },
-        81744usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).mutex) as usize - ptr as usize },
+        192usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7583,8 +7439,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).cond as *const _ as usize },
-        81784usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).cond) as usize - ptr as usize },
+        232usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7593,8 +7449,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).msgread as *const _ as usize },
-        81832usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).msgread) as usize - ptr as usize },
+        280usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7603,8 +7459,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).msgwrite as *const _ as usize },
-        81836usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).msgwrite) as usize - ptr as usize },
+        284usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7613,8 +7469,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).thread as *const _ as usize },
-        81840usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).thread) as usize - ptr as usize },
+        288usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7623,8 +7479,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).cmdPollSource as *const _ as usize },
-        81848usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).cmdPollSource) as usize - ptr as usize },
+        296usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7633,8 +7489,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).running as *const _ as usize },
-        81872usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).running) as usize - ptr as usize },
+        320usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7643,8 +7499,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).stateSaved as *const _ as usize },
-        81876usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).stateSaved) as usize - ptr as usize },
+        324usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7653,8 +7509,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).destroyed as *const _ as usize },
-        81880usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).destroyed) as usize - ptr as usize },
+        328usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7663,8 +7519,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).redrawNeeded as *const _ as usize },
-        81884usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).redrawNeeded) as usize - ptr as usize },
+        332usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7673,8 +7529,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).pendingWindow as *const _ as usize },
-        81888usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pendingWindow) as usize - ptr as usize },
+        336usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7683,8 +7539,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).pendingContentRect as *const _ as usize },
-        81896usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pendingContentRect) as usize - ptr as usize },
+        344usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7693,8 +7549,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).keyEventFilter as *const _ as usize },
-        81912usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEventFilter) as usize - ptr as usize },
+        360usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7703,8 +7559,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).motionEventFilter as *const _ as usize },
-        81920usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEventFilter) as usize - ptr as usize },
+        368usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7713,10 +7569,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_app>())).inputAvailableWakeUp as *const _ as usize
-        },
-        81928usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).inputAvailableWakeUp) as usize - ptr as usize },
+        376usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7725,8 +7579,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).inputSwapPending as *const _ as usize },
-        81929usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).inputSwapPending) as usize - ptr as usize },
+        377usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -7735,139 +7589,89 @@ fn bindgen_test_layout_android_app() {
         )
     );
 }
-#[doc = " Looper data ID of commands coming from the app's main thread, which"]
-#[doc = " is returned as an identifier from ALooper_pollOnce().  The data for this"]
-#[doc = " identifier is a pointer to an android_poll_source structure."]
-#[doc = " These can be retrieved and processed with android_app_read_cmd()"]
-#[doc = " and android_app_exec_cmd()."]
+#[doc = " Looper data ID of commands coming from the app's main thread, which\n is returned as an identifier from ALooper_pollOnce().  The data for this\n identifier is a pointer to an android_poll_source structure.\n These can be retrieved and processed with android_app_read_cmd()\n and android_app_exec_cmd()."]
 pub const NativeAppGlueLooperId_LOOPER_ID_MAIN: NativeAppGlueLooperId = 1;
-#[doc = " Unused. Reserved for future use when usage of AInputQueue will be"]
-#[doc = " supported."]
+#[doc = " Unused. Reserved for future use when usage of AInputQueue will be\n supported."]
 pub const NativeAppGlueLooperId_LOOPER_ID_INPUT: NativeAppGlueLooperId = 2;
 #[doc = " Start of user-defined ALooper identifiers."]
 pub const NativeAppGlueLooperId_LOOPER_ID_USER: NativeAppGlueLooperId = 3;
-#[doc = " Looper ID of commands coming from the app's main thread, an AInputQueue or"]
-#[doc = " user-defined sources."]
+#[doc = " Looper ID of commands coming from the app's main thread, an AInputQueue or\n user-defined sources."]
 pub type NativeAppGlueLooperId = ::std::os::raw::c_uint;
-#[doc = " Unused. Reserved for future use when usage of AInputQueue will be"]
-#[doc = " supported."]
+#[doc = " Unused. Reserved for future use when usage of AInputQueue will be\n supported."]
 pub const NativeAppGlueAppCmd_UNUSED_APP_CMD_INPUT_CHANGED: NativeAppGlueAppCmd = 0;
-#[doc = " Command from main thread: a new ANativeWindow is ready for use.  Upon"]
-#[doc = " receiving this command, android_app->window will contain the new window"]
-#[doc = " surface."]
+#[doc = " Command from main thread: a new ANativeWindow is ready for use.  Upon\n receiving this command, android_app->window will contain the new window\n surface."]
 pub const NativeAppGlueAppCmd_APP_CMD_INIT_WINDOW: NativeAppGlueAppCmd = 1;
-#[doc = " Command from main thread: the existing ANativeWindow needs to be"]
-#[doc = " terminated.  Upon receiving this command, android_app->window still"]
-#[doc = " contains the existing window; after calling android_app_exec_cmd"]
-#[doc = " it will be set to NULL."]
+#[doc = " Command from main thread: the existing ANativeWindow needs to be\n terminated.  Upon receiving this command, android_app->window still\n contains the existing window; after calling android_app_exec_cmd\n it will be set to NULL."]
 pub const NativeAppGlueAppCmd_APP_CMD_TERM_WINDOW: NativeAppGlueAppCmd = 2;
-#[doc = " Command from main thread: the current ANativeWindow has been resized."]
-#[doc = " Please redraw with its new size."]
+#[doc = " Command from main thread: the current ANativeWindow has been resized.\n Please redraw with its new size."]
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_RESIZED: NativeAppGlueAppCmd = 3;
-#[doc = " Command from main thread: the system needs that the current ANativeWindow"]
-#[doc = " be redrawn.  You should redraw the window before handing this to"]
-#[doc = " android_app_exec_cmd() in order to avoid transient drawing glitches."]
+#[doc = " Command from main thread: the system needs that the current ANativeWindow\n be redrawn.  You should redraw the window before handing this to\n android_app_exec_cmd() in order to avoid transient drawing glitches."]
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_REDRAW_NEEDED: NativeAppGlueAppCmd = 4;
-#[doc = " Command from main thread: the content area of the window has changed,"]
-#[doc = " such as from the soft input window being shown or hidden.  You can"]
-#[doc = " find the new content rect in android_app::contentRect."]
+#[doc = " Command from main thread: the content area of the window has changed,\n such as from the soft input window being shown or hidden.  You can\n find the new content rect in android_app::contentRect."]
 pub const NativeAppGlueAppCmd_APP_CMD_CONTENT_RECT_CHANGED: NativeAppGlueAppCmd = 5;
-#[doc = " Command from main thread: the app's activity window has gained"]
-#[doc = " input focus."]
+#[doc = " Command from main thread: the app's activity window has gained\n input focus."]
 pub const NativeAppGlueAppCmd_APP_CMD_GAINED_FOCUS: NativeAppGlueAppCmd = 6;
-#[doc = " Command from main thread: the app's activity window has lost"]
-#[doc = " input focus."]
+#[doc = " Command from main thread: the app's activity window has lost\n input focus."]
 pub const NativeAppGlueAppCmd_APP_CMD_LOST_FOCUS: NativeAppGlueAppCmd = 7;
 #[doc = " Command from main thread: the current device configuration has changed."]
 pub const NativeAppGlueAppCmd_APP_CMD_CONFIG_CHANGED: NativeAppGlueAppCmd = 8;
-#[doc = " Command from main thread: the system is running low on memory."]
-#[doc = " Try to reduce your memory use."]
+#[doc = " Command from main thread: the system is running low on memory.\n Try to reduce your memory use."]
 pub const NativeAppGlueAppCmd_APP_CMD_LOW_MEMORY: NativeAppGlueAppCmd = 9;
 #[doc = " Command from main thread: the app's activity has been started."]
 pub const NativeAppGlueAppCmd_APP_CMD_START: NativeAppGlueAppCmd = 10;
 #[doc = " Command from main thread: the app's activity has been resumed."]
 pub const NativeAppGlueAppCmd_APP_CMD_RESUME: NativeAppGlueAppCmd = 11;
-#[doc = " Command from main thread: the app should generate a new saved state"]
-#[doc = " for itself, to restore from later if needed.  If you have saved state,"]
-#[doc = " allocate it with malloc and place it in android_app.savedState with"]
-#[doc = " the size in android_app.savedStateSize.  The will be freed for you"]
-#[doc = " later."]
+#[doc = " Command from main thread: the app should generate a new saved state\n for itself, to restore from later if needed.  If you have saved state,\n allocate it with malloc and place it in android_app.savedState with\n the size in android_app.savedStateSize.  The will be freed for you\n later."]
 pub const NativeAppGlueAppCmd_APP_CMD_SAVE_STATE: NativeAppGlueAppCmd = 12;
 #[doc = " Command from main thread: the app's activity has been paused."]
 pub const NativeAppGlueAppCmd_APP_CMD_PAUSE: NativeAppGlueAppCmd = 13;
 #[doc = " Command from main thread: the app's activity has been stopped."]
 pub const NativeAppGlueAppCmd_APP_CMD_STOP: NativeAppGlueAppCmd = 14;
-#[doc = " Command from main thread: the app's activity is being destroyed,"]
-#[doc = " and waiting for the app thread to clean up and exit before proceeding."]
+#[doc = " Command from main thread: the app's activity is being destroyed,\n and waiting for the app thread to clean up and exit before proceeding."]
 pub const NativeAppGlueAppCmd_APP_CMD_DESTROY: NativeAppGlueAppCmd = 15;
 #[doc = " Command from main thread: the app's insets have changed."]
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_INSETS_CHANGED: NativeAppGlueAppCmd = 16;
 #[doc = " Commands passed from the application's main Java thread to the game's thread."]
 pub type NativeAppGlueAppCmd = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next"]
-    #[doc = " app command message."]
+    #[doc = " Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next\n app command message."]
     pub fn android_app_read_cmd(android_app: *mut android_app) -> i8;
 }
 extern "C" {
-    #[doc = " Call with the command returned by android_app_read_cmd() to do the"]
-    #[doc = " initial pre-processing of the given command.  You can perform your own"]
-    #[doc = " actions for the command after calling this function."]
+    #[doc = " Call with the command returned by android_app_read_cmd() to do the\n initial pre-processing of the given command.  You can perform your own\n actions for the command after calling this function."]
     pub fn android_app_pre_exec_cmd(android_app: *mut android_app, cmd: i8);
 }
 extern "C" {
-    #[doc = " Call with the command returned by android_app_read_cmd() to do the"]
-    #[doc = " final post-processing of the given command.  You must have done your own"]
-    #[doc = " actions for the command before calling this function."]
+    #[doc = " Call with the command returned by android_app_read_cmd() to do the\n final post-processing of the given command.  You must have done your own\n actions for the command before calling this function."]
     pub fn android_app_post_exec_cmd(android_app: *mut android_app, cmd: i8);
 }
 extern "C" {
-    #[doc = " Call this before processing input events to get the events buffer."]
-    #[doc = " The function returns NULL if there are no events to process."]
+    #[doc = " Call this before processing input events to get the events buffer.\n The function returns NULL if there are no events to process."]
     pub fn android_app_swap_input_buffers(
         android_app: *mut android_app,
     ) -> *mut android_input_buffer;
 }
 extern "C" {
-    #[doc = " Clear the array of motion events that were waiting to be handled, and release"]
-    #[doc = " each of them."]
-    #[doc = ""]
-    #[doc = " This method should be called after you have processed the motion events in"]
-    #[doc = " your game loop. You should handle events at each iteration of your game loop."]
+    #[doc = " Clear the array of motion events that were waiting to be handled, and release\n each of them.\n\n This method should be called after you have processed the motion events in\n your game loop. You should handle events at each iteration of your game loop."]
     pub fn android_app_clear_motion_events(inputBuffer: *mut android_input_buffer);
 }
 extern "C" {
-    #[doc = " Clear the array of key events that were waiting to be handled, and release"]
-    #[doc = " each of them."]
-    #[doc = ""]
-    #[doc = " This method should be called after you have processed the key up events in"]
-    #[doc = " your game loop. You should handle events at each iteration of your game loop."]
+    #[doc = " Clear the array of key events that were waiting to be handled, and release\n each of them.\n\n This method should be called after you have processed the key up events in\n your game loop. You should handle events at each iteration of your game loop."]
     pub fn android_app_clear_key_events(inputBuffer: *mut android_input_buffer);
 }
 extern "C" {
-    #[doc = " This is a springboard into the Rust glue layer that wraps calling the"]
-    #[doc = " main entry for the app itself."]
+    #[doc = " This is a springboard into the Rust glue layer that wraps calling the\n main entry for the app itself."]
     pub fn _rust_glue_entry(app: *mut android_app);
 }
 extern "C" {
-    #[doc = " Set the filter to use when processing key events."]
-    #[doc = " Any events for which the filter returns false will be ignored by"]
-    #[doc = " android_native_app_glue. If filter is set to NULL, no filtering is done."]
-    #[doc = ""]
-    #[doc = " The default key filter will filter out volume and camera button presses."]
+    #[doc = " Set the filter to use when processing key events.\n Any events for which the filter returns false will be ignored by\n android_native_app_glue. If filter is set to NULL, no filtering is done.\n\n The default key filter will filter out volume and camera button presses."]
     pub fn android_app_set_key_event_filter(
         app: *mut android_app,
         filter: android_key_event_filter,
     );
 }
 extern "C" {
-    #[doc = " Set the filter to use when processing touch and motion events."]
-    #[doc = " Any events for which the filter returns false will be ignored by"]
-    #[doc = " android_native_app_glue. If filter is set to NULL, no filtering is done."]
-    #[doc = ""]
-    #[doc = " Note that the default motion event filter will only allow touchscreen events"]
-    #[doc = " through, in order to mimic NativeActivity's behaviour, so for controller"]
-    #[doc = " events to be passed to the app, set the filter to NULL."]
+    #[doc = " Set the filter to use when processing touch and motion events.\n Any events for which the filter returns false will be ignored by\n android_native_app_glue. If filter is set to NULL, no filtering is done.\n\n Note that the default motion event filter will only allow touchscreen events\n through, in order to mimic NativeActivity's behaviour, so for controller\n events to be passed to the app, set the filter to NULL."]
     pub fn android_app_set_motion_event_filter(
         app: *mut android_app,
         filter: android_motion_event_filter,
diff --git a/android-activity/src/game_activity/ffi_arm.rs b/android-activity/src/game_activity/ffi_arm.rs
index 7504db8..f33e4bc 100644
--- a/android-activity/src/game_activity/ffi_arm.rs
+++ b/android-activity/src/game_activity/ffi_arm.rs
@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.59.2 */
+/* automatically generated by rust-bindgen 0.66.1 */
 
 #[repr(C)]
 #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
@@ -101,10 +101,14 @@ pub const __ANDROID_API_O_MR1__: u32 = 27;
 pub const __ANDROID_API_P__: u32 = 28;
 pub const __ANDROID_API_Q__: u32 = 29;
 pub const __ANDROID_API_R__: u32 = 30;
-pub const __NDK_MAJOR__: u32 = 21;
-pub const __NDK_MINOR__: u32 = 1;
+pub const __ANDROID_API_S__: u32 = 31;
+pub const __ANDROID_API_T__: u32 = 33;
+pub const __ANDROID_API_U__: u32 = 34;
+pub const __ANDROID_NDK__: u32 = 1;
+pub const __NDK_MAJOR__: u32 = 25;
+pub const __NDK_MINOR__: u32 = 2;
 pub const __NDK_BETA__: u32 = 0;
-pub const __NDK_BUILD__: u32 = 6352462;
+pub const __NDK_BUILD__: u32 = 9519653;
 pub const __NDK_CANARY__: u32 = 0;
 pub const WCHAR_MIN: u8 = 0u8;
 pub const INT8_MIN: i32 = -128;
@@ -143,136 +147,141 @@ pub const PTRDIFF_MAX: u32 = 2147483647;
 pub const SIZE_MAX: u32 = 4294967295;
 pub const __BITS_PER_LONG: u32 = 32;
 pub const __FD_SETSIZE: u32 = 1024;
-pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8;
-pub const __PRI_64_prefix: &[u8; 3usize] = b"ll\0";
-pub const PRId8: &[u8; 2usize] = b"d\0";
-pub const PRId16: &[u8; 2usize] = b"d\0";
-pub const PRId32: &[u8; 2usize] = b"d\0";
-pub const PRId64: &[u8; 4usize] = b"lld\0";
-pub const PRIdLEAST8: &[u8; 2usize] = b"d\0";
-pub const PRIdLEAST16: &[u8; 2usize] = b"d\0";
-pub const PRIdLEAST32: &[u8; 2usize] = b"d\0";
-pub const PRIdLEAST64: &[u8; 4usize] = b"lld\0";
-pub const PRIdFAST8: &[u8; 2usize] = b"d\0";
-pub const PRIdFAST64: &[u8; 4usize] = b"lld\0";
-pub const PRIdMAX: &[u8; 3usize] = b"jd\0";
-pub const PRIi8: &[u8; 2usize] = b"i\0";
-pub const PRIi16: &[u8; 2usize] = b"i\0";
-pub const PRIi32: &[u8; 2usize] = b"i\0";
-pub const PRIi64: &[u8; 4usize] = b"lli\0";
-pub const PRIiLEAST8: &[u8; 2usize] = b"i\0";
-pub const PRIiLEAST16: &[u8; 2usize] = b"i\0";
-pub const PRIiLEAST32: &[u8; 2usize] = b"i\0";
-pub const PRIiLEAST64: &[u8; 4usize] = b"lli\0";
-pub const PRIiFAST8: &[u8; 2usize] = b"i\0";
-pub const PRIiFAST64: &[u8; 4usize] = b"lli\0";
-pub const PRIiMAX: &[u8; 3usize] = b"ji\0";
-pub const PRIo8: &[u8; 2usize] = b"o\0";
-pub const PRIo16: &[u8; 2usize] = b"o\0";
-pub const PRIo32: &[u8; 2usize] = b"o\0";
-pub const PRIo64: &[u8; 4usize] = b"llo\0";
-pub const PRIoLEAST8: &[u8; 2usize] = b"o\0";
-pub const PRIoLEAST16: &[u8; 2usize] = b"o\0";
-pub const PRIoLEAST32: &[u8; 2usize] = b"o\0";
-pub const PRIoLEAST64: &[u8; 4usize] = b"llo\0";
-pub const PRIoFAST8: &[u8; 2usize] = b"o\0";
-pub const PRIoFAST64: &[u8; 4usize] = b"llo\0";
-pub const PRIoMAX: &[u8; 3usize] = b"jo\0";
-pub const PRIu8: &[u8; 2usize] = b"u\0";
-pub const PRIu16: &[u8; 2usize] = b"u\0";
-pub const PRIu32: &[u8; 2usize] = b"u\0";
-pub const PRIu64: &[u8; 4usize] = b"llu\0";
-pub const PRIuLEAST8: &[u8; 2usize] = b"u\0";
-pub const PRIuLEAST16: &[u8; 2usize] = b"u\0";
-pub const PRIuLEAST32: &[u8; 2usize] = b"u\0";
-pub const PRIuLEAST64: &[u8; 4usize] = b"llu\0";
-pub const PRIuFAST8: &[u8; 2usize] = b"u\0";
-pub const PRIuFAST64: &[u8; 4usize] = b"llu\0";
-pub const PRIuMAX: &[u8; 3usize] = b"ju\0";
-pub const PRIx8: &[u8; 2usize] = b"x\0";
-pub const PRIx16: &[u8; 2usize] = b"x\0";
-pub const PRIx32: &[u8; 2usize] = b"x\0";
-pub const PRIx64: &[u8; 4usize] = b"llx\0";
-pub const PRIxLEAST8: &[u8; 2usize] = b"x\0";
-pub const PRIxLEAST16: &[u8; 2usize] = b"x\0";
-pub const PRIxLEAST32: &[u8; 2usize] = b"x\0";
-pub const PRIxLEAST64: &[u8; 4usize] = b"llx\0";
-pub const PRIxFAST8: &[u8; 2usize] = b"x\0";
-pub const PRIxFAST64: &[u8; 4usize] = b"llx\0";
-pub const PRIxMAX: &[u8; 3usize] = b"jx\0";
-pub const PRIX8: &[u8; 2usize] = b"X\0";
-pub const PRIX16: &[u8; 2usize] = b"X\0";
-pub const PRIX32: &[u8; 2usize] = b"X\0";
-pub const PRIX64: &[u8; 4usize] = b"llX\0";
-pub const PRIXLEAST8: &[u8; 2usize] = b"X\0";
-pub const PRIXLEAST16: &[u8; 2usize] = b"X\0";
-pub const PRIXLEAST32: &[u8; 2usize] = b"X\0";
-pub const PRIXLEAST64: &[u8; 4usize] = b"llX\0";
-pub const PRIXFAST8: &[u8; 2usize] = b"X\0";
-pub const PRIXFAST64: &[u8; 4usize] = b"llX\0";
-pub const PRIXMAX: &[u8; 3usize] = b"jX\0";
-pub const SCNd8: &[u8; 4usize] = b"hhd\0";
-pub const SCNd16: &[u8; 3usize] = b"hd\0";
-pub const SCNd32: &[u8; 2usize] = b"d\0";
-pub const SCNd64: &[u8; 4usize] = b"lld\0";
-pub const SCNdLEAST8: &[u8; 4usize] = b"hhd\0";
-pub const SCNdLEAST16: &[u8; 3usize] = b"hd\0";
-pub const SCNdLEAST32: &[u8; 2usize] = b"d\0";
-pub const SCNdLEAST64: &[u8; 4usize] = b"lld\0";
-pub const SCNdFAST8: &[u8; 4usize] = b"hhd\0";
-pub const SCNdFAST64: &[u8; 4usize] = b"lld\0";
-pub const SCNdMAX: &[u8; 3usize] = b"jd\0";
-pub const SCNi8: &[u8; 4usize] = b"hhi\0";
-pub const SCNi16: &[u8; 3usize] = b"hi\0";
-pub const SCNi32: &[u8; 2usize] = b"i\0";
-pub const SCNi64: &[u8; 4usize] = b"lli\0";
-pub const SCNiLEAST8: &[u8; 4usize] = b"hhi\0";
-pub const SCNiLEAST16: &[u8; 3usize] = b"hi\0";
-pub const SCNiLEAST32: &[u8; 2usize] = b"i\0";
-pub const SCNiLEAST64: &[u8; 4usize] = b"lli\0";
-pub const SCNiFAST8: &[u8; 4usize] = b"hhi\0";
-pub const SCNiFAST64: &[u8; 4usize] = b"lli\0";
-pub const SCNiMAX: &[u8; 3usize] = b"ji\0";
-pub const SCNo8: &[u8; 4usize] = b"hho\0";
-pub const SCNo16: &[u8; 3usize] = b"ho\0";
-pub const SCNo32: &[u8; 2usize] = b"o\0";
-pub const SCNo64: &[u8; 4usize] = b"llo\0";
-pub const SCNoLEAST8: &[u8; 4usize] = b"hho\0";
-pub const SCNoLEAST16: &[u8; 3usize] = b"ho\0";
-pub const SCNoLEAST32: &[u8; 2usize] = b"o\0";
-pub const SCNoLEAST64: &[u8; 4usize] = b"llo\0";
-pub const SCNoFAST8: &[u8; 4usize] = b"hho\0";
-pub const SCNoFAST64: &[u8; 4usize] = b"llo\0";
-pub const SCNoMAX: &[u8; 3usize] = b"jo\0";
-pub const SCNu8: &[u8; 4usize] = b"hhu\0";
-pub const SCNu16: &[u8; 3usize] = b"hu\0";
-pub const SCNu32: &[u8; 2usize] = b"u\0";
-pub const SCNu64: &[u8; 4usize] = b"llu\0";
-pub const SCNuLEAST8: &[u8; 4usize] = b"hhu\0";
-pub const SCNuLEAST16: &[u8; 3usize] = b"hu\0";
-pub const SCNuLEAST32: &[u8; 2usize] = b"u\0";
-pub const SCNuLEAST64: &[u8; 4usize] = b"llu\0";
-pub const SCNuFAST8: &[u8; 4usize] = b"hhu\0";
-pub const SCNuFAST64: &[u8; 4usize] = b"llu\0";
-pub const SCNuMAX: &[u8; 3usize] = b"ju\0";
-pub const SCNx8: &[u8; 4usize] = b"hhx\0";
-pub const SCNx16: &[u8; 3usize] = b"hx\0";
-pub const SCNx32: &[u8; 2usize] = b"x\0";
-pub const SCNx64: &[u8; 4usize] = b"llx\0";
-pub const SCNxLEAST8: &[u8; 4usize] = b"hhx\0";
-pub const SCNxLEAST16: &[u8; 3usize] = b"hx\0";
-pub const SCNxLEAST32: &[u8; 2usize] = b"x\0";
-pub const SCNxLEAST64: &[u8; 4usize] = b"llx\0";
-pub const SCNxFAST8: &[u8; 4usize] = b"hhx\0";
-pub const SCNxFAST64: &[u8; 4usize] = b"llx\0";
-pub const SCNxMAX: &[u8; 3usize] = b"jx\0";
 pub const __GNUC_VA_LIST: u32 = 1;
+pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8;
 pub const true_: u32 = 1;
 pub const false_: u32 = 0;
 pub const __bool_true_false_are_defined: u32 = 1;
+pub const __PRI_64_prefix: &[u8; 3] = b"ll\0";
+pub const PRId8: &[u8; 2] = b"d\0";
+pub const PRId16: &[u8; 2] = b"d\0";
+pub const PRId32: &[u8; 2] = b"d\0";
+pub const PRId64: &[u8; 4] = b"lld\0";
+pub const PRIdLEAST8: &[u8; 2] = b"d\0";
+pub const PRIdLEAST16: &[u8; 2] = b"d\0";
+pub const PRIdLEAST32: &[u8; 2] = b"d\0";
+pub const PRIdLEAST64: &[u8; 4] = b"lld\0";
+pub const PRIdFAST8: &[u8; 2] = b"d\0";
+pub const PRIdFAST64: &[u8; 4] = b"lld\0";
+pub const PRIdMAX: &[u8; 3] = b"jd\0";
+pub const PRIi8: &[u8; 2] = b"i\0";
+pub const PRIi16: &[u8; 2] = b"i\0";
+pub const PRIi32: &[u8; 2] = b"i\0";
+pub const PRIi64: &[u8; 4] = b"lli\0";
+pub const PRIiLEAST8: &[u8; 2] = b"i\0";
+pub const PRIiLEAST16: &[u8; 2] = b"i\0";
+pub const PRIiLEAST32: &[u8; 2] = b"i\0";
+pub const PRIiLEAST64: &[u8; 4] = b"lli\0";
+pub const PRIiFAST8: &[u8; 2] = b"i\0";
+pub const PRIiFAST64: &[u8; 4] = b"lli\0";
+pub const PRIiMAX: &[u8; 3] = b"ji\0";
+pub const PRIo8: &[u8; 2] = b"o\0";
+pub const PRIo16: &[u8; 2] = b"o\0";
+pub const PRIo32: &[u8; 2] = b"o\0";
+pub const PRIo64: &[u8; 4] = b"llo\0";
+pub const PRIoLEAST8: &[u8; 2] = b"o\0";
+pub const PRIoLEAST16: &[u8; 2] = b"o\0";
+pub const PRIoLEAST32: &[u8; 2] = b"o\0";
+pub const PRIoLEAST64: &[u8; 4] = b"llo\0";
+pub const PRIoFAST8: &[u8; 2] = b"o\0";
+pub const PRIoFAST64: &[u8; 4] = b"llo\0";
+pub const PRIoMAX: &[u8; 3] = b"jo\0";
+pub const PRIu8: &[u8; 2] = b"u\0";
+pub const PRIu16: &[u8; 2] = b"u\0";
+pub const PRIu32: &[u8; 2] = b"u\0";
+pub const PRIu64: &[u8; 4] = b"llu\0";
+pub const PRIuLEAST8: &[u8; 2] = b"u\0";
+pub const PRIuLEAST16: &[u8; 2] = b"u\0";
+pub const PRIuLEAST32: &[u8; 2] = b"u\0";
+pub const PRIuLEAST64: &[u8; 4] = b"llu\0";
+pub const PRIuFAST8: &[u8; 2] = b"u\0";
+pub const PRIuFAST64: &[u8; 4] = b"llu\0";
+pub const PRIuMAX: &[u8; 3] = b"ju\0";
+pub const PRIx8: &[u8; 2] = b"x\0";
+pub const PRIx16: &[u8; 2] = b"x\0";
+pub const PRIx32: &[u8; 2] = b"x\0";
+pub const PRIx64: &[u8; 4] = b"llx\0";
+pub const PRIxLEAST8: &[u8; 2] = b"x\0";
+pub const PRIxLEAST16: &[u8; 2] = b"x\0";
+pub const PRIxLEAST32: &[u8; 2] = b"x\0";
+pub const PRIxLEAST64: &[u8; 4] = b"llx\0";
+pub const PRIxFAST8: &[u8; 2] = b"x\0";
+pub const PRIxFAST64: &[u8; 4] = b"llx\0";
+pub const PRIxMAX: &[u8; 3] = b"jx\0";
+pub const PRIX8: &[u8; 2] = b"X\0";
+pub const PRIX16: &[u8; 2] = b"X\0";
+pub const PRIX32: &[u8; 2] = b"X\0";
+pub const PRIX64: &[u8; 4] = b"llX\0";
+pub const PRIXLEAST8: &[u8; 2] = b"X\0";
+pub const PRIXLEAST16: &[u8; 2] = b"X\0";
+pub const PRIXLEAST32: &[u8; 2] = b"X\0";
+pub const PRIXLEAST64: &[u8; 4] = b"llX\0";
+pub const PRIXFAST8: &[u8; 2] = b"X\0";
+pub const PRIXFAST64: &[u8; 4] = b"llX\0";
+pub const PRIXMAX: &[u8; 3] = b"jX\0";
+pub const SCNd8: &[u8; 4] = b"hhd\0";
+pub const SCNd16: &[u8; 3] = b"hd\0";
+pub const SCNd32: &[u8; 2] = b"d\0";
+pub const SCNd64: &[u8; 4] = b"lld\0";
+pub const SCNdLEAST8: &[u8; 4] = b"hhd\0";
+pub const SCNdLEAST16: &[u8; 3] = b"hd\0";
+pub const SCNdLEAST32: &[u8; 2] = b"d\0";
+pub const SCNdLEAST64: &[u8; 4] = b"lld\0";
+pub const SCNdFAST8: &[u8; 4] = b"hhd\0";
+pub const SCNdFAST64: &[u8; 4] = b"lld\0";
+pub const SCNdMAX: &[u8; 3] = b"jd\0";
+pub const SCNi8: &[u8; 4] = b"hhi\0";
+pub const SCNi16: &[u8; 3] = b"hi\0";
+pub const SCNi32: &[u8; 2] = b"i\0";
+pub const SCNi64: &[u8; 4] = b"lli\0";
+pub const SCNiLEAST8: &[u8; 4] = b"hhi\0";
+pub const SCNiLEAST16: &[u8; 3] = b"hi\0";
+pub const SCNiLEAST32: &[u8; 2] = b"i\0";
+pub const SCNiLEAST64: &[u8; 4] = b"lli\0";
+pub const SCNiFAST8: &[u8; 4] = b"hhi\0";
+pub const SCNiFAST64: &[u8; 4] = b"lli\0";
+pub const SCNiMAX: &[u8; 3] = b"ji\0";
+pub const SCNo8: &[u8; 4] = b"hho\0";
+pub const SCNo16: &[u8; 3] = b"ho\0";
+pub const SCNo32: &[u8; 2] = b"o\0";
+pub const SCNo64: &[u8; 4] = b"llo\0";
+pub const SCNoLEAST8: &[u8; 4] = b"hho\0";
+pub const SCNoLEAST16: &[u8; 3] = b"ho\0";
+pub const SCNoLEAST32: &[u8; 2] = b"o\0";
+pub const SCNoLEAST64: &[u8; 4] = b"llo\0";
+pub const SCNoFAST8: &[u8; 4] = b"hho\0";
+pub const SCNoFAST64: &[u8; 4] = b"llo\0";
+pub const SCNoMAX: &[u8; 3] = b"jo\0";
+pub const SCNu8: &[u8; 4] = b"hhu\0";
+pub const SCNu16: &[u8; 3] = b"hu\0";
+pub const SCNu32: &[u8; 2] = b"u\0";
+pub const SCNu64: &[u8; 4] = b"llu\0";
+pub const SCNuLEAST8: &[u8; 4] = b"hhu\0";
+pub const SCNuLEAST16: &[u8; 3] = b"hu\0";
+pub const SCNuLEAST32: &[u8; 2] = b"u\0";
+pub const SCNuLEAST64: &[u8; 4] = b"llu\0";
+pub const SCNuFAST8: &[u8; 4] = b"hhu\0";
+pub const SCNuFAST64: &[u8; 4] = b"llu\0";
+pub const SCNuMAX: &[u8; 3] = b"ju\0";
+pub const SCNx8: &[u8; 4] = b"hhx\0";
+pub const SCNx16: &[u8; 3] = b"hx\0";
+pub const SCNx32: &[u8; 2] = b"x\0";
+pub const SCNx64: &[u8; 4] = b"llx\0";
+pub const SCNxLEAST8: &[u8; 4] = b"hhx\0";
+pub const SCNxLEAST16: &[u8; 3] = b"hx\0";
+pub const SCNxLEAST32: &[u8; 2] = b"x\0";
+pub const SCNxLEAST64: &[u8; 4] = b"llx\0";
+pub const SCNxFAST8: &[u8; 4] = b"hhx\0";
+pub const SCNxFAST64: &[u8; 4] = b"llx\0";
+pub const SCNxMAX: &[u8; 3] = b"jx\0";
 pub const GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT: u32 = 48;
 pub const GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT: u32 = 8;
-pub const GAMEACTIVITY_MAX_NUM_HISTORICAL_IN_MOTION_EVENT: u32 = 8;
+pub const GAMETEXTINPUT_MAJOR_VERSION: u32 = 2;
+pub const GAMETEXTINPUT_MINOR_VERSION: u32 = 0;
+pub const GAMETEXTINPUT_BUGFIX_VERSION: u32 = 0;
+pub const GAMEACTIVITY_MAJOR_VERSION: u32 = 2;
+pub const GAMEACTIVITY_MINOR_VERSION: u32 = 0;
+pub const GAMEACTIVITY_BUGFIX_VERSION: u32 = 2;
 pub const POLLIN: u32 = 1;
 pub const POLLPRI: u32 = 2;
 pub const POLLOUT: u32 = 4;
@@ -495,19 +504,21 @@ pub const SIGSYS: u32 = 31;
 pub const SIGUNUSED: u32 = 31;
 pub const __SIGRTMIN: u32 = 32;
 pub const SIGSWI: u32 = 32;
+pub const SA_THIRTYTWO: u32 = 33554432;
+pub const SA_RESTORER: u32 = 67108864;
+pub const MINSIGSTKSZ: u32 = 2048;
+pub const SIGSTKSZ: u32 = 8192;
 pub const SA_NOCLDSTOP: u32 = 1;
 pub const SA_NOCLDWAIT: u32 = 2;
 pub const SA_SIGINFO: u32 = 4;
-pub const SA_THIRTYTWO: u32 = 33554432;
-pub const SA_RESTORER: u32 = 67108864;
+pub const SA_UNSUPPORTED: u32 = 1024;
+pub const SA_EXPOSE_TAGBITS: u32 = 2048;
 pub const SA_ONSTACK: u32 = 134217728;
 pub const SA_RESTART: u32 = 268435456;
 pub const SA_NODEFER: u32 = 1073741824;
 pub const SA_RESETHAND: u32 = 2147483648;
 pub const SA_NOMASK: u32 = 1073741824;
 pub const SA_ONESHOT: u32 = 2147483648;
-pub const MINSIGSTKSZ: u32 = 2048;
-pub const SIGSTKSZ: u32 = 8192;
 pub const SIG_BLOCK: u32 = 0;
 pub const SIG_UNBLOCK: u32 = 1;
 pub const SIG_SETMASK: u32 = 2;
@@ -557,7 +568,9 @@ pub const SEGV_PKUERR: u32 = 4;
 pub const SEGV_ACCADI: u32 = 5;
 pub const SEGV_ADIDERR: u32 = 6;
 pub const SEGV_ADIPERR: u32 = 7;
-pub const NSIGSEGV: u32 = 7;
+pub const SEGV_MTEAERR: u32 = 8;
+pub const SEGV_MTESERR: u32 = 9;
+pub const NSIGSEGV: u32 = 9;
 pub const BUS_ADRALN: u32 = 1;
 pub const BUS_ADRERR: u32 = 2;
 pub const BUS_OBJERR: u32 = 3;
@@ -569,7 +582,8 @@ pub const TRAP_TRACE: u32 = 2;
 pub const TRAP_BRANCH: u32 = 3;
 pub const TRAP_HWBKPT: u32 = 4;
 pub const TRAP_UNK: u32 = 5;
-pub const NSIGTRAP: u32 = 5;
+pub const TRAP_PERF: u32 = 6;
+pub const NSIGTRAP: u32 = 6;
 pub const CLD_EXITED: u32 = 1;
 pub const CLD_KILLED: u32 = 2;
 pub const CLD_DUMPED: u32 = 3;
@@ -585,7 +599,8 @@ pub const POLL_PRI: u32 = 5;
 pub const POLL_HUP: u32 = 6;
 pub const NSIGPOLL: u32 = 6;
 pub const SYS_SECCOMP: u32 = 1;
-pub const NSIGSYS: u32 = 1;
+pub const SYS_USER_DISPATCH: u32 = 2;
+pub const NSIGSYS: u32 = 2;
 pub const EMT_TAGOVF: u32 = 1;
 pub const NSIGEMT: u32 = 1;
 pub const SIGEV_SIGNAL: u32 = 0;
@@ -650,6 +665,12 @@ pub const CLONE_NEWUSER: u32 = 268435456;
 pub const CLONE_NEWPID: u32 = 536870912;
 pub const CLONE_NEWNET: u32 = 1073741824;
 pub const CLONE_IO: u32 = 2147483648;
+pub const CLONE_CLEAR_SIGHAND: u64 = 4294967296;
+pub const CLONE_INTO_CGROUP: u64 = 8589934592;
+pub const CLONE_NEWTIME: u32 = 128;
+pub const CLONE_ARGS_SIZE_VER0: u32 = 64;
+pub const CLONE_ARGS_SIZE_VER1: u32 = 80;
+pub const CLONE_ARGS_SIZE_VER2: u32 = 88;
 pub const SCHED_NORMAL: u32 = 0;
 pub const SCHED_FIFO: u32 = 1;
 pub const SCHED_RR: u32 = 2;
@@ -681,9 +702,6 @@ pub const PTHREAD_PROCESS_PRIVATE: u32 = 0;
 pub const PTHREAD_PROCESS_SHARED: u32 = 1;
 pub const PTHREAD_SCOPE_SYSTEM: u32 = 0;
 pub const PTHREAD_SCOPE_PROCESS: u32 = 1;
-pub const NATIVE_APP_GLUE_MAX_NUM_MOTION_EVENTS: u32 = 16;
-pub const NATIVE_APP_GLUE_MAX_HISTORICAL_POINTER_SAMPLES: u32 = 64;
-pub const NATIVE_APP_GLUE_MAX_NUM_KEY_EVENTS: u32 = 4;
 pub const NATIVE_APP_GLUE_MAX_INPUT_BUFFERS: u32 = 2;
 extern "C" {
     pub fn android_get_application_target_sdk_version() -> ::std::os::raw::c_int;
@@ -700,6 +718,8 @@ pub struct max_align_t {
 }
 #[test]
 fn bindgen_test_layout_max_align_t() {
+    const UNINIT: ::std::mem::MaybeUninit<max_align_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<max_align_t>(),
         16usize,
@@ -711,9 +731,7 @@ fn bindgen_test_layout_max_align_t() {
         concat!("Alignment of ", stringify!(max_align_t))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<max_align_t>())).__clang_max_align_nonce1 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce1) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -723,9 +741,7 @@ fn bindgen_test_layout_max_align_t() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<max_align_t>())).__clang_max_align_nonce2 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce2) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -778,6 +794,8 @@ pub struct __kernel_fd_set {
 }
 #[test]
 fn bindgen_test_layout___kernel_fd_set() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_fd_set> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_fd_set>(),
         128usize,
@@ -789,7 +807,7 @@ fn bindgen_test_layout___kernel_fd_set() {
         concat!("Alignment of ", stringify!(__kernel_fd_set))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_fd_set>())).fds_bits as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -828,6 +846,8 @@ pub struct __kernel_fsid_t {
 }
 #[test]
 fn bindgen_test_layout___kernel_fsid_t() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_fsid_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_fsid_t>(),
         8usize,
@@ -839,7 +859,7 @@ fn bindgen_test_layout___kernel_fsid_t() {
         concat!("Alignment of ", stringify!(__kernel_fsid_t))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_fsid_t>())).val as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).val) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -851,6 +871,7 @@ fn bindgen_test_layout___kernel_fsid_t() {
 }
 pub type __kernel_off_t = __kernel_long_t;
 pub type __kernel_loff_t = ::std::os::raw::c_longlong;
+pub type __kernel_old_time_t = __kernel_long_t;
 pub type __kernel_time_t = __kernel_long_t;
 pub type __kernel_time64_t = ::std::os::raw::c_longlong;
 pub type __kernel_clock_t = __kernel_long_t;
@@ -909,7 +930,6 @@ pub type off64_t = loff_t;
 pub type __socklen_t = i32;
 pub type socklen_t = __socklen_t;
 pub type __va_list = u32;
-pub type ssize_t = __kernel_ssize_t;
 pub type uint_t = ::std::os::raw::c_uint;
 pub type uint = ::std::os::raw::c_uint;
 pub type u_char = ::std::os::raw::c_uchar;
@@ -920,483 +940,651 @@ pub type u_int32_t = u32;
 pub type u_int16_t = u16;
 pub type u_int8_t = u8;
 pub type u_int64_t = u64;
-pub const AASSET_MODE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AASSET_MODE_RANDOM: ::std::os::raw::c_uint = 1;
-pub const AASSET_MODE_STREAMING: ::std::os::raw::c_uint = 2;
-pub const AASSET_MODE_BUFFER: ::std::os::raw::c_uint = 3;
+pub const AASSET_MODE_UNKNOWN: _bindgen_ty_1 = 0;
+pub const AASSET_MODE_RANDOM: _bindgen_ty_1 = 1;
+pub const AASSET_MODE_STREAMING: _bindgen_ty_1 = 2;
+pub const AASSET_MODE_BUFFER: _bindgen_ty_1 = 3;
 pub type _bindgen_ty_1 = ::std::os::raw::c_uint;
-pub const AKEYCODE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AKEYCODE_SOFT_LEFT: ::std::os::raw::c_uint = 1;
-pub const AKEYCODE_SOFT_RIGHT: ::std::os::raw::c_uint = 2;
-pub const AKEYCODE_HOME: ::std::os::raw::c_uint = 3;
-pub const AKEYCODE_BACK: ::std::os::raw::c_uint = 4;
-pub const AKEYCODE_CALL: ::std::os::raw::c_uint = 5;
-pub const AKEYCODE_ENDCALL: ::std::os::raw::c_uint = 6;
-pub const AKEYCODE_0: ::std::os::raw::c_uint = 7;
-pub const AKEYCODE_1: ::std::os::raw::c_uint = 8;
-pub const AKEYCODE_2: ::std::os::raw::c_uint = 9;
-pub const AKEYCODE_3: ::std::os::raw::c_uint = 10;
-pub const AKEYCODE_4: ::std::os::raw::c_uint = 11;
-pub const AKEYCODE_5: ::std::os::raw::c_uint = 12;
-pub const AKEYCODE_6: ::std::os::raw::c_uint = 13;
-pub const AKEYCODE_7: ::std::os::raw::c_uint = 14;
-pub const AKEYCODE_8: ::std::os::raw::c_uint = 15;
-pub const AKEYCODE_9: ::std::os::raw::c_uint = 16;
-pub const AKEYCODE_STAR: ::std::os::raw::c_uint = 17;
-pub const AKEYCODE_POUND: ::std::os::raw::c_uint = 18;
-pub const AKEYCODE_DPAD_UP: ::std::os::raw::c_uint = 19;
-pub const AKEYCODE_DPAD_DOWN: ::std::os::raw::c_uint = 20;
-pub const AKEYCODE_DPAD_LEFT: ::std::os::raw::c_uint = 21;
-pub const AKEYCODE_DPAD_RIGHT: ::std::os::raw::c_uint = 22;
-pub const AKEYCODE_DPAD_CENTER: ::std::os::raw::c_uint = 23;
-pub const AKEYCODE_VOLUME_UP: ::std::os::raw::c_uint = 24;
-pub const AKEYCODE_VOLUME_DOWN: ::std::os::raw::c_uint = 25;
-pub const AKEYCODE_POWER: ::std::os::raw::c_uint = 26;
-pub const AKEYCODE_CAMERA: ::std::os::raw::c_uint = 27;
-pub const AKEYCODE_CLEAR: ::std::os::raw::c_uint = 28;
-pub const AKEYCODE_A: ::std::os::raw::c_uint = 29;
-pub const AKEYCODE_B: ::std::os::raw::c_uint = 30;
-pub const AKEYCODE_C: ::std::os::raw::c_uint = 31;
-pub const AKEYCODE_D: ::std::os::raw::c_uint = 32;
-pub const AKEYCODE_E: ::std::os::raw::c_uint = 33;
-pub const AKEYCODE_F: ::std::os::raw::c_uint = 34;
-pub const AKEYCODE_G: ::std::os::raw::c_uint = 35;
-pub const AKEYCODE_H: ::std::os::raw::c_uint = 36;
-pub const AKEYCODE_I: ::std::os::raw::c_uint = 37;
-pub const AKEYCODE_J: ::std::os::raw::c_uint = 38;
-pub const AKEYCODE_K: ::std::os::raw::c_uint = 39;
-pub const AKEYCODE_L: ::std::os::raw::c_uint = 40;
-pub const AKEYCODE_M: ::std::os::raw::c_uint = 41;
-pub const AKEYCODE_N: ::std::os::raw::c_uint = 42;
-pub const AKEYCODE_O: ::std::os::raw::c_uint = 43;
-pub const AKEYCODE_P: ::std::os::raw::c_uint = 44;
-pub const AKEYCODE_Q: ::std::os::raw::c_uint = 45;
-pub const AKEYCODE_R: ::std::os::raw::c_uint = 46;
-pub const AKEYCODE_S: ::std::os::raw::c_uint = 47;
-pub const AKEYCODE_T: ::std::os::raw::c_uint = 48;
-pub const AKEYCODE_U: ::std::os::raw::c_uint = 49;
-pub const AKEYCODE_V: ::std::os::raw::c_uint = 50;
-pub const AKEYCODE_W: ::std::os::raw::c_uint = 51;
-pub const AKEYCODE_X: ::std::os::raw::c_uint = 52;
-pub const AKEYCODE_Y: ::std::os::raw::c_uint = 53;
-pub const AKEYCODE_Z: ::std::os::raw::c_uint = 54;
-pub const AKEYCODE_COMMA: ::std::os::raw::c_uint = 55;
-pub const AKEYCODE_PERIOD: ::std::os::raw::c_uint = 56;
-pub const AKEYCODE_ALT_LEFT: ::std::os::raw::c_uint = 57;
-pub const AKEYCODE_ALT_RIGHT: ::std::os::raw::c_uint = 58;
-pub const AKEYCODE_SHIFT_LEFT: ::std::os::raw::c_uint = 59;
-pub const AKEYCODE_SHIFT_RIGHT: ::std::os::raw::c_uint = 60;
-pub const AKEYCODE_TAB: ::std::os::raw::c_uint = 61;
-pub const AKEYCODE_SPACE: ::std::os::raw::c_uint = 62;
-pub const AKEYCODE_SYM: ::std::os::raw::c_uint = 63;
-pub const AKEYCODE_EXPLORER: ::std::os::raw::c_uint = 64;
-pub const AKEYCODE_ENVELOPE: ::std::os::raw::c_uint = 65;
-pub const AKEYCODE_ENTER: ::std::os::raw::c_uint = 66;
-pub const AKEYCODE_DEL: ::std::os::raw::c_uint = 67;
-pub const AKEYCODE_GRAVE: ::std::os::raw::c_uint = 68;
-pub const AKEYCODE_MINUS: ::std::os::raw::c_uint = 69;
-pub const AKEYCODE_EQUALS: ::std::os::raw::c_uint = 70;
-pub const AKEYCODE_LEFT_BRACKET: ::std::os::raw::c_uint = 71;
-pub const AKEYCODE_RIGHT_BRACKET: ::std::os::raw::c_uint = 72;
-pub const AKEYCODE_BACKSLASH: ::std::os::raw::c_uint = 73;
-pub const AKEYCODE_SEMICOLON: ::std::os::raw::c_uint = 74;
-pub const AKEYCODE_APOSTROPHE: ::std::os::raw::c_uint = 75;
-pub const AKEYCODE_SLASH: ::std::os::raw::c_uint = 76;
-pub const AKEYCODE_AT: ::std::os::raw::c_uint = 77;
-pub const AKEYCODE_NUM: ::std::os::raw::c_uint = 78;
-pub const AKEYCODE_HEADSETHOOK: ::std::os::raw::c_uint = 79;
-pub const AKEYCODE_FOCUS: ::std::os::raw::c_uint = 80;
-pub const AKEYCODE_PLUS: ::std::os::raw::c_uint = 81;
-pub const AKEYCODE_MENU: ::std::os::raw::c_uint = 82;
-pub const AKEYCODE_NOTIFICATION: ::std::os::raw::c_uint = 83;
-pub const AKEYCODE_SEARCH: ::std::os::raw::c_uint = 84;
-pub const AKEYCODE_MEDIA_PLAY_PAUSE: ::std::os::raw::c_uint = 85;
-pub const AKEYCODE_MEDIA_STOP: ::std::os::raw::c_uint = 86;
-pub const AKEYCODE_MEDIA_NEXT: ::std::os::raw::c_uint = 87;
-pub const AKEYCODE_MEDIA_PREVIOUS: ::std::os::raw::c_uint = 88;
-pub const AKEYCODE_MEDIA_REWIND: ::std::os::raw::c_uint = 89;
-pub const AKEYCODE_MEDIA_FAST_FORWARD: ::std::os::raw::c_uint = 90;
-pub const AKEYCODE_MUTE: ::std::os::raw::c_uint = 91;
-pub const AKEYCODE_PAGE_UP: ::std::os::raw::c_uint = 92;
-pub const AKEYCODE_PAGE_DOWN: ::std::os::raw::c_uint = 93;
-pub const AKEYCODE_PICTSYMBOLS: ::std::os::raw::c_uint = 94;
-pub const AKEYCODE_SWITCH_CHARSET: ::std::os::raw::c_uint = 95;
-pub const AKEYCODE_BUTTON_A: ::std::os::raw::c_uint = 96;
-pub const AKEYCODE_BUTTON_B: ::std::os::raw::c_uint = 97;
-pub const AKEYCODE_BUTTON_C: ::std::os::raw::c_uint = 98;
-pub const AKEYCODE_BUTTON_X: ::std::os::raw::c_uint = 99;
-pub const AKEYCODE_BUTTON_Y: ::std::os::raw::c_uint = 100;
-pub const AKEYCODE_BUTTON_Z: ::std::os::raw::c_uint = 101;
-pub const AKEYCODE_BUTTON_L1: ::std::os::raw::c_uint = 102;
-pub const AKEYCODE_BUTTON_R1: ::std::os::raw::c_uint = 103;
-pub const AKEYCODE_BUTTON_L2: ::std::os::raw::c_uint = 104;
-pub const AKEYCODE_BUTTON_R2: ::std::os::raw::c_uint = 105;
-pub const AKEYCODE_BUTTON_THUMBL: ::std::os::raw::c_uint = 106;
-pub const AKEYCODE_BUTTON_THUMBR: ::std::os::raw::c_uint = 107;
-pub const AKEYCODE_BUTTON_START: ::std::os::raw::c_uint = 108;
-pub const AKEYCODE_BUTTON_SELECT: ::std::os::raw::c_uint = 109;
-pub const AKEYCODE_BUTTON_MODE: ::std::os::raw::c_uint = 110;
-pub const AKEYCODE_ESCAPE: ::std::os::raw::c_uint = 111;
-pub const AKEYCODE_FORWARD_DEL: ::std::os::raw::c_uint = 112;
-pub const AKEYCODE_CTRL_LEFT: ::std::os::raw::c_uint = 113;
-pub const AKEYCODE_CTRL_RIGHT: ::std::os::raw::c_uint = 114;
-pub const AKEYCODE_CAPS_LOCK: ::std::os::raw::c_uint = 115;
-pub const AKEYCODE_SCROLL_LOCK: ::std::os::raw::c_uint = 116;
-pub const AKEYCODE_META_LEFT: ::std::os::raw::c_uint = 117;
-pub const AKEYCODE_META_RIGHT: ::std::os::raw::c_uint = 118;
-pub const AKEYCODE_FUNCTION: ::std::os::raw::c_uint = 119;
-pub const AKEYCODE_SYSRQ: ::std::os::raw::c_uint = 120;
-pub const AKEYCODE_BREAK: ::std::os::raw::c_uint = 121;
-pub const AKEYCODE_MOVE_HOME: ::std::os::raw::c_uint = 122;
-pub const AKEYCODE_MOVE_END: ::std::os::raw::c_uint = 123;
-pub const AKEYCODE_INSERT: ::std::os::raw::c_uint = 124;
-pub const AKEYCODE_FORWARD: ::std::os::raw::c_uint = 125;
-pub const AKEYCODE_MEDIA_PLAY: ::std::os::raw::c_uint = 126;
-pub const AKEYCODE_MEDIA_PAUSE: ::std::os::raw::c_uint = 127;
-pub const AKEYCODE_MEDIA_CLOSE: ::std::os::raw::c_uint = 128;
-pub const AKEYCODE_MEDIA_EJECT: ::std::os::raw::c_uint = 129;
-pub const AKEYCODE_MEDIA_RECORD: ::std::os::raw::c_uint = 130;
-pub const AKEYCODE_F1: ::std::os::raw::c_uint = 131;
-pub const AKEYCODE_F2: ::std::os::raw::c_uint = 132;
-pub const AKEYCODE_F3: ::std::os::raw::c_uint = 133;
-pub const AKEYCODE_F4: ::std::os::raw::c_uint = 134;
-pub const AKEYCODE_F5: ::std::os::raw::c_uint = 135;
-pub const AKEYCODE_F6: ::std::os::raw::c_uint = 136;
-pub const AKEYCODE_F7: ::std::os::raw::c_uint = 137;
-pub const AKEYCODE_F8: ::std::os::raw::c_uint = 138;
-pub const AKEYCODE_F9: ::std::os::raw::c_uint = 139;
-pub const AKEYCODE_F10: ::std::os::raw::c_uint = 140;
-pub const AKEYCODE_F11: ::std::os::raw::c_uint = 141;
-pub const AKEYCODE_F12: ::std::os::raw::c_uint = 142;
-pub const AKEYCODE_NUM_LOCK: ::std::os::raw::c_uint = 143;
-pub const AKEYCODE_NUMPAD_0: ::std::os::raw::c_uint = 144;
-pub const AKEYCODE_NUMPAD_1: ::std::os::raw::c_uint = 145;
-pub const AKEYCODE_NUMPAD_2: ::std::os::raw::c_uint = 146;
-pub const AKEYCODE_NUMPAD_3: ::std::os::raw::c_uint = 147;
-pub const AKEYCODE_NUMPAD_4: ::std::os::raw::c_uint = 148;
-pub const AKEYCODE_NUMPAD_5: ::std::os::raw::c_uint = 149;
-pub const AKEYCODE_NUMPAD_6: ::std::os::raw::c_uint = 150;
-pub const AKEYCODE_NUMPAD_7: ::std::os::raw::c_uint = 151;
-pub const AKEYCODE_NUMPAD_8: ::std::os::raw::c_uint = 152;
-pub const AKEYCODE_NUMPAD_9: ::std::os::raw::c_uint = 153;
-pub const AKEYCODE_NUMPAD_DIVIDE: ::std::os::raw::c_uint = 154;
-pub const AKEYCODE_NUMPAD_MULTIPLY: ::std::os::raw::c_uint = 155;
-pub const AKEYCODE_NUMPAD_SUBTRACT: ::std::os::raw::c_uint = 156;
-pub const AKEYCODE_NUMPAD_ADD: ::std::os::raw::c_uint = 157;
-pub const AKEYCODE_NUMPAD_DOT: ::std::os::raw::c_uint = 158;
-pub const AKEYCODE_NUMPAD_COMMA: ::std::os::raw::c_uint = 159;
-pub const AKEYCODE_NUMPAD_ENTER: ::std::os::raw::c_uint = 160;
-pub const AKEYCODE_NUMPAD_EQUALS: ::std::os::raw::c_uint = 161;
-pub const AKEYCODE_NUMPAD_LEFT_PAREN: ::std::os::raw::c_uint = 162;
-pub const AKEYCODE_NUMPAD_RIGHT_PAREN: ::std::os::raw::c_uint = 163;
-pub const AKEYCODE_VOLUME_MUTE: ::std::os::raw::c_uint = 164;
-pub const AKEYCODE_INFO: ::std::os::raw::c_uint = 165;
-pub const AKEYCODE_CHANNEL_UP: ::std::os::raw::c_uint = 166;
-pub const AKEYCODE_CHANNEL_DOWN: ::std::os::raw::c_uint = 167;
-pub const AKEYCODE_ZOOM_IN: ::std::os::raw::c_uint = 168;
-pub const AKEYCODE_ZOOM_OUT: ::std::os::raw::c_uint = 169;
-pub const AKEYCODE_TV: ::std::os::raw::c_uint = 170;
-pub const AKEYCODE_WINDOW: ::std::os::raw::c_uint = 171;
-pub const AKEYCODE_GUIDE: ::std::os::raw::c_uint = 172;
-pub const AKEYCODE_DVR: ::std::os::raw::c_uint = 173;
-pub const AKEYCODE_BOOKMARK: ::std::os::raw::c_uint = 174;
-pub const AKEYCODE_CAPTIONS: ::std::os::raw::c_uint = 175;
-pub const AKEYCODE_SETTINGS: ::std::os::raw::c_uint = 176;
-pub const AKEYCODE_TV_POWER: ::std::os::raw::c_uint = 177;
-pub const AKEYCODE_TV_INPUT: ::std::os::raw::c_uint = 178;
-pub const AKEYCODE_STB_POWER: ::std::os::raw::c_uint = 179;
-pub const AKEYCODE_STB_INPUT: ::std::os::raw::c_uint = 180;
-pub const AKEYCODE_AVR_POWER: ::std::os::raw::c_uint = 181;
-pub const AKEYCODE_AVR_INPUT: ::std::os::raw::c_uint = 182;
-pub const AKEYCODE_PROG_RED: ::std::os::raw::c_uint = 183;
-pub const AKEYCODE_PROG_GREEN: ::std::os::raw::c_uint = 184;
-pub const AKEYCODE_PROG_YELLOW: ::std::os::raw::c_uint = 185;
-pub const AKEYCODE_PROG_BLUE: ::std::os::raw::c_uint = 186;
-pub const AKEYCODE_APP_SWITCH: ::std::os::raw::c_uint = 187;
-pub const AKEYCODE_BUTTON_1: ::std::os::raw::c_uint = 188;
-pub const AKEYCODE_BUTTON_2: ::std::os::raw::c_uint = 189;
-pub const AKEYCODE_BUTTON_3: ::std::os::raw::c_uint = 190;
-pub const AKEYCODE_BUTTON_4: ::std::os::raw::c_uint = 191;
-pub const AKEYCODE_BUTTON_5: ::std::os::raw::c_uint = 192;
-pub const AKEYCODE_BUTTON_6: ::std::os::raw::c_uint = 193;
-pub const AKEYCODE_BUTTON_7: ::std::os::raw::c_uint = 194;
-pub const AKEYCODE_BUTTON_8: ::std::os::raw::c_uint = 195;
-pub const AKEYCODE_BUTTON_9: ::std::os::raw::c_uint = 196;
-pub const AKEYCODE_BUTTON_10: ::std::os::raw::c_uint = 197;
-pub const AKEYCODE_BUTTON_11: ::std::os::raw::c_uint = 198;
-pub const AKEYCODE_BUTTON_12: ::std::os::raw::c_uint = 199;
-pub const AKEYCODE_BUTTON_13: ::std::os::raw::c_uint = 200;
-pub const AKEYCODE_BUTTON_14: ::std::os::raw::c_uint = 201;
-pub const AKEYCODE_BUTTON_15: ::std::os::raw::c_uint = 202;
-pub const AKEYCODE_BUTTON_16: ::std::os::raw::c_uint = 203;
-pub const AKEYCODE_LANGUAGE_SWITCH: ::std::os::raw::c_uint = 204;
-pub const AKEYCODE_MANNER_MODE: ::std::os::raw::c_uint = 205;
-pub const AKEYCODE_3D_MODE: ::std::os::raw::c_uint = 206;
-pub const AKEYCODE_CONTACTS: ::std::os::raw::c_uint = 207;
-pub const AKEYCODE_CALENDAR: ::std::os::raw::c_uint = 208;
-pub const AKEYCODE_MUSIC: ::std::os::raw::c_uint = 209;
-pub const AKEYCODE_CALCULATOR: ::std::os::raw::c_uint = 210;
-pub const AKEYCODE_ZENKAKU_HANKAKU: ::std::os::raw::c_uint = 211;
-pub const AKEYCODE_EISU: ::std::os::raw::c_uint = 212;
-pub const AKEYCODE_MUHENKAN: ::std::os::raw::c_uint = 213;
-pub const AKEYCODE_HENKAN: ::std::os::raw::c_uint = 214;
-pub const AKEYCODE_KATAKANA_HIRAGANA: ::std::os::raw::c_uint = 215;
-pub const AKEYCODE_YEN: ::std::os::raw::c_uint = 216;
-pub const AKEYCODE_RO: ::std::os::raw::c_uint = 217;
-pub const AKEYCODE_KANA: ::std::os::raw::c_uint = 218;
-pub const AKEYCODE_ASSIST: ::std::os::raw::c_uint = 219;
-pub const AKEYCODE_BRIGHTNESS_DOWN: ::std::os::raw::c_uint = 220;
-pub const AKEYCODE_BRIGHTNESS_UP: ::std::os::raw::c_uint = 221;
-pub const AKEYCODE_MEDIA_AUDIO_TRACK: ::std::os::raw::c_uint = 222;
-pub const AKEYCODE_SLEEP: ::std::os::raw::c_uint = 223;
-pub const AKEYCODE_WAKEUP: ::std::os::raw::c_uint = 224;
-pub const AKEYCODE_PAIRING: ::std::os::raw::c_uint = 225;
-pub const AKEYCODE_MEDIA_TOP_MENU: ::std::os::raw::c_uint = 226;
-pub const AKEYCODE_11: ::std::os::raw::c_uint = 227;
-pub const AKEYCODE_12: ::std::os::raw::c_uint = 228;
-pub const AKEYCODE_LAST_CHANNEL: ::std::os::raw::c_uint = 229;
-pub const AKEYCODE_TV_DATA_SERVICE: ::std::os::raw::c_uint = 230;
-pub const AKEYCODE_VOICE_ASSIST: ::std::os::raw::c_uint = 231;
-pub const AKEYCODE_TV_RADIO_SERVICE: ::std::os::raw::c_uint = 232;
-pub const AKEYCODE_TV_TELETEXT: ::std::os::raw::c_uint = 233;
-pub const AKEYCODE_TV_NUMBER_ENTRY: ::std::os::raw::c_uint = 234;
-pub const AKEYCODE_TV_TERRESTRIAL_ANALOG: ::std::os::raw::c_uint = 235;
-pub const AKEYCODE_TV_TERRESTRIAL_DIGITAL: ::std::os::raw::c_uint = 236;
-pub const AKEYCODE_TV_SATELLITE: ::std::os::raw::c_uint = 237;
-pub const AKEYCODE_TV_SATELLITE_BS: ::std::os::raw::c_uint = 238;
-pub const AKEYCODE_TV_SATELLITE_CS: ::std::os::raw::c_uint = 239;
-pub const AKEYCODE_TV_SATELLITE_SERVICE: ::std::os::raw::c_uint = 240;
-pub const AKEYCODE_TV_NETWORK: ::std::os::raw::c_uint = 241;
-pub const AKEYCODE_TV_ANTENNA_CABLE: ::std::os::raw::c_uint = 242;
-pub const AKEYCODE_TV_INPUT_HDMI_1: ::std::os::raw::c_uint = 243;
-pub const AKEYCODE_TV_INPUT_HDMI_2: ::std::os::raw::c_uint = 244;
-pub const AKEYCODE_TV_INPUT_HDMI_3: ::std::os::raw::c_uint = 245;
-pub const AKEYCODE_TV_INPUT_HDMI_4: ::std::os::raw::c_uint = 246;
-pub const AKEYCODE_TV_INPUT_COMPOSITE_1: ::std::os::raw::c_uint = 247;
-pub const AKEYCODE_TV_INPUT_COMPOSITE_2: ::std::os::raw::c_uint = 248;
-pub const AKEYCODE_TV_INPUT_COMPONENT_1: ::std::os::raw::c_uint = 249;
-pub const AKEYCODE_TV_INPUT_COMPONENT_2: ::std::os::raw::c_uint = 250;
-pub const AKEYCODE_TV_INPUT_VGA_1: ::std::os::raw::c_uint = 251;
-pub const AKEYCODE_TV_AUDIO_DESCRIPTION: ::std::os::raw::c_uint = 252;
-pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP: ::std::os::raw::c_uint = 253;
-pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN: ::std::os::raw::c_uint = 254;
-pub const AKEYCODE_TV_ZOOM_MODE: ::std::os::raw::c_uint = 255;
-pub const AKEYCODE_TV_CONTENTS_MENU: ::std::os::raw::c_uint = 256;
-pub const AKEYCODE_TV_MEDIA_CONTEXT_MENU: ::std::os::raw::c_uint = 257;
-pub const AKEYCODE_TV_TIMER_PROGRAMMING: ::std::os::raw::c_uint = 258;
-pub const AKEYCODE_HELP: ::std::os::raw::c_uint = 259;
-pub const AKEYCODE_NAVIGATE_PREVIOUS: ::std::os::raw::c_uint = 260;
-pub const AKEYCODE_NAVIGATE_NEXT: ::std::os::raw::c_uint = 261;
-pub const AKEYCODE_NAVIGATE_IN: ::std::os::raw::c_uint = 262;
-pub const AKEYCODE_NAVIGATE_OUT: ::std::os::raw::c_uint = 263;
-pub const AKEYCODE_STEM_PRIMARY: ::std::os::raw::c_uint = 264;
-pub const AKEYCODE_STEM_1: ::std::os::raw::c_uint = 265;
-pub const AKEYCODE_STEM_2: ::std::os::raw::c_uint = 266;
-pub const AKEYCODE_STEM_3: ::std::os::raw::c_uint = 267;
-pub const AKEYCODE_DPAD_UP_LEFT: ::std::os::raw::c_uint = 268;
-pub const AKEYCODE_DPAD_DOWN_LEFT: ::std::os::raw::c_uint = 269;
-pub const AKEYCODE_DPAD_UP_RIGHT: ::std::os::raw::c_uint = 270;
-pub const AKEYCODE_DPAD_DOWN_RIGHT: ::std::os::raw::c_uint = 271;
-pub const AKEYCODE_MEDIA_SKIP_FORWARD: ::std::os::raw::c_uint = 272;
-pub const AKEYCODE_MEDIA_SKIP_BACKWARD: ::std::os::raw::c_uint = 273;
-pub const AKEYCODE_MEDIA_STEP_FORWARD: ::std::os::raw::c_uint = 274;
-pub const AKEYCODE_MEDIA_STEP_BACKWARD: ::std::os::raw::c_uint = 275;
-pub const AKEYCODE_SOFT_SLEEP: ::std::os::raw::c_uint = 276;
-pub const AKEYCODE_CUT: ::std::os::raw::c_uint = 277;
-pub const AKEYCODE_COPY: ::std::os::raw::c_uint = 278;
-pub const AKEYCODE_PASTE: ::std::os::raw::c_uint = 279;
-pub const AKEYCODE_SYSTEM_NAVIGATION_UP: ::std::os::raw::c_uint = 280;
-pub const AKEYCODE_SYSTEM_NAVIGATION_DOWN: ::std::os::raw::c_uint = 281;
-pub const AKEYCODE_SYSTEM_NAVIGATION_LEFT: ::std::os::raw::c_uint = 282;
-pub const AKEYCODE_SYSTEM_NAVIGATION_RIGHT: ::std::os::raw::c_uint = 283;
-pub const AKEYCODE_ALL_APPS: ::std::os::raw::c_uint = 284;
-pub const AKEYCODE_REFRESH: ::std::os::raw::c_uint = 285;
-pub const AKEYCODE_THUMBS_UP: ::std::os::raw::c_uint = 286;
-pub const AKEYCODE_THUMBS_DOWN: ::std::os::raw::c_uint = 287;
-pub const AKEYCODE_PROFILE_SWITCH: ::std::os::raw::c_uint = 288;
+pub const AKEYCODE_UNKNOWN: _bindgen_ty_2 = 0;
+pub const AKEYCODE_SOFT_LEFT: _bindgen_ty_2 = 1;
+pub const AKEYCODE_SOFT_RIGHT: _bindgen_ty_2 = 2;
+pub const AKEYCODE_HOME: _bindgen_ty_2 = 3;
+pub const AKEYCODE_BACK: _bindgen_ty_2 = 4;
+pub const AKEYCODE_CALL: _bindgen_ty_2 = 5;
+pub const AKEYCODE_ENDCALL: _bindgen_ty_2 = 6;
+pub const AKEYCODE_0: _bindgen_ty_2 = 7;
+pub const AKEYCODE_1: _bindgen_ty_2 = 8;
+pub const AKEYCODE_2: _bindgen_ty_2 = 9;
+pub const AKEYCODE_3: _bindgen_ty_2 = 10;
+pub const AKEYCODE_4: _bindgen_ty_2 = 11;
+pub const AKEYCODE_5: _bindgen_ty_2 = 12;
+pub const AKEYCODE_6: _bindgen_ty_2 = 13;
+pub const AKEYCODE_7: _bindgen_ty_2 = 14;
+pub const AKEYCODE_8: _bindgen_ty_2 = 15;
+pub const AKEYCODE_9: _bindgen_ty_2 = 16;
+pub const AKEYCODE_STAR: _bindgen_ty_2 = 17;
+pub const AKEYCODE_POUND: _bindgen_ty_2 = 18;
+pub const AKEYCODE_DPAD_UP: _bindgen_ty_2 = 19;
+pub const AKEYCODE_DPAD_DOWN: _bindgen_ty_2 = 20;
+pub const AKEYCODE_DPAD_LEFT: _bindgen_ty_2 = 21;
+pub const AKEYCODE_DPAD_RIGHT: _bindgen_ty_2 = 22;
+pub const AKEYCODE_DPAD_CENTER: _bindgen_ty_2 = 23;
+pub const AKEYCODE_VOLUME_UP: _bindgen_ty_2 = 24;
+pub const AKEYCODE_VOLUME_DOWN: _bindgen_ty_2 = 25;
+pub const AKEYCODE_POWER: _bindgen_ty_2 = 26;
+pub const AKEYCODE_CAMERA: _bindgen_ty_2 = 27;
+pub const AKEYCODE_CLEAR: _bindgen_ty_2 = 28;
+pub const AKEYCODE_A: _bindgen_ty_2 = 29;
+pub const AKEYCODE_B: _bindgen_ty_2 = 30;
+pub const AKEYCODE_C: _bindgen_ty_2 = 31;
+pub const AKEYCODE_D: _bindgen_ty_2 = 32;
+pub const AKEYCODE_E: _bindgen_ty_2 = 33;
+pub const AKEYCODE_F: _bindgen_ty_2 = 34;
+pub const AKEYCODE_G: _bindgen_ty_2 = 35;
+pub const AKEYCODE_H: _bindgen_ty_2 = 36;
+pub const AKEYCODE_I: _bindgen_ty_2 = 37;
+pub const AKEYCODE_J: _bindgen_ty_2 = 38;
+pub const AKEYCODE_K: _bindgen_ty_2 = 39;
+pub const AKEYCODE_L: _bindgen_ty_2 = 40;
+pub const AKEYCODE_M: _bindgen_ty_2 = 41;
+pub const AKEYCODE_N: _bindgen_ty_2 = 42;
+pub const AKEYCODE_O: _bindgen_ty_2 = 43;
+pub const AKEYCODE_P: _bindgen_ty_2 = 44;
+pub const AKEYCODE_Q: _bindgen_ty_2 = 45;
+pub const AKEYCODE_R: _bindgen_ty_2 = 46;
+pub const AKEYCODE_S: _bindgen_ty_2 = 47;
+pub const AKEYCODE_T: _bindgen_ty_2 = 48;
+pub const AKEYCODE_U: _bindgen_ty_2 = 49;
+pub const AKEYCODE_V: _bindgen_ty_2 = 50;
+pub const AKEYCODE_W: _bindgen_ty_2 = 51;
+pub const AKEYCODE_X: _bindgen_ty_2 = 52;
+pub const AKEYCODE_Y: _bindgen_ty_2 = 53;
+pub const AKEYCODE_Z: _bindgen_ty_2 = 54;
+pub const AKEYCODE_COMMA: _bindgen_ty_2 = 55;
+pub const AKEYCODE_PERIOD: _bindgen_ty_2 = 56;
+pub const AKEYCODE_ALT_LEFT: _bindgen_ty_2 = 57;
+pub const AKEYCODE_ALT_RIGHT: _bindgen_ty_2 = 58;
+pub const AKEYCODE_SHIFT_LEFT: _bindgen_ty_2 = 59;
+pub const AKEYCODE_SHIFT_RIGHT: _bindgen_ty_2 = 60;
+pub const AKEYCODE_TAB: _bindgen_ty_2 = 61;
+pub const AKEYCODE_SPACE: _bindgen_ty_2 = 62;
+pub const AKEYCODE_SYM: _bindgen_ty_2 = 63;
+pub const AKEYCODE_EXPLORER: _bindgen_ty_2 = 64;
+pub const AKEYCODE_ENVELOPE: _bindgen_ty_2 = 65;
+pub const AKEYCODE_ENTER: _bindgen_ty_2 = 66;
+pub const AKEYCODE_DEL: _bindgen_ty_2 = 67;
+pub const AKEYCODE_GRAVE: _bindgen_ty_2 = 68;
+pub const AKEYCODE_MINUS: _bindgen_ty_2 = 69;
+pub const AKEYCODE_EQUALS: _bindgen_ty_2 = 70;
+pub const AKEYCODE_LEFT_BRACKET: _bindgen_ty_2 = 71;
+pub const AKEYCODE_RIGHT_BRACKET: _bindgen_ty_2 = 72;
+pub const AKEYCODE_BACKSLASH: _bindgen_ty_2 = 73;
+pub const AKEYCODE_SEMICOLON: _bindgen_ty_2 = 74;
+pub const AKEYCODE_APOSTROPHE: _bindgen_ty_2 = 75;
+pub const AKEYCODE_SLASH: _bindgen_ty_2 = 76;
+pub const AKEYCODE_AT: _bindgen_ty_2 = 77;
+pub const AKEYCODE_NUM: _bindgen_ty_2 = 78;
+pub const AKEYCODE_HEADSETHOOK: _bindgen_ty_2 = 79;
+pub const AKEYCODE_FOCUS: _bindgen_ty_2 = 80;
+pub const AKEYCODE_PLUS: _bindgen_ty_2 = 81;
+pub const AKEYCODE_MENU: _bindgen_ty_2 = 82;
+pub const AKEYCODE_NOTIFICATION: _bindgen_ty_2 = 83;
+pub const AKEYCODE_SEARCH: _bindgen_ty_2 = 84;
+pub const AKEYCODE_MEDIA_PLAY_PAUSE: _bindgen_ty_2 = 85;
+pub const AKEYCODE_MEDIA_STOP: _bindgen_ty_2 = 86;
+pub const AKEYCODE_MEDIA_NEXT: _bindgen_ty_2 = 87;
+pub const AKEYCODE_MEDIA_PREVIOUS: _bindgen_ty_2 = 88;
+pub const AKEYCODE_MEDIA_REWIND: _bindgen_ty_2 = 89;
+pub const AKEYCODE_MEDIA_FAST_FORWARD: _bindgen_ty_2 = 90;
+pub const AKEYCODE_MUTE: _bindgen_ty_2 = 91;
+pub const AKEYCODE_PAGE_UP: _bindgen_ty_2 = 92;
+pub const AKEYCODE_PAGE_DOWN: _bindgen_ty_2 = 93;
+pub const AKEYCODE_PICTSYMBOLS: _bindgen_ty_2 = 94;
+pub const AKEYCODE_SWITCH_CHARSET: _bindgen_ty_2 = 95;
+pub const AKEYCODE_BUTTON_A: _bindgen_ty_2 = 96;
+pub const AKEYCODE_BUTTON_B: _bindgen_ty_2 = 97;
+pub const AKEYCODE_BUTTON_C: _bindgen_ty_2 = 98;
+pub const AKEYCODE_BUTTON_X: _bindgen_ty_2 = 99;
+pub const AKEYCODE_BUTTON_Y: _bindgen_ty_2 = 100;
+pub const AKEYCODE_BUTTON_Z: _bindgen_ty_2 = 101;
+pub const AKEYCODE_BUTTON_L1: _bindgen_ty_2 = 102;
+pub const AKEYCODE_BUTTON_R1: _bindgen_ty_2 = 103;
+pub const AKEYCODE_BUTTON_L2: _bindgen_ty_2 = 104;
+pub const AKEYCODE_BUTTON_R2: _bindgen_ty_2 = 105;
+pub const AKEYCODE_BUTTON_THUMBL: _bindgen_ty_2 = 106;
+pub const AKEYCODE_BUTTON_THUMBR: _bindgen_ty_2 = 107;
+pub const AKEYCODE_BUTTON_START: _bindgen_ty_2 = 108;
+pub const AKEYCODE_BUTTON_SELECT: _bindgen_ty_2 = 109;
+pub const AKEYCODE_BUTTON_MODE: _bindgen_ty_2 = 110;
+pub const AKEYCODE_ESCAPE: _bindgen_ty_2 = 111;
+pub const AKEYCODE_FORWARD_DEL: _bindgen_ty_2 = 112;
+pub const AKEYCODE_CTRL_LEFT: _bindgen_ty_2 = 113;
+pub const AKEYCODE_CTRL_RIGHT: _bindgen_ty_2 = 114;
+pub const AKEYCODE_CAPS_LOCK: _bindgen_ty_2 = 115;
+pub const AKEYCODE_SCROLL_LOCK: _bindgen_ty_2 = 116;
+pub const AKEYCODE_META_LEFT: _bindgen_ty_2 = 117;
+pub const AKEYCODE_META_RIGHT: _bindgen_ty_2 = 118;
+pub const AKEYCODE_FUNCTION: _bindgen_ty_2 = 119;
+pub const AKEYCODE_SYSRQ: _bindgen_ty_2 = 120;
+pub const AKEYCODE_BREAK: _bindgen_ty_2 = 121;
+pub const AKEYCODE_MOVE_HOME: _bindgen_ty_2 = 122;
+pub const AKEYCODE_MOVE_END: _bindgen_ty_2 = 123;
+pub const AKEYCODE_INSERT: _bindgen_ty_2 = 124;
+pub const AKEYCODE_FORWARD: _bindgen_ty_2 = 125;
+pub const AKEYCODE_MEDIA_PLAY: _bindgen_ty_2 = 126;
+pub const AKEYCODE_MEDIA_PAUSE: _bindgen_ty_2 = 127;
+pub const AKEYCODE_MEDIA_CLOSE: _bindgen_ty_2 = 128;
+pub const AKEYCODE_MEDIA_EJECT: _bindgen_ty_2 = 129;
+pub const AKEYCODE_MEDIA_RECORD: _bindgen_ty_2 = 130;
+pub const AKEYCODE_F1: _bindgen_ty_2 = 131;
+pub const AKEYCODE_F2: _bindgen_ty_2 = 132;
+pub const AKEYCODE_F3: _bindgen_ty_2 = 133;
+pub const AKEYCODE_F4: _bindgen_ty_2 = 134;
+pub const AKEYCODE_F5: _bindgen_ty_2 = 135;
+pub const AKEYCODE_F6: _bindgen_ty_2 = 136;
+pub const AKEYCODE_F7: _bindgen_ty_2 = 137;
+pub const AKEYCODE_F8: _bindgen_ty_2 = 138;
+pub const AKEYCODE_F9: _bindgen_ty_2 = 139;
+pub const AKEYCODE_F10: _bindgen_ty_2 = 140;
+pub const AKEYCODE_F11: _bindgen_ty_2 = 141;
+pub const AKEYCODE_F12: _bindgen_ty_2 = 142;
+pub const AKEYCODE_NUM_LOCK: _bindgen_ty_2 = 143;
+pub const AKEYCODE_NUMPAD_0: _bindgen_ty_2 = 144;
+pub const AKEYCODE_NUMPAD_1: _bindgen_ty_2 = 145;
+pub const AKEYCODE_NUMPAD_2: _bindgen_ty_2 = 146;
+pub const AKEYCODE_NUMPAD_3: _bindgen_ty_2 = 147;
+pub const AKEYCODE_NUMPAD_4: _bindgen_ty_2 = 148;
+pub const AKEYCODE_NUMPAD_5: _bindgen_ty_2 = 149;
+pub const AKEYCODE_NUMPAD_6: _bindgen_ty_2 = 150;
+pub const AKEYCODE_NUMPAD_7: _bindgen_ty_2 = 151;
+pub const AKEYCODE_NUMPAD_8: _bindgen_ty_2 = 152;
+pub const AKEYCODE_NUMPAD_9: _bindgen_ty_2 = 153;
+pub const AKEYCODE_NUMPAD_DIVIDE: _bindgen_ty_2 = 154;
+pub const AKEYCODE_NUMPAD_MULTIPLY: _bindgen_ty_2 = 155;
+pub const AKEYCODE_NUMPAD_SUBTRACT: _bindgen_ty_2 = 156;
+pub const AKEYCODE_NUMPAD_ADD: _bindgen_ty_2 = 157;
+pub const AKEYCODE_NUMPAD_DOT: _bindgen_ty_2 = 158;
+pub const AKEYCODE_NUMPAD_COMMA: _bindgen_ty_2 = 159;
+pub const AKEYCODE_NUMPAD_ENTER: _bindgen_ty_2 = 160;
+pub const AKEYCODE_NUMPAD_EQUALS: _bindgen_ty_2 = 161;
+pub const AKEYCODE_NUMPAD_LEFT_PAREN: _bindgen_ty_2 = 162;
+pub const AKEYCODE_NUMPAD_RIGHT_PAREN: _bindgen_ty_2 = 163;
+pub const AKEYCODE_VOLUME_MUTE: _bindgen_ty_2 = 164;
+pub const AKEYCODE_INFO: _bindgen_ty_2 = 165;
+pub const AKEYCODE_CHANNEL_UP: _bindgen_ty_2 = 166;
+pub const AKEYCODE_CHANNEL_DOWN: _bindgen_ty_2 = 167;
+pub const AKEYCODE_ZOOM_IN: _bindgen_ty_2 = 168;
+pub const AKEYCODE_ZOOM_OUT: _bindgen_ty_2 = 169;
+pub const AKEYCODE_TV: _bindgen_ty_2 = 170;
+pub const AKEYCODE_WINDOW: _bindgen_ty_2 = 171;
+pub const AKEYCODE_GUIDE: _bindgen_ty_2 = 172;
+pub const AKEYCODE_DVR: _bindgen_ty_2 = 173;
+pub const AKEYCODE_BOOKMARK: _bindgen_ty_2 = 174;
+pub const AKEYCODE_CAPTIONS: _bindgen_ty_2 = 175;
+pub const AKEYCODE_SETTINGS: _bindgen_ty_2 = 176;
+pub const AKEYCODE_TV_POWER: _bindgen_ty_2 = 177;
+pub const AKEYCODE_TV_INPUT: _bindgen_ty_2 = 178;
+pub const AKEYCODE_STB_POWER: _bindgen_ty_2 = 179;
+pub const AKEYCODE_STB_INPUT: _bindgen_ty_2 = 180;
+pub const AKEYCODE_AVR_POWER: _bindgen_ty_2 = 181;
+pub const AKEYCODE_AVR_INPUT: _bindgen_ty_2 = 182;
+pub const AKEYCODE_PROG_RED: _bindgen_ty_2 = 183;
+pub const AKEYCODE_PROG_GREEN: _bindgen_ty_2 = 184;
+pub const AKEYCODE_PROG_YELLOW: _bindgen_ty_2 = 185;
+pub const AKEYCODE_PROG_BLUE: _bindgen_ty_2 = 186;
+pub const AKEYCODE_APP_SWITCH: _bindgen_ty_2 = 187;
+pub const AKEYCODE_BUTTON_1: _bindgen_ty_2 = 188;
+pub const AKEYCODE_BUTTON_2: _bindgen_ty_2 = 189;
+pub const AKEYCODE_BUTTON_3: _bindgen_ty_2 = 190;
+pub const AKEYCODE_BUTTON_4: _bindgen_ty_2 = 191;
+pub const AKEYCODE_BUTTON_5: _bindgen_ty_2 = 192;
+pub const AKEYCODE_BUTTON_6: _bindgen_ty_2 = 193;
+pub const AKEYCODE_BUTTON_7: _bindgen_ty_2 = 194;
+pub const AKEYCODE_BUTTON_8: _bindgen_ty_2 = 195;
+pub const AKEYCODE_BUTTON_9: _bindgen_ty_2 = 196;
+pub const AKEYCODE_BUTTON_10: _bindgen_ty_2 = 197;
+pub const AKEYCODE_BUTTON_11: _bindgen_ty_2 = 198;
+pub const AKEYCODE_BUTTON_12: _bindgen_ty_2 = 199;
+pub const AKEYCODE_BUTTON_13: _bindgen_ty_2 = 200;
+pub const AKEYCODE_BUTTON_14: _bindgen_ty_2 = 201;
+pub const AKEYCODE_BUTTON_15: _bindgen_ty_2 = 202;
+pub const AKEYCODE_BUTTON_16: _bindgen_ty_2 = 203;
+pub const AKEYCODE_LANGUAGE_SWITCH: _bindgen_ty_2 = 204;
+pub const AKEYCODE_MANNER_MODE: _bindgen_ty_2 = 205;
+pub const AKEYCODE_3D_MODE: _bindgen_ty_2 = 206;
+pub const AKEYCODE_CONTACTS: _bindgen_ty_2 = 207;
+pub const AKEYCODE_CALENDAR: _bindgen_ty_2 = 208;
+pub const AKEYCODE_MUSIC: _bindgen_ty_2 = 209;
+pub const AKEYCODE_CALCULATOR: _bindgen_ty_2 = 210;
+pub const AKEYCODE_ZENKAKU_HANKAKU: _bindgen_ty_2 = 211;
+pub const AKEYCODE_EISU: _bindgen_ty_2 = 212;
+pub const AKEYCODE_MUHENKAN: _bindgen_ty_2 = 213;
+pub const AKEYCODE_HENKAN: _bindgen_ty_2 = 214;
+pub const AKEYCODE_KATAKANA_HIRAGANA: _bindgen_ty_2 = 215;
+pub const AKEYCODE_YEN: _bindgen_ty_2 = 216;
+pub const AKEYCODE_RO: _bindgen_ty_2 = 217;
+pub const AKEYCODE_KANA: _bindgen_ty_2 = 218;
+pub const AKEYCODE_ASSIST: _bindgen_ty_2 = 219;
+pub const AKEYCODE_BRIGHTNESS_DOWN: _bindgen_ty_2 = 220;
+pub const AKEYCODE_BRIGHTNESS_UP: _bindgen_ty_2 = 221;
+pub const AKEYCODE_MEDIA_AUDIO_TRACK: _bindgen_ty_2 = 222;
+pub const AKEYCODE_SLEEP: _bindgen_ty_2 = 223;
+pub const AKEYCODE_WAKEUP: _bindgen_ty_2 = 224;
+pub const AKEYCODE_PAIRING: _bindgen_ty_2 = 225;
+pub const AKEYCODE_MEDIA_TOP_MENU: _bindgen_ty_2 = 226;
+pub const AKEYCODE_11: _bindgen_ty_2 = 227;
+pub const AKEYCODE_12: _bindgen_ty_2 = 228;
+pub const AKEYCODE_LAST_CHANNEL: _bindgen_ty_2 = 229;
+pub const AKEYCODE_TV_DATA_SERVICE: _bindgen_ty_2 = 230;
+pub const AKEYCODE_VOICE_ASSIST: _bindgen_ty_2 = 231;
+pub const AKEYCODE_TV_RADIO_SERVICE: _bindgen_ty_2 = 232;
+pub const AKEYCODE_TV_TELETEXT: _bindgen_ty_2 = 233;
+pub const AKEYCODE_TV_NUMBER_ENTRY: _bindgen_ty_2 = 234;
+pub const AKEYCODE_TV_TERRESTRIAL_ANALOG: _bindgen_ty_2 = 235;
+pub const AKEYCODE_TV_TERRESTRIAL_DIGITAL: _bindgen_ty_2 = 236;
+pub const AKEYCODE_TV_SATELLITE: _bindgen_ty_2 = 237;
+pub const AKEYCODE_TV_SATELLITE_BS: _bindgen_ty_2 = 238;
+pub const AKEYCODE_TV_SATELLITE_CS: _bindgen_ty_2 = 239;
+pub const AKEYCODE_TV_SATELLITE_SERVICE: _bindgen_ty_2 = 240;
+pub const AKEYCODE_TV_NETWORK: _bindgen_ty_2 = 241;
+pub const AKEYCODE_TV_ANTENNA_CABLE: _bindgen_ty_2 = 242;
+pub const AKEYCODE_TV_INPUT_HDMI_1: _bindgen_ty_2 = 243;
+pub const AKEYCODE_TV_INPUT_HDMI_2: _bindgen_ty_2 = 244;
+pub const AKEYCODE_TV_INPUT_HDMI_3: _bindgen_ty_2 = 245;
+pub const AKEYCODE_TV_INPUT_HDMI_4: _bindgen_ty_2 = 246;
+pub const AKEYCODE_TV_INPUT_COMPOSITE_1: _bindgen_ty_2 = 247;
+pub const AKEYCODE_TV_INPUT_COMPOSITE_2: _bindgen_ty_2 = 248;
+pub const AKEYCODE_TV_INPUT_COMPONENT_1: _bindgen_ty_2 = 249;
+pub const AKEYCODE_TV_INPUT_COMPONENT_2: _bindgen_ty_2 = 250;
+pub const AKEYCODE_TV_INPUT_VGA_1: _bindgen_ty_2 = 251;
+pub const AKEYCODE_TV_AUDIO_DESCRIPTION: _bindgen_ty_2 = 252;
+pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP: _bindgen_ty_2 = 253;
+pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN: _bindgen_ty_2 = 254;
+pub const AKEYCODE_TV_ZOOM_MODE: _bindgen_ty_2 = 255;
+pub const AKEYCODE_TV_CONTENTS_MENU: _bindgen_ty_2 = 256;
+pub const AKEYCODE_TV_MEDIA_CONTEXT_MENU: _bindgen_ty_2 = 257;
+pub const AKEYCODE_TV_TIMER_PROGRAMMING: _bindgen_ty_2 = 258;
+pub const AKEYCODE_HELP: _bindgen_ty_2 = 259;
+pub const AKEYCODE_NAVIGATE_PREVIOUS: _bindgen_ty_2 = 260;
+pub const AKEYCODE_NAVIGATE_NEXT: _bindgen_ty_2 = 261;
+pub const AKEYCODE_NAVIGATE_IN: _bindgen_ty_2 = 262;
+pub const AKEYCODE_NAVIGATE_OUT: _bindgen_ty_2 = 263;
+pub const AKEYCODE_STEM_PRIMARY: _bindgen_ty_2 = 264;
+pub const AKEYCODE_STEM_1: _bindgen_ty_2 = 265;
+pub const AKEYCODE_STEM_2: _bindgen_ty_2 = 266;
+pub const AKEYCODE_STEM_3: _bindgen_ty_2 = 267;
+pub const AKEYCODE_DPAD_UP_LEFT: _bindgen_ty_2 = 268;
+pub const AKEYCODE_DPAD_DOWN_LEFT: _bindgen_ty_2 = 269;
+pub const AKEYCODE_DPAD_UP_RIGHT: _bindgen_ty_2 = 270;
+pub const AKEYCODE_DPAD_DOWN_RIGHT: _bindgen_ty_2 = 271;
+pub const AKEYCODE_MEDIA_SKIP_FORWARD: _bindgen_ty_2 = 272;
+pub const AKEYCODE_MEDIA_SKIP_BACKWARD: _bindgen_ty_2 = 273;
+pub const AKEYCODE_MEDIA_STEP_FORWARD: _bindgen_ty_2 = 274;
+pub const AKEYCODE_MEDIA_STEP_BACKWARD: _bindgen_ty_2 = 275;
+pub const AKEYCODE_SOFT_SLEEP: _bindgen_ty_2 = 276;
+pub const AKEYCODE_CUT: _bindgen_ty_2 = 277;
+pub const AKEYCODE_COPY: _bindgen_ty_2 = 278;
+pub const AKEYCODE_PASTE: _bindgen_ty_2 = 279;
+pub const AKEYCODE_SYSTEM_NAVIGATION_UP: _bindgen_ty_2 = 280;
+pub const AKEYCODE_SYSTEM_NAVIGATION_DOWN: _bindgen_ty_2 = 281;
+pub const AKEYCODE_SYSTEM_NAVIGATION_LEFT: _bindgen_ty_2 = 282;
+pub const AKEYCODE_SYSTEM_NAVIGATION_RIGHT: _bindgen_ty_2 = 283;
+pub const AKEYCODE_ALL_APPS: _bindgen_ty_2 = 284;
+pub const AKEYCODE_REFRESH: _bindgen_ty_2 = 285;
+pub const AKEYCODE_THUMBS_UP: _bindgen_ty_2 = 286;
+pub const AKEYCODE_THUMBS_DOWN: _bindgen_ty_2 = 287;
+pub const AKEYCODE_PROFILE_SWITCH: _bindgen_ty_2 = 288;
 pub type _bindgen_ty_2 = ::std::os::raw::c_uint;
-pub const ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: ::std::os::raw::c_uint = 1;
+pub const ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: _bindgen_ty_3 = 1;
 pub type _bindgen_ty_3 = ::std::os::raw::c_uint;
-pub const ALOOPER_POLL_WAKE: ::std::os::raw::c_int = -1;
-pub const ALOOPER_POLL_CALLBACK: ::std::os::raw::c_int = -2;
-pub const ALOOPER_POLL_TIMEOUT: ::std::os::raw::c_int = -3;
-pub const ALOOPER_POLL_ERROR: ::std::os::raw::c_int = -4;
+pub const ALOOPER_POLL_WAKE: _bindgen_ty_4 = -1;
+pub const ALOOPER_POLL_CALLBACK: _bindgen_ty_4 = -2;
+pub const ALOOPER_POLL_TIMEOUT: _bindgen_ty_4 = -3;
+pub const ALOOPER_POLL_ERROR: _bindgen_ty_4 = -4;
 pub type _bindgen_ty_4 = ::std::os::raw::c_int;
-pub const ALOOPER_EVENT_INPUT: ::std::os::raw::c_uint = 1;
-pub const ALOOPER_EVENT_OUTPUT: ::std::os::raw::c_uint = 2;
-pub const ALOOPER_EVENT_ERROR: ::std::os::raw::c_uint = 4;
-pub const ALOOPER_EVENT_HANGUP: ::std::os::raw::c_uint = 8;
-pub const ALOOPER_EVENT_INVALID: ::std::os::raw::c_uint = 16;
+pub const ALOOPER_EVENT_INPUT: _bindgen_ty_5 = 1;
+pub const ALOOPER_EVENT_OUTPUT: _bindgen_ty_5 = 2;
+pub const ALOOPER_EVENT_ERROR: _bindgen_ty_5 = 4;
+pub const ALOOPER_EVENT_HANGUP: _bindgen_ty_5 = 8;
+pub const ALOOPER_EVENT_INVALID: _bindgen_ty_5 = 16;
 pub type _bindgen_ty_5 = ::std::os::raw::c_uint;
-pub const AKEY_STATE_UNKNOWN: ::std::os::raw::c_int = -1;
-pub const AKEY_STATE_UP: ::std::os::raw::c_int = 0;
-pub const AKEY_STATE_DOWN: ::std::os::raw::c_int = 1;
-pub const AKEY_STATE_VIRTUAL: ::std::os::raw::c_int = 2;
+pub type va_list = u32;
+pub type __gnuc_va_list = u32;
+#[repr(C)]
+pub struct JavaVMAttachArgs {
+    pub version: jint,
+    pub name: *const ::std::os::raw::c_char,
+    pub group: jobject,
+}
+#[test]
+fn bindgen_test_layout_JavaVMAttachArgs() {
+    const UNINIT: ::std::mem::MaybeUninit<JavaVMAttachArgs> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<JavaVMAttachArgs>(),
+        12usize,
+        concat!("Size of: ", stringify!(JavaVMAttachArgs))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<JavaVMAttachArgs>(),
+        4usize,
+        concat!("Alignment of ", stringify!(JavaVMAttachArgs))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMAttachArgs),
+            "::",
+            stringify!(version)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).name) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMAttachArgs),
+            "::",
+            stringify!(name)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).group) as usize - ptr as usize },
+        8usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMAttachArgs),
+            "::",
+            stringify!(group)
+        )
+    );
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct JavaVMOption {
+    pub optionString: *const ::std::os::raw::c_char,
+    pub extraInfo: *mut ::std::os::raw::c_void,
+}
+#[test]
+fn bindgen_test_layout_JavaVMOption() {
+    const UNINIT: ::std::mem::MaybeUninit<JavaVMOption> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<JavaVMOption>(),
+        8usize,
+        concat!("Size of: ", stringify!(JavaVMOption))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<JavaVMOption>(),
+        4usize,
+        concat!("Alignment of ", stringify!(JavaVMOption))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).optionString) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMOption),
+            "::",
+            stringify!(optionString)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).extraInfo) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMOption),
+            "::",
+            stringify!(extraInfo)
+        )
+    );
+}
+#[repr(C)]
+pub struct JavaVMInitArgs {
+    pub version: jint,
+    pub nOptions: jint,
+    pub options: *mut JavaVMOption,
+    pub ignoreUnrecognized: jboolean,
+}
+#[test]
+fn bindgen_test_layout_JavaVMInitArgs() {
+    const UNINIT: ::std::mem::MaybeUninit<JavaVMInitArgs> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<JavaVMInitArgs>(),
+        16usize,
+        concat!("Size of: ", stringify!(JavaVMInitArgs))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<JavaVMInitArgs>(),
+        4usize,
+        concat!("Alignment of ", stringify!(JavaVMInitArgs))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(version)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).nOptions) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(nOptions)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).options) as usize - ptr as usize },
+        8usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(options)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).ignoreUnrecognized) as usize - ptr as usize },
+        12usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(ignoreUnrecognized)
+        )
+    );
+}
+pub const AKEY_STATE_UNKNOWN: _bindgen_ty_6 = -1;
+pub const AKEY_STATE_UP: _bindgen_ty_6 = 0;
+pub const AKEY_STATE_DOWN: _bindgen_ty_6 = 1;
+pub const AKEY_STATE_VIRTUAL: _bindgen_ty_6 = 2;
 pub type _bindgen_ty_6 = ::std::os::raw::c_int;
-pub const AMETA_NONE: ::std::os::raw::c_uint = 0;
-pub const AMETA_ALT_ON: ::std::os::raw::c_uint = 2;
-pub const AMETA_ALT_LEFT_ON: ::std::os::raw::c_uint = 16;
-pub const AMETA_ALT_RIGHT_ON: ::std::os::raw::c_uint = 32;
-pub const AMETA_SHIFT_ON: ::std::os::raw::c_uint = 1;
-pub const AMETA_SHIFT_LEFT_ON: ::std::os::raw::c_uint = 64;
-pub const AMETA_SHIFT_RIGHT_ON: ::std::os::raw::c_uint = 128;
-pub const AMETA_SYM_ON: ::std::os::raw::c_uint = 4;
-pub const AMETA_FUNCTION_ON: ::std::os::raw::c_uint = 8;
-pub const AMETA_CTRL_ON: ::std::os::raw::c_uint = 4096;
-pub const AMETA_CTRL_LEFT_ON: ::std::os::raw::c_uint = 8192;
-pub const AMETA_CTRL_RIGHT_ON: ::std::os::raw::c_uint = 16384;
-pub const AMETA_META_ON: ::std::os::raw::c_uint = 65536;
-pub const AMETA_META_LEFT_ON: ::std::os::raw::c_uint = 131072;
-pub const AMETA_META_RIGHT_ON: ::std::os::raw::c_uint = 262144;
-pub const AMETA_CAPS_LOCK_ON: ::std::os::raw::c_uint = 1048576;
-pub const AMETA_NUM_LOCK_ON: ::std::os::raw::c_uint = 2097152;
-pub const AMETA_SCROLL_LOCK_ON: ::std::os::raw::c_uint = 4194304;
+pub const AMETA_NONE: _bindgen_ty_7 = 0;
+pub const AMETA_ALT_ON: _bindgen_ty_7 = 2;
+pub const AMETA_ALT_LEFT_ON: _bindgen_ty_7 = 16;
+pub const AMETA_ALT_RIGHT_ON: _bindgen_ty_7 = 32;
+pub const AMETA_SHIFT_ON: _bindgen_ty_7 = 1;
+pub const AMETA_SHIFT_LEFT_ON: _bindgen_ty_7 = 64;
+pub const AMETA_SHIFT_RIGHT_ON: _bindgen_ty_7 = 128;
+pub const AMETA_SYM_ON: _bindgen_ty_7 = 4;
+pub const AMETA_FUNCTION_ON: _bindgen_ty_7 = 8;
+pub const AMETA_CTRL_ON: _bindgen_ty_7 = 4096;
+pub const AMETA_CTRL_LEFT_ON: _bindgen_ty_7 = 8192;
+pub const AMETA_CTRL_RIGHT_ON: _bindgen_ty_7 = 16384;
+pub const AMETA_META_ON: _bindgen_ty_7 = 65536;
+pub const AMETA_META_LEFT_ON: _bindgen_ty_7 = 131072;
+pub const AMETA_META_RIGHT_ON: _bindgen_ty_7 = 262144;
+pub const AMETA_CAPS_LOCK_ON: _bindgen_ty_7 = 1048576;
+pub const AMETA_NUM_LOCK_ON: _bindgen_ty_7 = 2097152;
+pub const AMETA_SCROLL_LOCK_ON: _bindgen_ty_7 = 4194304;
 pub type _bindgen_ty_7 = ::std::os::raw::c_uint;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct AInputEvent {
     _unused: [u8; 0],
 }
-pub const AINPUT_EVENT_TYPE_KEY: ::std::os::raw::c_uint = 1;
-pub const AINPUT_EVENT_TYPE_MOTION: ::std::os::raw::c_uint = 2;
+pub const AINPUT_EVENT_TYPE_KEY: _bindgen_ty_8 = 1;
+pub const AINPUT_EVENT_TYPE_MOTION: _bindgen_ty_8 = 2;
+pub const AINPUT_EVENT_TYPE_FOCUS: _bindgen_ty_8 = 3;
+pub const AINPUT_EVENT_TYPE_CAPTURE: _bindgen_ty_8 = 4;
+pub const AINPUT_EVENT_TYPE_DRAG: _bindgen_ty_8 = 5;
+pub const AINPUT_EVENT_TYPE_TOUCH_MODE: _bindgen_ty_8 = 6;
 pub type _bindgen_ty_8 = ::std::os::raw::c_uint;
-pub const AKEY_EVENT_ACTION_DOWN: ::std::os::raw::c_uint = 0;
-pub const AKEY_EVENT_ACTION_UP: ::std::os::raw::c_uint = 1;
-pub const AKEY_EVENT_ACTION_MULTIPLE: ::std::os::raw::c_uint = 2;
+pub const AKEY_EVENT_ACTION_DOWN: _bindgen_ty_9 = 0;
+pub const AKEY_EVENT_ACTION_UP: _bindgen_ty_9 = 1;
+pub const AKEY_EVENT_ACTION_MULTIPLE: _bindgen_ty_9 = 2;
 pub type _bindgen_ty_9 = ::std::os::raw::c_uint;
-pub const AKEY_EVENT_FLAG_WOKE_HERE: ::std::os::raw::c_uint = 1;
-pub const AKEY_EVENT_FLAG_SOFT_KEYBOARD: ::std::os::raw::c_uint = 2;
-pub const AKEY_EVENT_FLAG_KEEP_TOUCH_MODE: ::std::os::raw::c_uint = 4;
-pub const AKEY_EVENT_FLAG_FROM_SYSTEM: ::std::os::raw::c_uint = 8;
-pub const AKEY_EVENT_FLAG_EDITOR_ACTION: ::std::os::raw::c_uint = 16;
-pub const AKEY_EVENT_FLAG_CANCELED: ::std::os::raw::c_uint = 32;
-pub const AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY: ::std::os::raw::c_uint = 64;
-pub const AKEY_EVENT_FLAG_LONG_PRESS: ::std::os::raw::c_uint = 128;
-pub const AKEY_EVENT_FLAG_CANCELED_LONG_PRESS: ::std::os::raw::c_uint = 256;
-pub const AKEY_EVENT_FLAG_TRACKING: ::std::os::raw::c_uint = 512;
-pub const AKEY_EVENT_FLAG_FALLBACK: ::std::os::raw::c_uint = 1024;
+pub const AKEY_EVENT_FLAG_WOKE_HERE: _bindgen_ty_10 = 1;
+pub const AKEY_EVENT_FLAG_SOFT_KEYBOARD: _bindgen_ty_10 = 2;
+pub const AKEY_EVENT_FLAG_KEEP_TOUCH_MODE: _bindgen_ty_10 = 4;
+pub const AKEY_EVENT_FLAG_FROM_SYSTEM: _bindgen_ty_10 = 8;
+pub const AKEY_EVENT_FLAG_EDITOR_ACTION: _bindgen_ty_10 = 16;
+pub const AKEY_EVENT_FLAG_CANCELED: _bindgen_ty_10 = 32;
+pub const AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY: _bindgen_ty_10 = 64;
+pub const AKEY_EVENT_FLAG_LONG_PRESS: _bindgen_ty_10 = 128;
+pub const AKEY_EVENT_FLAG_CANCELED_LONG_PRESS: _bindgen_ty_10 = 256;
+pub const AKEY_EVENT_FLAG_TRACKING: _bindgen_ty_10 = 512;
+pub const AKEY_EVENT_FLAG_FALLBACK: _bindgen_ty_10 = 1024;
 pub type _bindgen_ty_10 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_ACTION_MASK: ::std::os::raw::c_uint = 255;
-pub const AMOTION_EVENT_ACTION_POINTER_INDEX_MASK: ::std::os::raw::c_uint = 65280;
-pub const AMOTION_EVENT_ACTION_DOWN: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_ACTION_UP: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_ACTION_MOVE: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_ACTION_CANCEL: ::std::os::raw::c_uint = 3;
-pub const AMOTION_EVENT_ACTION_OUTSIDE: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_ACTION_POINTER_DOWN: ::std::os::raw::c_uint = 5;
-pub const AMOTION_EVENT_ACTION_POINTER_UP: ::std::os::raw::c_uint = 6;
-pub const AMOTION_EVENT_ACTION_HOVER_MOVE: ::std::os::raw::c_uint = 7;
-pub const AMOTION_EVENT_ACTION_SCROLL: ::std::os::raw::c_uint = 8;
-pub const AMOTION_EVENT_ACTION_HOVER_ENTER: ::std::os::raw::c_uint = 9;
-pub const AMOTION_EVENT_ACTION_HOVER_EXIT: ::std::os::raw::c_uint = 10;
-pub const AMOTION_EVENT_ACTION_BUTTON_PRESS: ::std::os::raw::c_uint = 11;
-pub const AMOTION_EVENT_ACTION_BUTTON_RELEASE: ::std::os::raw::c_uint = 12;
+pub const AMOTION_EVENT_ACTION_MASK: _bindgen_ty_11 = 255;
+pub const AMOTION_EVENT_ACTION_POINTER_INDEX_MASK: _bindgen_ty_11 = 65280;
+pub const AMOTION_EVENT_ACTION_DOWN: _bindgen_ty_11 = 0;
+pub const AMOTION_EVENT_ACTION_UP: _bindgen_ty_11 = 1;
+pub const AMOTION_EVENT_ACTION_MOVE: _bindgen_ty_11 = 2;
+pub const AMOTION_EVENT_ACTION_CANCEL: _bindgen_ty_11 = 3;
+pub const AMOTION_EVENT_ACTION_OUTSIDE: _bindgen_ty_11 = 4;
+pub const AMOTION_EVENT_ACTION_POINTER_DOWN: _bindgen_ty_11 = 5;
+pub const AMOTION_EVENT_ACTION_POINTER_UP: _bindgen_ty_11 = 6;
+pub const AMOTION_EVENT_ACTION_HOVER_MOVE: _bindgen_ty_11 = 7;
+pub const AMOTION_EVENT_ACTION_SCROLL: _bindgen_ty_11 = 8;
+pub const AMOTION_EVENT_ACTION_HOVER_ENTER: _bindgen_ty_11 = 9;
+pub const AMOTION_EVENT_ACTION_HOVER_EXIT: _bindgen_ty_11 = 10;
+pub const AMOTION_EVENT_ACTION_BUTTON_PRESS: _bindgen_ty_11 = 11;
+pub const AMOTION_EVENT_ACTION_BUTTON_RELEASE: _bindgen_ty_11 = 12;
 pub type _bindgen_ty_11 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED: ::std::os::raw::c_uint = 1;
+pub const AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED: _bindgen_ty_12 = 1;
 pub type _bindgen_ty_12 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_EDGE_FLAG_NONE: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_EDGE_FLAG_TOP: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_EDGE_FLAG_BOTTOM: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_EDGE_FLAG_LEFT: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_EDGE_FLAG_RIGHT: ::std::os::raw::c_uint = 8;
+pub const AMOTION_EVENT_EDGE_FLAG_NONE: _bindgen_ty_13 = 0;
+pub const AMOTION_EVENT_EDGE_FLAG_TOP: _bindgen_ty_13 = 1;
+pub const AMOTION_EVENT_EDGE_FLAG_BOTTOM: _bindgen_ty_13 = 2;
+pub const AMOTION_EVENT_EDGE_FLAG_LEFT: _bindgen_ty_13 = 4;
+pub const AMOTION_EVENT_EDGE_FLAG_RIGHT: _bindgen_ty_13 = 8;
 pub type _bindgen_ty_13 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_AXIS_X: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_AXIS_Y: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_AXIS_PRESSURE: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_AXIS_SIZE: ::std::os::raw::c_uint = 3;
-pub const AMOTION_EVENT_AXIS_TOUCH_MAJOR: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_AXIS_TOUCH_MINOR: ::std::os::raw::c_uint = 5;
-pub const AMOTION_EVENT_AXIS_TOOL_MAJOR: ::std::os::raw::c_uint = 6;
-pub const AMOTION_EVENT_AXIS_TOOL_MINOR: ::std::os::raw::c_uint = 7;
-pub const AMOTION_EVENT_AXIS_ORIENTATION: ::std::os::raw::c_uint = 8;
-pub const AMOTION_EVENT_AXIS_VSCROLL: ::std::os::raw::c_uint = 9;
-pub const AMOTION_EVENT_AXIS_HSCROLL: ::std::os::raw::c_uint = 10;
-pub const AMOTION_EVENT_AXIS_Z: ::std::os::raw::c_uint = 11;
-pub const AMOTION_EVENT_AXIS_RX: ::std::os::raw::c_uint = 12;
-pub const AMOTION_EVENT_AXIS_RY: ::std::os::raw::c_uint = 13;
-pub const AMOTION_EVENT_AXIS_RZ: ::std::os::raw::c_uint = 14;
-pub const AMOTION_EVENT_AXIS_HAT_X: ::std::os::raw::c_uint = 15;
-pub const AMOTION_EVENT_AXIS_HAT_Y: ::std::os::raw::c_uint = 16;
-pub const AMOTION_EVENT_AXIS_LTRIGGER: ::std::os::raw::c_uint = 17;
-pub const AMOTION_EVENT_AXIS_RTRIGGER: ::std::os::raw::c_uint = 18;
-pub const AMOTION_EVENT_AXIS_THROTTLE: ::std::os::raw::c_uint = 19;
-pub const AMOTION_EVENT_AXIS_RUDDER: ::std::os::raw::c_uint = 20;
-pub const AMOTION_EVENT_AXIS_WHEEL: ::std::os::raw::c_uint = 21;
-pub const AMOTION_EVENT_AXIS_GAS: ::std::os::raw::c_uint = 22;
-pub const AMOTION_EVENT_AXIS_BRAKE: ::std::os::raw::c_uint = 23;
-pub const AMOTION_EVENT_AXIS_DISTANCE: ::std::os::raw::c_uint = 24;
-pub const AMOTION_EVENT_AXIS_TILT: ::std::os::raw::c_uint = 25;
-pub const AMOTION_EVENT_AXIS_SCROLL: ::std::os::raw::c_uint = 26;
-pub const AMOTION_EVENT_AXIS_RELATIVE_X: ::std::os::raw::c_uint = 27;
-pub const AMOTION_EVENT_AXIS_RELATIVE_Y: ::std::os::raw::c_uint = 28;
-pub const AMOTION_EVENT_AXIS_GENERIC_1: ::std::os::raw::c_uint = 32;
-pub const AMOTION_EVENT_AXIS_GENERIC_2: ::std::os::raw::c_uint = 33;
-pub const AMOTION_EVENT_AXIS_GENERIC_3: ::std::os::raw::c_uint = 34;
-pub const AMOTION_EVENT_AXIS_GENERIC_4: ::std::os::raw::c_uint = 35;
-pub const AMOTION_EVENT_AXIS_GENERIC_5: ::std::os::raw::c_uint = 36;
-pub const AMOTION_EVENT_AXIS_GENERIC_6: ::std::os::raw::c_uint = 37;
-pub const AMOTION_EVENT_AXIS_GENERIC_7: ::std::os::raw::c_uint = 38;
-pub const AMOTION_EVENT_AXIS_GENERIC_8: ::std::os::raw::c_uint = 39;
-pub const AMOTION_EVENT_AXIS_GENERIC_9: ::std::os::raw::c_uint = 40;
-pub const AMOTION_EVENT_AXIS_GENERIC_10: ::std::os::raw::c_uint = 41;
-pub const AMOTION_EVENT_AXIS_GENERIC_11: ::std::os::raw::c_uint = 42;
-pub const AMOTION_EVENT_AXIS_GENERIC_12: ::std::os::raw::c_uint = 43;
-pub const AMOTION_EVENT_AXIS_GENERIC_13: ::std::os::raw::c_uint = 44;
-pub const AMOTION_EVENT_AXIS_GENERIC_14: ::std::os::raw::c_uint = 45;
-pub const AMOTION_EVENT_AXIS_GENERIC_15: ::std::os::raw::c_uint = 46;
-pub const AMOTION_EVENT_AXIS_GENERIC_16: ::std::os::raw::c_uint = 47;
+pub const AMOTION_EVENT_AXIS_X: _bindgen_ty_14 = 0;
+pub const AMOTION_EVENT_AXIS_Y: _bindgen_ty_14 = 1;
+pub const AMOTION_EVENT_AXIS_PRESSURE: _bindgen_ty_14 = 2;
+pub const AMOTION_EVENT_AXIS_SIZE: _bindgen_ty_14 = 3;
+pub const AMOTION_EVENT_AXIS_TOUCH_MAJOR: _bindgen_ty_14 = 4;
+pub const AMOTION_EVENT_AXIS_TOUCH_MINOR: _bindgen_ty_14 = 5;
+pub const AMOTION_EVENT_AXIS_TOOL_MAJOR: _bindgen_ty_14 = 6;
+pub const AMOTION_EVENT_AXIS_TOOL_MINOR: _bindgen_ty_14 = 7;
+pub const AMOTION_EVENT_AXIS_ORIENTATION: _bindgen_ty_14 = 8;
+pub const AMOTION_EVENT_AXIS_VSCROLL: _bindgen_ty_14 = 9;
+pub const AMOTION_EVENT_AXIS_HSCROLL: _bindgen_ty_14 = 10;
+pub const AMOTION_EVENT_AXIS_Z: _bindgen_ty_14 = 11;
+pub const AMOTION_EVENT_AXIS_RX: _bindgen_ty_14 = 12;
+pub const AMOTION_EVENT_AXIS_RY: _bindgen_ty_14 = 13;
+pub const AMOTION_EVENT_AXIS_RZ: _bindgen_ty_14 = 14;
+pub const AMOTION_EVENT_AXIS_HAT_X: _bindgen_ty_14 = 15;
+pub const AMOTION_EVENT_AXIS_HAT_Y: _bindgen_ty_14 = 16;
+pub const AMOTION_EVENT_AXIS_LTRIGGER: _bindgen_ty_14 = 17;
+pub const AMOTION_EVENT_AXIS_RTRIGGER: _bindgen_ty_14 = 18;
+pub const AMOTION_EVENT_AXIS_THROTTLE: _bindgen_ty_14 = 19;
+pub const AMOTION_EVENT_AXIS_RUDDER: _bindgen_ty_14 = 20;
+pub const AMOTION_EVENT_AXIS_WHEEL: _bindgen_ty_14 = 21;
+pub const AMOTION_EVENT_AXIS_GAS: _bindgen_ty_14 = 22;
+pub const AMOTION_EVENT_AXIS_BRAKE: _bindgen_ty_14 = 23;
+pub const AMOTION_EVENT_AXIS_DISTANCE: _bindgen_ty_14 = 24;
+pub const AMOTION_EVENT_AXIS_TILT: _bindgen_ty_14 = 25;
+pub const AMOTION_EVENT_AXIS_SCROLL: _bindgen_ty_14 = 26;
+pub const AMOTION_EVENT_AXIS_RELATIVE_X: _bindgen_ty_14 = 27;
+pub const AMOTION_EVENT_AXIS_RELATIVE_Y: _bindgen_ty_14 = 28;
+pub const AMOTION_EVENT_AXIS_GENERIC_1: _bindgen_ty_14 = 32;
+pub const AMOTION_EVENT_AXIS_GENERIC_2: _bindgen_ty_14 = 33;
+pub const AMOTION_EVENT_AXIS_GENERIC_3: _bindgen_ty_14 = 34;
+pub const AMOTION_EVENT_AXIS_GENERIC_4: _bindgen_ty_14 = 35;
+pub const AMOTION_EVENT_AXIS_GENERIC_5: _bindgen_ty_14 = 36;
+pub const AMOTION_EVENT_AXIS_GENERIC_6: _bindgen_ty_14 = 37;
+pub const AMOTION_EVENT_AXIS_GENERIC_7: _bindgen_ty_14 = 38;
+pub const AMOTION_EVENT_AXIS_GENERIC_8: _bindgen_ty_14 = 39;
+pub const AMOTION_EVENT_AXIS_GENERIC_9: _bindgen_ty_14 = 40;
+pub const AMOTION_EVENT_AXIS_GENERIC_10: _bindgen_ty_14 = 41;
+pub const AMOTION_EVENT_AXIS_GENERIC_11: _bindgen_ty_14 = 42;
+pub const AMOTION_EVENT_AXIS_GENERIC_12: _bindgen_ty_14 = 43;
+pub const AMOTION_EVENT_AXIS_GENERIC_13: _bindgen_ty_14 = 44;
+pub const AMOTION_EVENT_AXIS_GENERIC_14: _bindgen_ty_14 = 45;
+pub const AMOTION_EVENT_AXIS_GENERIC_15: _bindgen_ty_14 = 46;
+pub const AMOTION_EVENT_AXIS_GENERIC_16: _bindgen_ty_14 = 47;
 pub type _bindgen_ty_14 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_BUTTON_PRIMARY: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_BUTTON_SECONDARY: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_BUTTON_TERTIARY: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_BUTTON_BACK: ::std::os::raw::c_uint = 8;
-pub const AMOTION_EVENT_BUTTON_FORWARD: ::std::os::raw::c_uint = 16;
-pub const AMOTION_EVENT_BUTTON_STYLUS_PRIMARY: ::std::os::raw::c_uint = 32;
-pub const AMOTION_EVENT_BUTTON_STYLUS_SECONDARY: ::std::os::raw::c_uint = 64;
+pub const AMOTION_EVENT_BUTTON_PRIMARY: _bindgen_ty_15 = 1;
+pub const AMOTION_EVENT_BUTTON_SECONDARY: _bindgen_ty_15 = 2;
+pub const AMOTION_EVENT_BUTTON_TERTIARY: _bindgen_ty_15 = 4;
+pub const AMOTION_EVENT_BUTTON_BACK: _bindgen_ty_15 = 8;
+pub const AMOTION_EVENT_BUTTON_FORWARD: _bindgen_ty_15 = 16;
+pub const AMOTION_EVENT_BUTTON_STYLUS_PRIMARY: _bindgen_ty_15 = 32;
+pub const AMOTION_EVENT_BUTTON_STYLUS_SECONDARY: _bindgen_ty_15 = 64;
 pub type _bindgen_ty_15 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_TOOL_TYPE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_TOOL_TYPE_FINGER: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_TOOL_TYPE_STYLUS: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_TOOL_TYPE_MOUSE: ::std::os::raw::c_uint = 3;
-pub const AMOTION_EVENT_TOOL_TYPE_ERASER: ::std::os::raw::c_uint = 4;
+pub const AMOTION_EVENT_TOOL_TYPE_UNKNOWN: _bindgen_ty_16 = 0;
+pub const AMOTION_EVENT_TOOL_TYPE_FINGER: _bindgen_ty_16 = 1;
+pub const AMOTION_EVENT_TOOL_TYPE_STYLUS: _bindgen_ty_16 = 2;
+pub const AMOTION_EVENT_TOOL_TYPE_MOUSE: _bindgen_ty_16 = 3;
+pub const AMOTION_EVENT_TOOL_TYPE_ERASER: _bindgen_ty_16 = 4;
+pub const AMOTION_EVENT_TOOL_TYPE_PALM: _bindgen_ty_16 = 5;
 pub type _bindgen_ty_16 = ::std::os::raw::c_uint;
-pub const AINPUT_SOURCE_CLASS_MASK: ::std::os::raw::c_uint = 255;
-pub const AINPUT_SOURCE_CLASS_NONE: ::std::os::raw::c_uint = 0;
-pub const AINPUT_SOURCE_CLASS_BUTTON: ::std::os::raw::c_uint = 1;
-pub const AINPUT_SOURCE_CLASS_POINTER: ::std::os::raw::c_uint = 2;
-pub const AINPUT_SOURCE_CLASS_NAVIGATION: ::std::os::raw::c_uint = 4;
-pub const AINPUT_SOURCE_CLASS_POSITION: ::std::os::raw::c_uint = 8;
-pub const AINPUT_SOURCE_CLASS_JOYSTICK: ::std::os::raw::c_uint = 16;
+pub const AMotionClassification_AMOTION_EVENT_CLASSIFICATION_NONE: AMotionClassification = 0;
+pub const AMotionClassification_AMOTION_EVENT_CLASSIFICATION_AMBIGUOUS_GESTURE:
+    AMotionClassification = 1;
+pub const AMotionClassification_AMOTION_EVENT_CLASSIFICATION_DEEP_PRESS: AMotionClassification = 2;
+pub type AMotionClassification = u32;
+pub const AINPUT_SOURCE_CLASS_MASK: _bindgen_ty_17 = 255;
+pub const AINPUT_SOURCE_CLASS_NONE: _bindgen_ty_17 = 0;
+pub const AINPUT_SOURCE_CLASS_BUTTON: _bindgen_ty_17 = 1;
+pub const AINPUT_SOURCE_CLASS_POINTER: _bindgen_ty_17 = 2;
+pub const AINPUT_SOURCE_CLASS_NAVIGATION: _bindgen_ty_17 = 4;
+pub const AINPUT_SOURCE_CLASS_POSITION: _bindgen_ty_17 = 8;
+pub const AINPUT_SOURCE_CLASS_JOYSTICK: _bindgen_ty_17 = 16;
 pub type _bindgen_ty_17 = ::std::os::raw::c_uint;
-pub const AINPUT_SOURCE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AINPUT_SOURCE_KEYBOARD: ::std::os::raw::c_uint = 257;
-pub const AINPUT_SOURCE_DPAD: ::std::os::raw::c_uint = 513;
-pub const AINPUT_SOURCE_GAMEPAD: ::std::os::raw::c_uint = 1025;
-pub const AINPUT_SOURCE_TOUCHSCREEN: ::std::os::raw::c_uint = 4098;
-pub const AINPUT_SOURCE_MOUSE: ::std::os::raw::c_uint = 8194;
-pub const AINPUT_SOURCE_STYLUS: ::std::os::raw::c_uint = 16386;
-pub const AINPUT_SOURCE_BLUETOOTH_STYLUS: ::std::os::raw::c_uint = 49154;
-pub const AINPUT_SOURCE_TRACKBALL: ::std::os::raw::c_uint = 65540;
-pub const AINPUT_SOURCE_MOUSE_RELATIVE: ::std::os::raw::c_uint = 131076;
-pub const AINPUT_SOURCE_TOUCHPAD: ::std::os::raw::c_uint = 1048584;
-pub const AINPUT_SOURCE_TOUCH_NAVIGATION: ::std::os::raw::c_uint = 2097152;
-pub const AINPUT_SOURCE_JOYSTICK: ::std::os::raw::c_uint = 16777232;
-pub const AINPUT_SOURCE_ROTARY_ENCODER: ::std::os::raw::c_uint = 4194304;
-pub const AINPUT_SOURCE_ANY: ::std::os::raw::c_uint = 4294967040;
+pub const AINPUT_SOURCE_UNKNOWN: _bindgen_ty_18 = 0;
+pub const AINPUT_SOURCE_KEYBOARD: _bindgen_ty_18 = 257;
+pub const AINPUT_SOURCE_DPAD: _bindgen_ty_18 = 513;
+pub const AINPUT_SOURCE_GAMEPAD: _bindgen_ty_18 = 1025;
+pub const AINPUT_SOURCE_TOUCHSCREEN: _bindgen_ty_18 = 4098;
+pub const AINPUT_SOURCE_MOUSE: _bindgen_ty_18 = 8194;
+pub const AINPUT_SOURCE_STYLUS: _bindgen_ty_18 = 16386;
+pub const AINPUT_SOURCE_BLUETOOTH_STYLUS: _bindgen_ty_18 = 49154;
+pub const AINPUT_SOURCE_TRACKBALL: _bindgen_ty_18 = 65540;
+pub const AINPUT_SOURCE_MOUSE_RELATIVE: _bindgen_ty_18 = 131076;
+pub const AINPUT_SOURCE_TOUCHPAD: _bindgen_ty_18 = 1048584;
+pub const AINPUT_SOURCE_TOUCH_NAVIGATION: _bindgen_ty_18 = 2097152;
+pub const AINPUT_SOURCE_JOYSTICK: _bindgen_ty_18 = 16777232;
+pub const AINPUT_SOURCE_HDMI: _bindgen_ty_18 = 33554433;
+pub const AINPUT_SOURCE_SENSOR: _bindgen_ty_18 = 67108864;
+pub const AINPUT_SOURCE_ROTARY_ENCODER: _bindgen_ty_18 = 4194304;
+pub const AINPUT_SOURCE_ANY: _bindgen_ty_18 = 4294967040;
 pub type _bindgen_ty_18 = ::std::os::raw::c_uint;
-pub const AINPUT_KEYBOARD_TYPE_NONE: ::std::os::raw::c_uint = 0;
-pub const AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC: ::std::os::raw::c_uint = 1;
-pub const AINPUT_KEYBOARD_TYPE_ALPHABETIC: ::std::os::raw::c_uint = 2;
+pub const AINPUT_KEYBOARD_TYPE_NONE: _bindgen_ty_19 = 0;
+pub const AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC: _bindgen_ty_19 = 1;
+pub const AINPUT_KEYBOARD_TYPE_ALPHABETIC: _bindgen_ty_19 = 2;
 pub type _bindgen_ty_19 = ::std::os::raw::c_uint;
-pub const AINPUT_MOTION_RANGE_X: ::std::os::raw::c_uint = 0;
-pub const AINPUT_MOTION_RANGE_Y: ::std::os::raw::c_uint = 1;
-pub const AINPUT_MOTION_RANGE_PRESSURE: ::std::os::raw::c_uint = 2;
-pub const AINPUT_MOTION_RANGE_SIZE: ::std::os::raw::c_uint = 3;
-pub const AINPUT_MOTION_RANGE_TOUCH_MAJOR: ::std::os::raw::c_uint = 4;
-pub const AINPUT_MOTION_RANGE_TOUCH_MINOR: ::std::os::raw::c_uint = 5;
-pub const AINPUT_MOTION_RANGE_TOOL_MAJOR: ::std::os::raw::c_uint = 6;
-pub const AINPUT_MOTION_RANGE_TOOL_MINOR: ::std::os::raw::c_uint = 7;
-pub const AINPUT_MOTION_RANGE_ORIENTATION: ::std::os::raw::c_uint = 8;
+pub const AINPUT_MOTION_RANGE_X: _bindgen_ty_20 = 0;
+pub const AINPUT_MOTION_RANGE_Y: _bindgen_ty_20 = 1;
+pub const AINPUT_MOTION_RANGE_PRESSURE: _bindgen_ty_20 = 2;
+pub const AINPUT_MOTION_RANGE_SIZE: _bindgen_ty_20 = 3;
+pub const AINPUT_MOTION_RANGE_TOUCH_MAJOR: _bindgen_ty_20 = 4;
+pub const AINPUT_MOTION_RANGE_TOUCH_MINOR: _bindgen_ty_20 = 5;
+pub const AINPUT_MOTION_RANGE_TOOL_MAJOR: _bindgen_ty_20 = 6;
+pub const AINPUT_MOTION_RANGE_TOOL_MINOR: _bindgen_ty_20 = 7;
+pub const AINPUT_MOTION_RANGE_ORIENTATION: _bindgen_ty_20 = 8;
 pub type _bindgen_ty_20 = ::std::os::raw::c_uint;
 extern "C" {
     pub fn AInputEvent_getType(event: *const AInputEvent) -> i32;
@@ -1407,6 +1595,9 @@ extern "C" {
 extern "C" {
     pub fn AInputEvent_getSource(event: *const AInputEvent) -> i32;
 }
+extern "C" {
+    pub fn AInputEvent_release(event: *const AInputEvent);
+}
 extern "C" {
     pub fn AKeyEvent_getAction(key_event: *const AInputEvent) -> i32;
 }
@@ -1431,6 +1622,9 @@ extern "C" {
 extern "C" {
     pub fn AKeyEvent_getEventTime(key_event: *const AInputEvent) -> i64;
 }
+extern "C" {
+    pub fn AKeyEvent_fromJava(env: *mut JNIEnv, keyEvent: jobject) -> *const AInputEvent;
+}
 extern "C" {
     pub fn AMotionEvent_getAction(motion_event: *const AInputEvent) -> i32;
 }
@@ -1465,168 +1659,169 @@ extern "C" {
     pub fn AMotionEvent_getYPrecision(motion_event: *const AInputEvent) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getPointerCount(motion_event: *const AInputEvent) -> size_t;
+    pub fn AMotionEvent_getPointerCount(motion_event: *const AInputEvent) -> usize;
 }
 extern "C" {
-    pub fn AMotionEvent_getPointerId(
-        motion_event: *const AInputEvent,
-        pointer_index: size_t,
-    ) -> i32;
+    pub fn AMotionEvent_getPointerId(motion_event: *const AInputEvent, pointer_index: usize)
+        -> i32;
 }
 extern "C" {
-    pub fn AMotionEvent_getToolType(motion_event: *const AInputEvent, pointer_index: size_t)
-        -> i32;
+    pub fn AMotionEvent_getToolType(motion_event: *const AInputEvent, pointer_index: usize) -> i32;
 }
 extern "C" {
-    pub fn AMotionEvent_getRawX(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getRawX(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getRawY(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getRawY(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getX(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getX(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getY(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getY(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getPressure(motion_event: *const AInputEvent, pointer_index: size_t)
-        -> f32;
+    pub fn AMotionEvent_getPressure(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getSize(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getSize(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getTouchMajor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getTouchMinor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getToolMajor(
-        motion_event: *const AInputEvent,
-        pointer_index: size_t,
-    ) -> f32;
+    pub fn AMotionEvent_getToolMajor(motion_event: *const AInputEvent, pointer_index: usize)
+        -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getToolMinor(
-        motion_event: *const AInputEvent,
-        pointer_index: size_t,
-    ) -> f32;
+    pub fn AMotionEvent_getToolMinor(motion_event: *const AInputEvent, pointer_index: usize)
+        -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getOrientation(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getAxisValue(
         motion_event: *const AInputEvent,
         axis: i32,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getHistorySize(motion_event: *const AInputEvent) -> size_t;
+    pub fn AMotionEvent_getHistorySize(motion_event: *const AInputEvent) -> usize;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalEventTime(
         motion_event: *const AInputEvent,
-        history_index: size_t,
+        history_index: usize,
     ) -> i64;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalRawX(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalRawY(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalX(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalY(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalPressure(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalSize(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalTouchMajor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalTouchMinor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalToolMajor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalToolMinor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalOrientation(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalAxisValue(
         motion_event: *const AInputEvent,
         axis: i32,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
+extern "C" {
+    pub fn AMotionEvent_getActionButton(motion_event: *const AInputEvent) -> i32;
+}
+extern "C" {
+    pub fn AMotionEvent_getClassification(motion_event: *const AInputEvent) -> i32;
+}
+extern "C" {
+    pub fn AMotionEvent_fromJava(env: *mut JNIEnv, motionEvent: jobject) -> *const AInputEvent;
+}
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct AInputQueue {
@@ -1660,6 +1855,9 @@ extern "C" {
         handled: ::std::os::raw::c_int,
     );
 }
+extern "C" {
+    pub fn AInputQueue_fromJava(env: *mut JNIEnv, inputQueue: jobject) -> *mut AInputQueue;
+}
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct imaxdiv_t {
@@ -1668,6 +1866,8 @@ pub struct imaxdiv_t {
 }
 #[test]
 fn bindgen_test_layout_imaxdiv_t() {
+    const UNINIT: ::std::mem::MaybeUninit<imaxdiv_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<imaxdiv_t>(),
         16usize,
@@ -1679,7 +1879,7 @@ fn bindgen_test_layout_imaxdiv_t() {
         concat!("Alignment of ", stringify!(imaxdiv_t))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<imaxdiv_t>())).quot as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).quot) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1689,7 +1889,7 @@ fn bindgen_test_layout_imaxdiv_t() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<imaxdiv_t>())).rem as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rem) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -1734,11 +1934,52 @@ extern "C" {
     ) -> uintmax_t;
 }
 pub const ADataSpace_ADATASPACE_UNKNOWN: ADataSpace = 0;
+pub const ADataSpace_STANDARD_MASK: ADataSpace = 4128768;
+pub const ADataSpace_STANDARD_UNSPECIFIED: ADataSpace = 0;
+pub const ADataSpace_STANDARD_BT709: ADataSpace = 65536;
+pub const ADataSpace_STANDARD_BT601_625: ADataSpace = 131072;
+pub const ADataSpace_STANDARD_BT601_625_UNADJUSTED: ADataSpace = 196608;
+pub const ADataSpace_STANDARD_BT601_525: ADataSpace = 262144;
+pub const ADataSpace_STANDARD_BT601_525_UNADJUSTED: ADataSpace = 327680;
+pub const ADataSpace_STANDARD_BT2020: ADataSpace = 393216;
+pub const ADataSpace_STANDARD_BT2020_CONSTANT_LUMINANCE: ADataSpace = 458752;
+pub const ADataSpace_STANDARD_BT470M: ADataSpace = 524288;
+pub const ADataSpace_STANDARD_FILM: ADataSpace = 589824;
+pub const ADataSpace_STANDARD_DCI_P3: ADataSpace = 655360;
+pub const ADataSpace_STANDARD_ADOBE_RGB: ADataSpace = 720896;
+pub const ADataSpace_TRANSFER_MASK: ADataSpace = 130023424;
+pub const ADataSpace_TRANSFER_UNSPECIFIED: ADataSpace = 0;
+pub const ADataSpace_TRANSFER_LINEAR: ADataSpace = 4194304;
+pub const ADataSpace_TRANSFER_SRGB: ADataSpace = 8388608;
+pub const ADataSpace_TRANSFER_SMPTE_170M: ADataSpace = 12582912;
+pub const ADataSpace_TRANSFER_GAMMA2_2: ADataSpace = 16777216;
+pub const ADataSpace_TRANSFER_GAMMA2_6: ADataSpace = 20971520;
+pub const ADataSpace_TRANSFER_GAMMA2_8: ADataSpace = 25165824;
+pub const ADataSpace_TRANSFER_ST2084: ADataSpace = 29360128;
+pub const ADataSpace_TRANSFER_HLG: ADataSpace = 33554432;
+pub const ADataSpace_RANGE_MASK: ADataSpace = 939524096;
+pub const ADataSpace_RANGE_UNSPECIFIED: ADataSpace = 0;
+pub const ADataSpace_RANGE_FULL: ADataSpace = 134217728;
+pub const ADataSpace_RANGE_LIMITED: ADataSpace = 268435456;
+pub const ADataSpace_RANGE_EXTENDED: ADataSpace = 402653184;
 pub const ADataSpace_ADATASPACE_SCRGB_LINEAR: ADataSpace = 406913024;
 pub const ADataSpace_ADATASPACE_SRGB: ADataSpace = 142671872;
 pub const ADataSpace_ADATASPACE_SCRGB: ADataSpace = 411107328;
 pub const ADataSpace_ADATASPACE_DISPLAY_P3: ADataSpace = 143261696;
 pub const ADataSpace_ADATASPACE_BT2020_PQ: ADataSpace = 163971072;
+pub const ADataSpace_ADATASPACE_BT2020_ITU_PQ: ADataSpace = 298188800;
+pub const ADataSpace_ADATASPACE_ADOBE_RGB: ADataSpace = 151715840;
+pub const ADataSpace_ADATASPACE_JFIF: ADataSpace = 146931712;
+pub const ADataSpace_ADATASPACE_BT601_625: ADataSpace = 281149440;
+pub const ADataSpace_ADATASPACE_BT601_525: ADataSpace = 281280512;
+pub const ADataSpace_ADATASPACE_BT2020: ADataSpace = 147193856;
+pub const ADataSpace_ADATASPACE_BT709: ADataSpace = 281083904;
+pub const ADataSpace_ADATASPACE_DCI_P3: ADataSpace = 155844608;
+pub const ADataSpace_ADATASPACE_SRGB_LINEAR: ADataSpace = 138477568;
+pub const ADataSpace_ADATASPACE_BT2020_HLG: ADataSpace = 168165376;
+pub const ADataSpace_ADATASPACE_BT2020_ITU_HLG: ADataSpace = 302383104;
+pub const ADataSpace_DEPTH: ADataSpace = 4096;
+pub const ADataSpace_DYNAMIC_DEPTH: ADataSpace = 4098;
 pub type ADataSpace = ::std::os::raw::c_uint;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM: AHardwareBuffer_Format = 1;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM: AHardwareBuffer_Format = 2;
@@ -1758,6 +1999,8 @@ pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT: AHard
     52;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer_Format = 53;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = 35;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_YCbCr_P010: AHardwareBuffer_Format = 54;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8_UNORM: AHardwareBuffer_Format = 56;
 pub type AHardwareBuffer_Format = ::std::os::raw::c_uint;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_NEVER:
     AHardwareBuffer_UsageFlags = 0;
@@ -1850,6 +2093,8 @@ pub struct AHardwareBuffer_Desc {
 }
 #[test]
 fn bindgen_test_layout_AHardwareBuffer_Desc() {
+    const UNINIT: ::std::mem::MaybeUninit<AHardwareBuffer_Desc> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Desc>(),
         40usize,
@@ -1861,7 +2106,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         concat!("Alignment of ", stringify!(AHardwareBuffer_Desc))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).width as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).width) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1871,7 +2116,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).height as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).height) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -1881,7 +2126,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).layers as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).layers) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -1891,7 +2136,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).format as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).format) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -1901,7 +2146,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).usage as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).usage) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -1911,7 +2156,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).stride as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).stride) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -1921,7 +2166,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).rfu0 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rfu0) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -1931,7 +2176,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).rfu1 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rfu1) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -1950,6 +2195,9 @@ pub struct AHardwareBuffer_Plane {
 }
 #[test]
 fn bindgen_test_layout_AHardwareBuffer_Plane() {
+    const UNINIT: ::std::mem::MaybeUninit<AHardwareBuffer_Plane> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Plane>(),
         12usize,
@@ -1961,7 +2209,7 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
         concat!("Alignment of ", stringify!(AHardwareBuffer_Plane))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Plane>())).data as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1971,9 +2219,7 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<AHardwareBuffer_Plane>())).pixelStride as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).pixelStride) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -1983,7 +2229,7 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Plane>())).rowStride as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rowStride) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -2001,6 +2247,9 @@ pub struct AHardwareBuffer_Planes {
 }
 #[test]
 fn bindgen_test_layout_AHardwareBuffer_Planes() {
+    const UNINIT: ::std::mem::MaybeUninit<AHardwareBuffer_Planes> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Planes>(),
         52usize,
@@ -2012,9 +2261,7 @@ fn bindgen_test_layout_AHardwareBuffer_Planes() {
         concat!("Alignment of ", stringify!(AHardwareBuffer_Planes))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<AHardwareBuffer_Planes>())).planeCount as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).planeCount) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -2024,7 +2271,7 @@ fn bindgen_test_layout_AHardwareBuffer_Planes() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Planes>())).planes as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).planes) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -2066,15 +2313,6 @@ extern "C" {
         outVirtualAddress: *mut *mut ::std::os::raw::c_void,
     ) -> ::std::os::raw::c_int;
 }
-extern "C" {
-    pub fn AHardwareBuffer_lockPlanes(
-        buffer: *mut AHardwareBuffer,
-        usage: u64,
-        fence: i32,
-        rect: *const ARect,
-        outPlanes: *mut AHardwareBuffer_Planes,
-    ) -> ::std::os::raw::c_int;
-}
 extern "C" {
     pub fn AHardwareBuffer_unlock(
         buffer: *mut AHardwareBuffer,
@@ -2093,6 +2331,15 @@ extern "C" {
         outBuffer: *mut *mut AHardwareBuffer,
     ) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn AHardwareBuffer_lockPlanes(
+        buffer: *mut AHardwareBuffer,
+        usage: u64,
+        fence: i32,
+        rect: *const ARect,
+        outPlanes: *mut AHardwareBuffer_Planes,
+    ) -> ::std::os::raw::c_int;
+}
 extern "C" {
     pub fn AHardwareBuffer_isSupported(desc: *const AHardwareBuffer_Desc) -> ::std::os::raw::c_int;
 }
@@ -2107,808 +2354,357 @@ extern "C" {
         outBytesPerStride: *mut i32,
     ) -> ::std::os::raw::c_int;
 }
-pub type va_list = u32;
-pub type __gnuc_va_list = u32;
+extern "C" {
+    pub fn AHardwareBuffer_getId(
+        buffer: *const AHardwareBuffer,
+        outId: *mut u64,
+    ) -> ::std::os::raw::c_int;
+}
+#[doc = " \\brief Describe information about a pointer, found in a\n GameActivityMotionEvent.\n\n You can read values directly from this structure, or use helper functions\n (`GameActivityPointerAxes_getX`, `GameActivityPointerAxes_getY` and\n `GameActivityPointerAxes_getAxisValue`).\n\n The X axis and Y axis are enabled by default but any other axis that you want\n to read **must** be enabled first, using\n `GameActivityPointerAxes_enableAxis`.\n\n \\see GameActivityMotionEvent"]
 #[repr(C)]
-pub struct JavaVMAttachArgs {
-    pub version: jint,
-    pub name: *const ::std::os::raw::c_char,
-    pub group: jobject,
+#[derive(Debug, Copy, Clone)]
+pub struct GameActivityPointerAxes {
+    pub id: i32,
+    pub toolType: i32,
+    pub axisValues: [f32; 48usize],
+    pub rawX: f32,
+    pub rawY: f32,
 }
 #[test]
-fn bindgen_test_layout_JavaVMAttachArgs() {
+fn bindgen_test_layout_GameActivityPointerAxes() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityPointerAxes> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<JavaVMAttachArgs>(),
-        12usize,
-        concat!("Size of: ", stringify!(JavaVMAttachArgs))
+        ::std::mem::size_of::<GameActivityPointerAxes>(),
+        208usize,
+        concat!("Size of: ", stringify!(GameActivityPointerAxes))
     );
     assert_eq!(
-        ::std::mem::align_of::<JavaVMAttachArgs>(),
+        ::std::mem::align_of::<GameActivityPointerAxes>(),
         4usize,
-        concat!("Alignment of ", stringify!(JavaVMAttachArgs))
+        concat!("Alignment of ", stringify!(GameActivityPointerAxes))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMAttachArgs>())).version as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(version)
+            stringify!(id)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMAttachArgs>())).name as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).toolType) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(name)
+            stringify!(toolType)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMAttachArgs>())).group as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).axisValues) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(group)
+            stringify!(axisValues)
         )
     );
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct JavaVMOption {
-    pub optionString: *const ::std::os::raw::c_char,
-    pub extraInfo: *mut ::std::os::raw::c_void,
-}
-#[test]
-fn bindgen_test_layout_JavaVMOption() {
     assert_eq!(
-        ::std::mem::size_of::<JavaVMOption>(),
-        8usize,
-        concat!("Size of: ", stringify!(JavaVMOption))
+        unsafe { ::std::ptr::addr_of!((*ptr).rawX) as usize - ptr as usize },
+        200usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityPointerAxes),
+            "::",
+            stringify!(rawX)
+        )
     );
     assert_eq!(
-        ::std::mem::align_of::<JavaVMOption>(),
-        4usize,
-        concat!("Alignment of ", stringify!(JavaVMOption))
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMOption>())).optionString as *const _ as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMOption),
-            "::",
-            stringify!(optionString)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMOption>())).extraInfo as *const _ as usize },
-        4usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).rawY) as usize - ptr as usize },
+        204usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMOption),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(extraInfo)
+            stringify!(rawY)
         )
     );
 }
-#[repr(C)]
-pub struct JavaVMInitArgs {
-    pub version: jint,
-    pub nOptions: jint,
-    pub options: *mut JavaVMOption,
-    pub ignoreUnrecognized: jboolean,
-}
-#[test]
-fn bindgen_test_layout_JavaVMInitArgs() {
-    assert_eq!(
-        ::std::mem::size_of::<JavaVMInitArgs>(),
-        16usize,
-        concat!("Size of: ", stringify!(JavaVMInitArgs))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<JavaVMInitArgs>(),
-        4usize,
-        concat!("Alignment of ", stringify!(JavaVMInitArgs))
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMInitArgs>())).version as *const _ as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(version)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMInitArgs>())).nOptions as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(nOptions)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMInitArgs>())).options as *const _ as usize },
-        8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(options)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<JavaVMInitArgs>())).ignoreUnrecognized as *const _ as usize
-        },
-        12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(ignoreUnrecognized)
-        )
-    );
+extern "C" {
+    #[doc = " \\brief Enable the specified axis, so that its value is reported in the\n GameActivityPointerAxes structures stored in a motion event.\n\n You must enable any axis that you want to read, apart from\n `AMOTION_EVENT_AXIS_X` and `AMOTION_EVENT_AXIS_Y` that are enabled by\n default.\n\n If the axis index is out of range, nothing is done."]
+    pub fn GameActivityPointerAxes_enableAxis(axis: i32);
 }
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
-    GameCommonInsetsType = 3;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
-#[doc = " The type of a component for which to retrieve insets. See"]
-#[doc = " https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
-pub type GameCommonInsetsType = ::std::os::raw::c_uint;
-#[doc = " This struct holds a span within a region of text from start (inclusive) to"]
-#[doc = " end (exclusive). An empty span or cursor position is specified with"]
-#[doc = " start==end. An undefined span is specified with start = end = SPAN_UNDEFINED."]
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameTextInputSpan {
-    #[doc = " The start of the region (inclusive)."]
-    pub start: i32,
-    #[doc = " The end of the region (exclusive)."]
-    pub end: i32,
+extern "C" {
+    #[doc = " \\brief Disable the specified axis. Its value won't be reported in the\n GameActivityPointerAxes structures stored in a motion event anymore.\n\n Apart from X and Y, any axis that you want to read **must** be enabled first,\n using `GameActivityPointerAxes_enableAxis`.\n\n If the axis index is out of range, nothing is done."]
+    pub fn GameActivityPointerAxes_disableAxis(axis: i32);
 }
-#[test]
-fn bindgen_test_layout_GameTextInputSpan() {
-    assert_eq!(
-        ::std::mem::size_of::<GameTextInputSpan>(),
-        8usize,
-        concat!("Size of: ", stringify!(GameTextInputSpan))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<GameTextInputSpan>(),
-        4usize,
-        concat!("Alignment of ", stringify!(GameTextInputSpan))
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputSpan>())).start as *const _ as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputSpan),
-            "::",
-            stringify!(start)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputSpan>())).end as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputSpan),
-            "::",
-            stringify!(end)
-        )
-    );
+extern "C" {
+    #[doc = " \\brief Get the value of the requested axis.\n\n Apart from X and Y, any axis that you want to read **must** be enabled first,\n using `GameActivityPointerAxes_enableAxis`.\n\n Find the valid enums for the axis (`AMOTION_EVENT_AXIS_X`,\n `AMOTION_EVENT_AXIS_Y`, `AMOTION_EVENT_AXIS_PRESSURE`...)\n in https://developer.android.com/ndk/reference/group/input.\n\n @param pointerInfo The structure containing information about the pointer,\n obtained from GameActivityMotionEvent.\n @param axis The axis to get the value from\n @return The value of the axis, or 0 if the axis is invalid or was not\n enabled."]
+    pub fn GameActivityPointerAxes_getAxisValue(
+        pointerInfo: *const GameActivityPointerAxes,
+        axis: i32,
+    ) -> f32;
 }
-pub const GameTextInputSpanFlag_SPAN_UNDEFINED: GameTextInputSpanFlag = -1;
-#[doc = " Values with special meaning in a GameTextInputSpan."]
-pub type GameTextInputSpanFlag = ::std::os::raw::c_int;
-#[doc = " This struct holds the state of an editable section of text."]
-#[doc = " The text can have a selection and a composing region defined on it."]
-#[doc = " A composing region is used by IMEs that allow input using multiple steps to"]
-#[doc = " compose a glyph or word. Use functions GameTextInput_getState and"]
-#[doc = " GameTextInput_setState to read and modify the state that an IME is editing."]
+#[doc = " \\brief Describe a motion event that happened on the GameActivity SurfaceView.\n\n This is 1:1 mapping to the information contained in a Java `MotionEvent`\n (see https://developer.android.com/reference/android/view/MotionEvent)."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct GameTextInputState {
-    #[doc = " Text owned by the state, as a modified UTF-8 string. Null-terminated."]
-    #[doc = " https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8"]
-    pub text_UTF8: *const ::std::os::raw::c_char,
-    #[doc = " Length in bytes of text_UTF8, *not* including the null at end."]
-    pub text_length: i32,
-    #[doc = " A selection defined on the text."]
-    pub selection: GameTextInputSpan,
-    #[doc = " A composing region defined on the text."]
-    pub composingRegion: GameTextInputSpan,
+pub struct GameActivityMotionEvent {
+    pub deviceId: i32,
+    pub source: i32,
+    pub action: i32,
+    pub eventTime: i64,
+    pub downTime: i64,
+    pub flags: i32,
+    pub metaState: i32,
+    pub actionButton: i32,
+    pub buttonState: i32,
+    pub classification: i32,
+    pub edgeFlags: i32,
+    pub pointerCount: u32,
+    pub pointers: [GameActivityPointerAxes; 8usize],
+    pub historySize: ::std::os::raw::c_int,
+    pub historicalEventTimesMillis: *mut i64,
+    pub historicalEventTimesNanos: *mut i64,
+    pub historicalAxisValues: *mut f32,
+    pub precisionX: f32,
+    pub precisionY: f32,
 }
 #[test]
-fn bindgen_test_layout_GameTextInputState() {
+fn bindgen_test_layout_GameActivityMotionEvent() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityMotionEvent> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<GameTextInputState>(),
-        24usize,
-        concat!("Size of: ", stringify!(GameTextInputState))
+        ::std::mem::size_of::<GameActivityMotionEvent>(),
+        1752usize,
+        concat!("Size of: ", stringify!(GameActivityMotionEvent))
     );
     assert_eq!(
-        ::std::mem::align_of::<GameTextInputState>(),
-        4usize,
-        concat!("Alignment of ", stringify!(GameTextInputState))
+        ::std::mem::align_of::<GameActivityMotionEvent>(),
+        8usize,
+        concat!("Alignment of ", stringify!(GameActivityMotionEvent))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputState>())).text_UTF8 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputState),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(text_UTF8)
+            stringify!(deviceId)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputState>())).text_length as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputState),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(text_length)
+            stringify!(source)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputState>())).selection as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputState),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(selection)
+            stringify!(action)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameTextInputState>())).composingRegion as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(composingRegion)
-        )
-    );
-}
-#[doc = " A callback called by GameTextInput_getState."]
-#[doc = " @param context User-defined context."]
-#[doc = " @param state State, owned by the library, that will be valid for the duration"]
-#[doc = " of the callback."]
-pub type GameTextInputGetStateCallback = ::std::option::Option<
-    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, state: *const GameTextInputState),
->;
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameTextInput {
-    _unused: [u8; 0],
-}
-extern "C" {
-    #[doc = " Initialize the GameTextInput library."]
-    #[doc = " If called twice without GameTextInput_destroy being called, the same pointer"]
-    #[doc = " will be returned and a warning will be issued."]
-    #[doc = " @param env A JNI env valid on the calling thread."]
-    #[doc = " @param max_string_size The maximum length of a string that can be edited. If"]
-    #[doc = " zero, the maximum defaults to 65536 bytes. A buffer of this size is allocated"]
-    #[doc = " at initialization."]
-    #[doc = " @return A handle to the library."]
-    pub fn GameTextInput_init(env: *mut JNIEnv, max_string_size: u32) -> *mut GameTextInput;
-}
-extern "C" {
-    #[doc = " When using GameTextInput, you need to create a gametextinput.InputConnection"]
-    #[doc = " on the Java side and pass it using this function to the library, unless using"]
-    #[doc = " GameActivity in which case this will be done for you. See the GameActivity"]
-    #[doc = " source code or GameTextInput samples for examples of usage."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param inputConnection A gametextinput.InputConnection object."]
-    pub fn GameTextInput_setInputConnection(input: *mut GameTextInput, inputConnection: jobject);
-}
-extern "C" {
-    #[doc = " Unless using GameActivity, it is required to call this function from your"]
-    #[doc = " Java gametextinput.Listener.stateChanged method to convert eventState and"]
-    #[doc = " trigger any event callbacks. When using GameActivity, this does not need to"]
-    #[doc = " be called as event processing is handled by the Activity."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param eventState A Java gametextinput.State object."]
-    pub fn GameTextInput_processEvent(input: *mut GameTextInput, eventState: jobject);
-}
-extern "C" {
-    #[doc = " Free any resources owned by the GameTextInput library."]
-    #[doc = " Any subsequent calls to the library will fail until GameTextInput_init is"]
-    #[doc = " called again."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    pub fn GameTextInput_destroy(input: *mut GameTextInput);
-}
-pub const ShowImeFlags_SHOW_IME_UNDEFINED: ShowImeFlags = 0;
-pub const ShowImeFlags_SHOW_IMPLICIT: ShowImeFlags = 1;
-pub const ShowImeFlags_SHOW_FORCED: ShowImeFlags = 2;
-#[doc = " Flags to be passed to GameTextInput_showIme."]
-pub type ShowImeFlags = ::std::os::raw::c_uint;
-extern "C" {
-    #[doc = " Show the IME. Calls InputMethodManager.showSoftInput()."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param flags Defined in ShowImeFlags above. For more information see:"]
-    #[doc = " https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
-    pub fn GameTextInput_showIme(input: *mut GameTextInput, flags: u32);
-}
-pub const HideImeFlags_HIDE_IME_UNDEFINED: HideImeFlags = 0;
-pub const HideImeFlags_HIDE_IMPLICIT_ONLY: HideImeFlags = 1;
-pub const HideImeFlags_HIDE_NOT_ALWAYS: HideImeFlags = 2;
-#[doc = " Flags to be passed to GameTextInput_hideIme."]
-pub type HideImeFlags = ::std::os::raw::c_uint;
-extern "C" {
-    #[doc = " Show the IME. Calls InputMethodManager.hideSoftInputFromWindow()."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param flags Defined in HideImeFlags above. For more information see:"]
-    #[doc = " https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
-    pub fn GameTextInput_hideIme(input: *mut GameTextInput, flags: u32);
-}
-extern "C" {
-    #[doc = " Call a callback with the current GameTextInput state, which may have been"]
-    #[doc = " modified by changes in the IME and calls to GameTextInput_setState. We use a"]
-    #[doc = " callback rather than returning the state in order to simplify ownership of"]
-    #[doc = " text_UTF8 strings. These strings are only valid during the calling of the"]
-    #[doc = " callback."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param callback A function that will be called with valid state."]
-    #[doc = " @param context Context used by the callback."]
-    pub fn GameTextInput_getState(
-        input: *mut GameTextInput,
-        callback: GameTextInputGetStateCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
-}
-extern "C" {
-    #[doc = " Set the current GameTextInput state. This state is reflected to any active"]
-    #[doc = " IME."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param state The state to set. Ownership is maintained by the caller and must"]
-    #[doc = " remain valid for the duration of the call."]
-    pub fn GameTextInput_setState(input: *mut GameTextInput, state: *const GameTextInputState);
-}
-#[doc = " Type of the callback needed by GameTextInput_setEventCallback that will be"]
-#[doc = " called every time the IME state changes."]
-#[doc = " @param context User-defined context set in GameTextInput_setEventCallback."]
-#[doc = " @param current_state Current IME state, owned by the library and valid during"]
-#[doc = " the callback."]
-pub type GameTextInputEventCallback = ::std::option::Option<
-    unsafe extern "C" fn(
-        context: *mut ::std::os::raw::c_void,
-        current_state: *const GameTextInputState,
-    ),
->;
-extern "C" {
-    #[doc = " Optionally set a callback to be called whenever the IME state changes."]
-    #[doc = " Not necessary if you are using GameActivity, which handles these callbacks"]
-    #[doc = " for you."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param callback Called by the library when the IME state changes."]
-    #[doc = " @param context Context passed as first argument to the callback."]
-    pub fn GameTextInput_setEventCallback(
-        input: *mut GameTextInput,
-        callback: GameTextInputEventCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
-}
-#[doc = " Type of the callback needed by GameTextInput_setImeInsetsCallback that will"]
-#[doc = " be called every time the IME window insets change."]
-#[doc = " @param context User-defined context set in"]
-#[doc = " GameTextInput_setImeWIndowInsetsCallback."]
-#[doc = " @param current_insets Current IME insets, owned by the library and valid"]
-#[doc = " during the callback."]
-pub type GameTextInputImeInsetsCallback = ::std::option::Option<
-    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, current_insets: *const ARect),
->;
-extern "C" {
-    #[doc = " Optionally set a callback to be called whenever the IME insets change."]
-    #[doc = " Not necessary if you are using GameActivity, which handles these callbacks"]
-    #[doc = " for you."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param callback Called by the library when the IME insets change."]
-    #[doc = " @param context Context passed as first argument to the callback."]
-    pub fn GameTextInput_setImeInsetsCallback(
-        input: *mut GameTextInput,
-        callback: GameTextInputImeInsetsCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
-}
-extern "C" {
-    #[doc = " Get the current window insets for the IME."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param insets Filled with the current insets by this function."]
-    pub fn GameTextInput_getImeInsets(input: *const GameTextInput, insets: *mut ARect);
-}
-extern "C" {
-    #[doc = " Unless using GameActivity, it is required to call this function from your"]
-    #[doc = " Java gametextinput.Listener.onImeInsetsChanged method to"]
-    #[doc = " trigger any event callbacks. When using GameActivity, this does not need to"]
-    #[doc = " be called as insets processing is handled by the Activity."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param eventState A Java gametextinput.State object."]
-    pub fn GameTextInput_processImeInsets(input: *mut GameTextInput, insets: *const ARect);
-}
-extern "C" {
-    #[doc = " Convert a GameTextInputState struct to a Java gametextinput.State object."]
-    #[doc = " Don't forget to delete the returned Java local ref when you're done."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param state Input state to convert."]
-    #[doc = " @return A Java object of class gametextinput.State. The caller is required to"]
-    #[doc = " delete this local reference."]
-    pub fn GameTextInputState_toJava(
-        input: *const GameTextInput,
-        state: *const GameTextInputState,
-    ) -> jobject;
-}
-extern "C" {
-    #[doc = " Convert from a Java gametextinput.State object into a C GameTextInputState"]
-    #[doc = " struct."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param state A Java gametextinput.State object."]
-    #[doc = " @param callback A function called with the C struct, valid for the duration"]
-    #[doc = " of the call."]
-    #[doc = " @param context Context passed to the callback."]
-    pub fn GameTextInputState_fromJava(
-        input: *const GameTextInput,
-        state: jobject,
-        callback: GameTextInputGetStateCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
-}
-#[doc = " This structure defines the native side of an android.app.GameActivity."]
-#[doc = " It is created by the framework, and handed to the application's native"]
-#[doc = " code as it is being launched."]
-#[repr(C)]
-pub struct GameActivity {
-    #[doc = " Pointer to the callback function table of the native application."]
-    #[doc = " You can set the functions here to your own callbacks.  The callbacks"]
-    #[doc = " pointer itself here should not be changed; it is allocated and managed"]
-    #[doc = " for you by the framework."]
-    pub callbacks: *mut GameActivityCallbacks,
-    #[doc = " The global handle on the process's Java VM."]
-    pub vm: *mut JavaVM,
-    #[doc = " JNI context for the main thread of the app.  Note that this field"]
-    #[doc = " can ONLY be used from the main thread of the process; that is, the"]
-    #[doc = " thread that calls into the GameActivityCallbacks."]
-    pub env: *mut JNIEnv,
-    #[doc = " The GameActivity object handle."]
-    pub javaGameActivity: jobject,
-    #[doc = " Path to this application's internal data directory."]
-    pub internalDataPath: *const ::std::os::raw::c_char,
-    #[doc = " Path to this application's external (removable/mountable) data directory."]
-    pub externalDataPath: *const ::std::os::raw::c_char,
-    #[doc = " The platform's SDK version code."]
-    pub sdkVersion: i32,
-    #[doc = " This is the native instance of the application.  It is not used by"]
-    #[doc = " the framework, but can be set by the application to its own instance"]
-    #[doc = " state."]
-    pub instance: *mut ::std::os::raw::c_void,
-    #[doc = " Pointer to the Asset Manager instance for the application.  The"]
-    #[doc = " application uses this to access binary assets bundled inside its own .apk"]
-    #[doc = " file."]
-    pub assetManager: *mut AAssetManager,
-    #[doc = " Available starting with Honeycomb: path to the directory containing"]
-    #[doc = " the application's OBB files (if any).  If the app doesn't have any"]
-    #[doc = " OBB files, this directory may not exist."]
-    pub obbPath: *const ::std::os::raw::c_char,
-}
-#[test]
-fn bindgen_test_layout_GameActivity() {
-    assert_eq!(
-        ::std::mem::size_of::<GameActivity>(),
-        40usize,
-        concat!("Size of: ", stringify!(GameActivity))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<GameActivity>(),
-        4usize,
-        concat!("Alignment of ", stringify!(GameActivity))
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).callbacks as *const _ as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(callbacks)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).vm as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(vm)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).env as *const _ as usize },
-        8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(env)
+            stringify!(eventTime)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).javaGameActivity as *const _ as usize },
-        12usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
+        24usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(javaGameActivity)
+            stringify!(downTime)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).internalDataPath as *const _ as usize },
-        16usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
+        32usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(internalDataPath)
+            stringify!(flags)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).externalDataPath as *const _ as usize },
-        20usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
+        36usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(externalDataPath)
+            stringify!(metaState)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).sdkVersion as *const _ as usize },
-        24usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).actionButton) as usize - ptr as usize },
+        40usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(sdkVersion)
+            stringify!(actionButton)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).instance as *const _ as usize },
-        28usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).buttonState) as usize - ptr as usize },
+        44usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(instance)
+            stringify!(buttonState)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).assetManager as *const _ as usize },
-        32usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).classification) as usize - ptr as usize },
+        48usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(assetManager)
+            stringify!(classification)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).obbPath as *const _ as usize },
-        36usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).edgeFlags) as usize - ptr as usize },
+        52usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(obbPath)
+            stringify!(edgeFlags)
         )
     );
-}
-#[doc = " \\brief Describe information about a pointer, found in a"]
-#[doc = " GameActivityMotionEvent."]
-#[doc = ""]
-#[doc = " You can read values directly from this structure, or use helper functions"]
-#[doc = " (`GameActivityPointerAxes_getX`, `GameActivityPointerAxes_getY` and"]
-#[doc = " `GameActivityPointerAxes_getAxisValue`)."]
-#[doc = ""]
-#[doc = " The X axis and Y axis are enabled by default but any other axis that you want"]
-#[doc = " to read **must** be enabled first, using"]
-#[doc = " `GameActivityPointerAxes_enableAxis`."]
-#[doc = ""]
-#[doc = " \\see GameActivityMotionEvent"]
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameActivityPointerAxes {
-    pub id: i32,
-    pub toolType: i32,
-    pub axisValues: [f32; 48usize],
-    pub rawX: f32,
-    pub rawY: f32,
-}
-#[test]
-fn bindgen_test_layout_GameActivityPointerAxes() {
-    assert_eq!(
-        ::std::mem::size_of::<GameActivityPointerAxes>(),
-        208usize,
-        concat!("Size of: ", stringify!(GameActivityPointerAxes))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<GameActivityPointerAxes>(),
-        4usize,
-        concat!("Alignment of ", stringify!(GameActivityPointerAxes))
-    );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityPointerAxes>())).id as *const _ as usize },
-        0usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pointerCount) as usize - ptr as usize },
+        56usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(id)
+            stringify!(pointerCount)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityPointerAxes>())).toolType as *const _ as usize
-        },
-        4usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pointers) as usize - ptr as usize },
+        60usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(toolType)
+            stringify!(pointers)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityPointerAxes>())).axisValues as *const _ as usize
-        },
-        8usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).historySize) as usize - ptr as usize },
+        1724usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(axisValues)
+            stringify!(historySize)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityPointerAxes>())).rawX as *const _ as usize },
-        200usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesMillis) as usize - ptr as usize },
+        1728usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(rawX)
+            stringify!(historicalEventTimesMillis)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityPointerAxes>())).rawY as *const _ as usize },
-        204usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesNanos) as usize - ptr as usize },
+        1732usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(rawY)
+            stringify!(historicalEventTimesNanos)
         )
     );
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameActivityHistoricalPointerAxes {
-    pub eventTime: i64,
-    pub axisValues: [f32; 48usize],
-}
-#[test]
-fn bindgen_test_layout_GameActivityHistoricalPointerAxes() {
-    assert_eq!(
-        ::std::mem::size_of::<GameActivityHistoricalPointerAxes>(),
-        200usize,
-        concat!("Size of: ", stringify!(GameActivityHistoricalPointerAxes))
-    );
     assert_eq!(
-        ::std::mem::align_of::<GameActivityHistoricalPointerAxes>(),
-        8usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).historicalAxisValues) as usize - ptr as usize },
+        1736usize,
         concat!(
-            "Alignment of ",
-            stringify!(GameActivityHistoricalPointerAxes)
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(historicalAxisValues)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityHistoricalPointerAxes>())).eventTime as *const _
-                as usize
-        },
-        0usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).precisionX) as usize - ptr as usize },
+        1740usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityHistoricalPointerAxes),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(eventTime)
+            stringify!(precisionX)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityHistoricalPointerAxes>())).axisValues as *const _
-                as usize
-        },
-        8usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).precisionY) as usize - ptr as usize },
+        1744usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityHistoricalPointerAxes),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(axisValues)
+            stringify!(precisionY)
         )
     );
 }
 extern "C" {
-    #[doc = " \\brief Enable the specified axis, so that its value is reported in the"]
-    #[doc = " GameActivityPointerAxes structures stored in a motion event."]
-    #[doc = ""]
-    #[doc = " You must enable any axis that you want to read, apart from"]
-    #[doc = " `AMOTION_EVENT_AXIS_X` and `AMOTION_EVENT_AXIS_Y` that are enabled by"]
-    #[doc = " default."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityPointerAxes_enableAxis(axis: i32);
-}
-extern "C" {
-    #[doc = " \\brief Disable the specified axis. Its value won't be reported in the"]
-    #[doc = " GameActivityPointerAxes structures stored in a motion event anymore."]
-    #[doc = ""]
-    #[doc = " Apart from X and Y, any axis that you want to read **must** be enabled first,"]
-    #[doc = " using `GameActivityPointerAxes_enableAxis`."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityPointerAxes_disableAxis(axis: i32);
+    pub fn GameActivityMotionEvent_getHistoricalAxisValue(
+        event: *const GameActivityMotionEvent,
+        axis: ::std::os::raw::c_int,
+        pointerIndex: ::std::os::raw::c_int,
+        historyPos: ::std::os::raw::c_int,
+    ) -> f32;
 }
 extern "C" {
-    #[doc = " \\brief Enable the specified axis, so that its value is reported in the"]
-    #[doc = " GameActivityHistoricalPointerAxes structures associated with a motion event."]
-    #[doc = ""]
-    #[doc = " You must enable any axis that you want to read (no axes are enabled by"]
-    #[doc = " default)."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityHistoricalPointerAxes_enableAxis(axis: i32);
+    #[doc = " \\brief Handle the freeing of the GameActivityMotionEvent struct."]
+    pub fn GameActivityMotionEvent_destroy(c_event: *mut GameActivityMotionEvent);
 }
 extern "C" {
-    #[doc = " \\brief Disable the specified axis. Its value won't be reported in the"]
-    #[doc = " GameActivityHistoricalPointerAxes structures associated with motion events"]
-    #[doc = " anymore."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityHistoricalPointerAxes_disableAxis(axis: i32);
+    #[doc = " \\brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`.\n\n This is done automatically by the GameActivity: see `onTouchEvent` to set\n a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
+    pub fn GameActivityMotionEvent_fromJava(
+        env: *mut JNIEnv,
+        motionEvent: jobject,
+        out_event: *mut GameActivityMotionEvent,
+    );
 }
-#[doc = " \\brief Describe a motion event that happened on the GameActivity SurfaceView."]
-#[doc = ""]
-#[doc = " This is 1:1 mapping to the information contained in a Java `MotionEvent`"]
-#[doc = " (see https://developer.android.com/reference/android/view/MotionEvent)."]
+#[doc = " \\brief Describe a key event that happened on the GameActivity SurfaceView.\n\n This is 1:1 mapping to the information contained in a Java `KeyEvent`\n (see https://developer.android.com/reference/android/view/KeyEvent).\n The only exception is the event times, which are reported as\n nanoseconds in this struct."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct GameActivityMotionEvent {
+pub struct GameActivityKeyEvent {
     pub deviceId: i32,
     pub source: i32,
     pub action: i32,
@@ -2916,374 +2712,534 @@ pub struct GameActivityMotionEvent {
     pub downTime: i64,
     pub flags: i32,
     pub metaState: i32,
-    pub actionButton: i32,
-    pub buttonState: i32,
-    pub classification: i32,
-    pub edgeFlags: i32,
-    pub pointerCount: u32,
-    pub pointers: [GameActivityPointerAxes; 8usize],
-    pub precisionX: f32,
-    pub precisionY: f32,
-    pub historicalStart: i16,
-    pub historicalCount: i16,
+    pub modifiers: i32,
+    pub repeatCount: i32,
+    pub keyCode: i32,
+    pub scanCode: i32,
+    pub unicodeChar: i32,
 }
 #[test]
-fn bindgen_test_layout_GameActivityMotionEvent() {
+fn bindgen_test_layout_GameActivityKeyEvent() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityKeyEvent> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<GameActivityMotionEvent>(),
-        1736usize,
-        concat!("Size of: ", stringify!(GameActivityMotionEvent))
+        ::std::mem::size_of::<GameActivityKeyEvent>(),
+        64usize,
+        concat!("Size of: ", stringify!(GameActivityKeyEvent))
     );
     assert_eq!(
-        ::std::mem::align_of::<GameActivityMotionEvent>(),
+        ::std::mem::align_of::<GameActivityKeyEvent>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameActivityMotionEvent))
+        concat!("Alignment of ", stringify!(GameActivityKeyEvent))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).deviceId as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
             stringify!(deviceId)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityMotionEvent>())).source as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
             stringify!(source)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityMotionEvent>())).action as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
             stringify!(action)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).eventTime as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
             stringify!(eventTime)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).downTime as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
             stringify!(downTime)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityMotionEvent>())).flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
             stringify!(flags)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).metaState as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
         36usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
             stringify!(metaState)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).actionButton as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).modifiers) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(actionButton)
+            stringify!(modifiers)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).buttonState as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).repeatCount) as usize - ptr as usize },
         44usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(buttonState)
+            stringify!(repeatCount)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).classification as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).keyCode) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(classification)
+            stringify!(keyCode)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).edgeFlags as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).scanCode) as usize - ptr as usize },
         52usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(edgeFlags)
+            stringify!(scanCode)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).pointerCount as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).unicodeChar) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(pointerCount)
+            stringify!(unicodeChar)
+        )
+    );
+}
+extern "C" {
+    #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.\n\n This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`\n to set a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
+    pub fn GameActivityKeyEvent_fromJava(
+        env: *mut JNIEnv,
+        motionEvent: jobject,
+        out_event: *mut GameActivityKeyEvent,
+    );
+}
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
+    GameCommonInsetsType = 3;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
+#[doc = " The type of a component for which to retrieve insets. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
+pub type GameCommonInsetsType = ::std::os::raw::c_uint;
+#[doc = " This struct holds a span within a region of text from start (inclusive) to\n end (exclusive). An empty span or cursor position is specified with\n start==end. An undefined span is specified with start = end = SPAN_UNDEFINED."]
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct GameTextInputSpan {
+    #[doc = " The start of the region (inclusive)."]
+    pub start: i32,
+    #[doc = " The end of the region (exclusive)."]
+    pub end: i32,
+}
+#[test]
+fn bindgen_test_layout_GameTextInputSpan() {
+    const UNINIT: ::std::mem::MaybeUninit<GameTextInputSpan> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<GameTextInputSpan>(),
+        8usize,
+        concat!("Size of: ", stringify!(GameTextInputSpan))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<GameTextInputSpan>(),
+        4usize,
+        concat!("Alignment of ", stringify!(GameTextInputSpan))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).start) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameTextInputSpan),
+            "::",
+            stringify!(start)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).pointers as *const _ as usize
-        },
-        60usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).end) as usize - ptr as usize },
+        4usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameTextInputSpan),
             "::",
-            stringify!(pointers)
+            stringify!(end)
         )
     );
+}
+pub const GameTextInputSpanFlag_SPAN_UNDEFINED: GameTextInputSpanFlag = -1;
+#[doc = " Values with special meaning in a GameTextInputSpan."]
+pub type GameTextInputSpanFlag = ::std::os::raw::c_int;
+#[doc = " This struct holds the state of an editable section of text.\n The text can have a selection and a composing region defined on it.\n A composing region is used by IMEs that allow input using multiple steps to\n compose a glyph or word. Use functions GameTextInput_getState and\n GameTextInput_setState to read and modify the state that an IME is editing."]
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct GameTextInputState {
+    #[doc = " Text owned by the state, as a modified UTF-8 string. Null-terminated.\n https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8"]
+    pub text_UTF8: *const ::std::os::raw::c_char,
+    #[doc = " Length in bytes of text_UTF8, *not* including the null at end."]
+    pub text_length: i32,
+    #[doc = " A selection defined on the text."]
+    pub selection: GameTextInputSpan,
+    #[doc = " A composing region defined on the text."]
+    pub composingRegion: GameTextInputSpan,
+}
+#[test]
+fn bindgen_test_layout_GameTextInputState() {
+    const UNINIT: ::std::mem::MaybeUninit<GameTextInputState> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<GameTextInputState>(),
+        24usize,
+        concat!("Size of: ", stringify!(GameTextInputState))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<GameTextInputState>(),
+        4usize,
+        concat!("Alignment of ", stringify!(GameTextInputState))
+    );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).precisionX as *const _ as usize
-        },
-        1724usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).text_UTF8) as usize - ptr as usize },
+        0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(precisionX)
+            stringify!(text_UTF8)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).precisionY as *const _ as usize
-        },
-        1728usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).text_length) as usize - ptr as usize },
+        4usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(precisionY)
+            stringify!(text_length)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).historicalStart as *const _ as usize
-        },
-        1732usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).selection) as usize - ptr as usize },
+        8usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(historicalStart)
+            stringify!(selection)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).historicalCount as *const _ as usize
-        },
-        1734usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).composingRegion) as usize - ptr as usize },
+        16usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(historicalCount)
+            stringify!(composingRegion)
         )
     );
 }
-#[doc = " \\brief Describe a key event that happened on the GameActivity SurfaceView."]
-#[doc = ""]
-#[doc = " This is 1:1 mapping to the information contained in a Java `KeyEvent`"]
-#[doc = " (see https://developer.android.com/reference/android/view/KeyEvent)."]
+#[doc = " A callback called by GameTextInput_getState.\n @param context User-defined context.\n @param state State, owned by the library, that will be valid for the duration\n of the callback."]
+pub type GameTextInputGetStateCallback = ::std::option::Option<
+    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, state: *const GameTextInputState),
+>;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct GameActivityKeyEvent {
-    pub deviceId: i32,
-    pub source: i32,
-    pub action: i32,
-    pub eventTime: i64,
-    pub downTime: i64,
-    pub flags: i32,
-    pub metaState: i32,
-    pub modifiers: i32,
-    pub repeatCount: i32,
-    pub keyCode: i32,
-    pub scanCode: i32,
+pub struct GameTextInput {
+    _unused: [u8; 0],
+}
+extern "C" {
+    #[doc = " Initialize the GameTextInput library.\n If called twice without GameTextInput_destroy being called, the same pointer\n will be returned and a warning will be issued.\n @param env A JNI env valid on the calling thread.\n @param max_string_size The maximum length of a string that can be edited. If\n zero, the maximum defaults to 65536 bytes. A buffer of this size is allocated\n at initialization.\n @return A handle to the library."]
+    pub fn GameTextInput_init(env: *mut JNIEnv, max_string_size: u32) -> *mut GameTextInput;
+}
+extern "C" {
+    #[doc = " When using GameTextInput, you need to create a gametextinput.InputConnection\n on the Java side and pass it using this function to the library, unless using\n GameActivity in which case this will be done for you. See the GameActivity\n source code or GameTextInput samples for examples of usage.\n @param input A valid GameTextInput library handle.\n @param inputConnection A gametextinput.InputConnection object."]
+    pub fn GameTextInput_setInputConnection(input: *mut GameTextInput, inputConnection: jobject);
+}
+extern "C" {
+    #[doc = " Unless using GameActivity, it is required to call this function from your\n Java gametextinput.Listener.stateChanged method to convert eventState and\n trigger any event callbacks. When using GameActivity, this does not need to\n be called as event processing is handled by the Activity.\n @param input A valid GameTextInput library handle.\n @param eventState A Java gametextinput.State object."]
+    pub fn GameTextInput_processEvent(input: *mut GameTextInput, eventState: jobject);
+}
+extern "C" {
+    #[doc = " Free any resources owned by the GameTextInput library.\n Any subsequent calls to the library will fail until GameTextInput_init is\n called again.\n @param input A valid GameTextInput library handle."]
+    pub fn GameTextInput_destroy(input: *mut GameTextInput);
+}
+pub const ShowImeFlags_SHOW_IME_UNDEFINED: ShowImeFlags = 0;
+pub const ShowImeFlags_SHOW_IMPLICIT: ShowImeFlags = 1;
+pub const ShowImeFlags_SHOW_FORCED: ShowImeFlags = 2;
+#[doc = " Flags to be passed to GameTextInput_showIme."]
+pub type ShowImeFlags = ::std::os::raw::c_uint;
+extern "C" {
+    #[doc = " Show the IME. Calls InputMethodManager.showSoftInput().\n @param input A valid GameTextInput library handle.\n @param flags Defined in ShowImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
+    pub fn GameTextInput_showIme(input: *mut GameTextInput, flags: u32);
+}
+pub const HideImeFlags_HIDE_IME_UNDEFINED: HideImeFlags = 0;
+pub const HideImeFlags_HIDE_IMPLICIT_ONLY: HideImeFlags = 1;
+pub const HideImeFlags_HIDE_NOT_ALWAYS: HideImeFlags = 2;
+#[doc = " Flags to be passed to GameTextInput_hideIme."]
+pub type HideImeFlags = ::std::os::raw::c_uint;
+extern "C" {
+    #[doc = " Show the IME. Calls InputMethodManager.hideSoftInputFromWindow().\n @param input A valid GameTextInput library handle.\n @param flags Defined in HideImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
+    pub fn GameTextInput_hideIme(input: *mut GameTextInput, flags: u32);
+}
+extern "C" {
+    #[doc = " Restarts the input method. Calls InputMethodManager.restartInput().\n @param input A valid GameTextInput library handle."]
+    pub fn GameTextInput_restartInput(input: *mut GameTextInput);
+}
+extern "C" {
+    #[doc = " Call a callback with the current GameTextInput state, which may have been\n modified by changes in the IME and calls to GameTextInput_setState. We use a\n callback rather than returning the state in order to simplify ownership of\n text_UTF8 strings. These strings are only valid during the calling of the\n callback.\n @param input A valid GameTextInput library handle.\n @param callback A function that will be called with valid state.\n @param context Context used by the callback."]
+    pub fn GameTextInput_getState(
+        input: *mut GameTextInput,
+        callback: GameTextInputGetStateCallback,
+        context: *mut ::std::os::raw::c_void,
+    );
+}
+extern "C" {
+    #[doc = " Set the current GameTextInput state. This state is reflected to any active\n IME.\n @param input A valid GameTextInput library handle.\n @param state The state to set. Ownership is maintained by the caller and must\n remain valid for the duration of the call."]
+    pub fn GameTextInput_setState(input: *mut GameTextInput, state: *const GameTextInputState);
+}
+#[doc = " Type of the callback needed by GameTextInput_setEventCallback that will be\n called every time the IME state changes.\n @param context User-defined context set in GameTextInput_setEventCallback.\n @param current_state Current IME state, owned by the library and valid during\n the callback."]
+pub type GameTextInputEventCallback = ::std::option::Option<
+    unsafe extern "C" fn(
+        context: *mut ::std::os::raw::c_void,
+        current_state: *const GameTextInputState,
+    ),
+>;
+extern "C" {
+    #[doc = " Optionally set a callback to be called whenever the IME state changes.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME state changes.\n @param context Context passed as first argument to the callback."]
+    pub fn GameTextInput_setEventCallback(
+        input: *mut GameTextInput,
+        callback: GameTextInputEventCallback,
+        context: *mut ::std::os::raw::c_void,
+    );
+}
+#[doc = " Type of the callback needed by GameTextInput_setImeInsetsCallback that will\n be called every time the IME window insets change.\n @param context User-defined context set in\n GameTextInput_setImeWIndowInsetsCallback.\n @param current_insets Current IME insets, owned by the library and valid\n during the callback."]
+pub type GameTextInputImeInsetsCallback = ::std::option::Option<
+    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, current_insets: *const ARect),
+>;
+extern "C" {
+    #[doc = " Optionally set a callback to be called whenever the IME insets change.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME insets change.\n @param context Context passed as first argument to the callback."]
+    pub fn GameTextInput_setImeInsetsCallback(
+        input: *mut GameTextInput,
+        callback: GameTextInputImeInsetsCallback,
+        context: *mut ::std::os::raw::c_void,
+    );
+}
+extern "C" {
+    #[doc = " Get the current window insets for the IME.\n @param input A valid GameTextInput library handle.\n @param insets Filled with the current insets by this function."]
+    pub fn GameTextInput_getImeInsets(input: *const GameTextInput, insets: *mut ARect);
+}
+extern "C" {
+    #[doc = " Unless using GameActivity, it is required to call this function from your\n Java gametextinput.Listener.onImeInsetsChanged method to\n trigger any event callbacks. When using GameActivity, this does not need to\n be called as insets processing is handled by the Activity.\n @param input A valid GameTextInput library handle.\n @param eventState A Java gametextinput.State object."]
+    pub fn GameTextInput_processImeInsets(input: *mut GameTextInput, insets: *const ARect);
+}
+extern "C" {
+    #[doc = " Convert a GameTextInputState struct to a Java gametextinput.State object.\n Don't forget to delete the returned Java local ref when you're done.\n @param input A valid GameTextInput library handle.\n @param state Input state to convert.\n @return A Java object of class gametextinput.State. The caller is required to\n delete this local reference."]
+    pub fn GameTextInputState_toJava(
+        input: *const GameTextInput,
+        state: *const GameTextInputState,
+    ) -> jobject;
+}
+extern "C" {
+    #[doc = " Convert from a Java gametextinput.State object into a C GameTextInputState\n struct.\n @param input A valid GameTextInput library handle.\n @param state A Java gametextinput.State object.\n @param callback A function called with the C struct, valid for the duration\n of the call.\n @param context Context passed to the callback."]
+    pub fn GameTextInputState_fromJava(
+        input: *const GameTextInput,
+        state: jobject,
+        callback: GameTextInputGetStateCallback,
+        context: *mut ::std::os::raw::c_void,
+    );
+}
+#[doc = " This structure defines the native side of an android.app.GameActivity.\n It is created by the framework, and handed to the application's native\n code as it is being launched."]
+#[repr(C)]
+pub struct GameActivity {
+    #[doc = " Pointer to the callback function table of the native application.\n You can set the functions here to your own callbacks.  The callbacks\n pointer itself here should not be changed; it is allocated and managed\n for you by the framework."]
+    pub callbacks: *mut GameActivityCallbacks,
+    #[doc = " The global handle on the process's Java VM."]
+    pub vm: *mut JavaVM,
+    #[doc = " JNI context for the main thread of the app.  Note that this field\n can ONLY be used from the main thread of the process; that is, the\n thread that calls into the GameActivityCallbacks."]
+    pub env: *mut JNIEnv,
+    #[doc = " The GameActivity object handle."]
+    pub javaGameActivity: jobject,
+    #[doc = " Path to this application's internal data directory."]
+    pub internalDataPath: *const ::std::os::raw::c_char,
+    #[doc = " Path to this application's external (removable/mountable) data directory."]
+    pub externalDataPath: *const ::std::os::raw::c_char,
+    #[doc = " The platform's SDK version code."]
+    pub sdkVersion: i32,
+    #[doc = " This is the native instance of the application.  It is not used by\n the framework, but can be set by the application to its own instance\n state."]
+    pub instance: *mut ::std::os::raw::c_void,
+    #[doc = " Pointer to the Asset Manager instance for the application.  The\n application uses this to access binary assets bundled inside its own .apk\n file."]
+    pub assetManager: *mut AAssetManager,
+    #[doc = " Available starting with Honeycomb: path to the directory containing\n the application's OBB files (if any).  If the app doesn't have any\n OBB files, this directory may not exist."]
+    pub obbPath: *const ::std::os::raw::c_char,
 }
 #[test]
-fn bindgen_test_layout_GameActivityKeyEvent() {
+fn bindgen_test_layout_GameActivity() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivity> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<GameActivityKeyEvent>(),
-        56usize,
-        concat!("Size of: ", stringify!(GameActivityKeyEvent))
+        ::std::mem::size_of::<GameActivity>(),
+        40usize,
+        concat!("Size of: ", stringify!(GameActivity))
     );
     assert_eq!(
-        ::std::mem::align_of::<GameActivityKeyEvent>(),
-        8usize,
-        concat!("Alignment of ", stringify!(GameActivityKeyEvent))
+        ::std::mem::align_of::<GameActivity>(),
+        4usize,
+        concat!("Alignment of ", stringify!(GameActivity))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).deviceId as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).callbacks) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(deviceId)
+            stringify!(callbacks)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).source as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).vm) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(source)
+            stringify!(vm)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).action as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).env) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(action)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).eventTime as *const _ as usize },
-        16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(eventTime)
+            stringify!(env)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).downTime as *const _ as usize },
-        24usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).javaGameActivity) as usize - ptr as usize },
+        12usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(downTime)
+            stringify!(javaGameActivity)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).flags as *const _ as usize },
-        32usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).internalDataPath) as usize - ptr as usize },
+        16usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(flags)
+            stringify!(internalDataPath)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).metaState as *const _ as usize },
-        36usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).externalDataPath) as usize - ptr as usize },
+        20usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(metaState)
+            stringify!(externalDataPath)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).modifiers as *const _ as usize },
-        40usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).sdkVersion) as usize - ptr as usize },
+        24usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(modifiers)
+            stringify!(sdkVersion)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityKeyEvent>())).repeatCount as *const _ as usize
-        },
-        44usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).instance) as usize - ptr as usize },
+        28usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(repeatCount)
+            stringify!(instance)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).keyCode as *const _ as usize },
-        48usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).assetManager) as usize - ptr as usize },
+        32usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(keyCode)
+            stringify!(assetManager)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).scanCode as *const _ as usize },
-        52usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).obbPath) as usize - ptr as usize },
+        36usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(scanCode)
+            stringify!(obbPath)
         )
     );
 }
-#[doc = " A function the user should call from their callback with the data, its length"]
-#[doc = " and the library- supplied context."]
+#[doc = " A function the user should call from their callback with the data, its length\n and the library- supplied context."]
 pub type SaveInstanceStateRecallback = ::std::option::Option<
     unsafe extern "C" fn(
         bytes: *const ::std::os::raw::c_char,
@@ -3295,18 +3251,11 @@ pub type SaveInstanceStateRecallback = ::std::option::Option<
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct GameActivityCallbacks {
-    #[doc = " GameActivity has started.  See Java documentation for Activity.onStart()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has started.  See Java documentation for Activity.onStart()\n for more information."]
     pub onStart: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " GameActivity has resumed.  See Java documentation for Activity.onResume()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has resumed.  See Java documentation for Activity.onResume()\n for more information."]
     pub onResume: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " The framework is asking GameActivity to save its current instance state."]
-    #[doc = " See the Java documentation for Activity.onSaveInstanceState() for more"]
-    #[doc = " information. The user should call the recallback with their data, its"]
-    #[doc = " length and the provided context; they retain ownership of the data. Note"]
-    #[doc = " that the saved state will be persisted, so it can not contain any active"]
-    #[doc = " entities (pointers to memory, file descriptors, etc)."]
+    #[doc = " The framework is asking GameActivity to save its current instance state.\n See the Java documentation for Activity.onSaveInstanceState() for more\n information. The user should call the recallback with their data, its\n length and the provided context; they retain ownership of the data. Note\n that the saved state will be persisted, so it can not contain any active\n entities (pointers to memory, file descriptors, etc)."]
     pub onSaveInstanceState: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
@@ -3314,27 +3263,20 @@ pub struct GameActivityCallbacks {
             context: *mut ::std::os::raw::c_void,
         ),
     >,
-    #[doc = " GameActivity has paused.  See Java documentation for Activity.onPause()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has paused.  See Java documentation for Activity.onPause()\n for more information."]
     pub onPause: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " GameActivity has stopped.  See Java documentation for Activity.onStop()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has stopped.  See Java documentation for Activity.onStop()\n for more information."]
     pub onStop: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " GameActivity is being destroyed.  See Java documentation for"]
-    #[doc = " Activity.onDestroy() for more information."]
+    #[doc = " GameActivity is being destroyed.  See Java documentation for\n Activity.onDestroy() for more information."]
     pub onDestroy: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " Focus has changed in this GameActivity's window.  This is often used,"]
-    #[doc = " for example, to pause a game when it loses input focus."]
+    #[doc = " Focus has changed in this GameActivity's window.  This is often used,\n for example, to pause a game when it loses input focus."]
     pub onWindowFocusChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity, hasFocus: bool)>,
-    #[doc = " The drawing window for this native activity has been created.  You"]
-    #[doc = " can use the given native window object to start drawing."]
+    #[doc = " The drawing window for this native activity has been created.  You\n can use the given native window object to start drawing."]
     pub onNativeWindowCreated: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The drawing window for this native activity has been resized.  You should"]
-    #[doc = " retrieve the new size from the window and ensure that your rendering in"]
-    #[doc = " it now matches."]
+    #[doc = " The drawing window for this native activity has been resized.  You should\n retrieve the new size from the window and ensure that your rendering in\n it now matches."]
     pub onNativeWindowResized: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
@@ -3343,77 +3285,62 @@ pub struct GameActivityCallbacks {
             newHeight: i32,
         ),
     >,
-    #[doc = " The drawing window for this native activity needs to be redrawn.  To"]
-    #[doc = " avoid transient artifacts during screen changes (such resizing after"]
-    #[doc = " rotation), applications should not return from this function until they"]
-    #[doc = " have finished drawing their window in its current state."]
+    #[doc = " The drawing window for this native activity needs to be redrawn.  To\n avoid transient artifacts during screen changes (such resizing after\n rotation), applications should not return from this function until they\n have finished drawing their window in its current state."]
     pub onNativeWindowRedrawNeeded: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The drawing window for this native activity is going to be destroyed."]
-    #[doc = " You MUST ensure that you do not touch the window object after returning"]
-    #[doc = " from this function: in the common case of drawing to the window from"]
-    #[doc = " another thread, that means the implementation of this callback must"]
-    #[doc = " properly synchronize with the other thread to stop its drawing before"]
-    #[doc = " returning from here."]
+    #[doc = " The drawing window for this native activity is going to be destroyed.\n You MUST ensure that you do not touch the window object after returning\n from this function: in the common case of drawing to the window from\n another thread, that means the implementation of this callback must\n properly synchronize with the other thread to stop its drawing before\n returning from here."]
     pub onNativeWindowDestroyed: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The current device AConfiguration has changed.  The new configuration can"]
-    #[doc = " be retrieved from assetManager."]
+    #[doc = " The current device AConfiguration has changed.  The new configuration can\n be retrieved from assetManager."]
     pub onConfigurationChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " The system is running low on memory.  Use this callback to release"]
-    #[doc = " resources you do not need, to help the system avoid killing more"]
-    #[doc = " important processes."]
+    #[doc = " The system is running low on memory.  Use this callback to release\n resources you do not need, to help the system avoid killing more\n important processes."]
     pub onTrimMemory: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, level: ::std::os::raw::c_int),
     >,
-    #[doc = " Callback called for every MotionEvent done on the GameActivity"]
-    #[doc = " SurfaceView. Ownership of `event` is maintained by the library and it is"]
-    #[doc = " only valid during the callback."]
+    #[doc = " Callback called for every MotionEvent done on the GameActivity\n SurfaceView. Ownership of `event` is maintained by the library and it is\n only valid during the callback."]
     pub onTouchEvent: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
             event: *const GameActivityMotionEvent,
-            historical: *const GameActivityHistoricalPointerAxes,
-            historicalLen: ::std::os::raw::c_int,
         ) -> bool,
     >,
-    #[doc = " Callback called for every key down event on the GameActivity SurfaceView."]
-    #[doc = " Ownership of `event` is maintained by the library and it is only valid"]
-    #[doc = " during the callback."]
+    #[doc = " Callback called for every key down event on the GameActivity SurfaceView.\n Ownership of `event` is maintained by the library and it is only valid\n during the callback."]
     pub onKeyDown: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
             event: *const GameActivityKeyEvent,
         ) -> bool,
     >,
-    #[doc = " Callback called for every key up event on the GameActivity SurfaceView."]
-    #[doc = " Ownership of `event` is maintained by the library and it is only valid"]
-    #[doc = " during the callback."]
+    #[doc = " Callback called for every key up event on the GameActivity SurfaceView.\n Ownership of `event` is maintained by the library and it is only valid\n during the callback."]
     pub onKeyUp: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
             event: *const GameActivityKeyEvent,
         ) -> bool,
     >,
-    #[doc = " Callback called for every soft-keyboard text input event."]
-    #[doc = " Ownership of `state` is maintained by the library and it is only valid"]
-    #[doc = " during the callback."]
+    #[doc = " Callback called for every soft-keyboard text input event.\n Ownership of `state` is maintained by the library and it is only valid\n during the callback."]
     pub onTextInputEvent: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, state: *const GameTextInputState),
     >,
-    #[doc = " Callback called when WindowInsets of the main app window have changed."]
-    #[doc = " Call GameActivity_getWindowInsets to retrieve the insets themselves."]
+    #[doc = " Callback called when WindowInsets of the main app window have changed.\n Call GameActivity_getWindowInsets to retrieve the insets themselves."]
     pub onWindowInsetsChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
+    #[doc = " Callback called when the rectangle in the window where the content\n should be placed has changed."]
+    pub onContentRectChanged: ::std::option::Option<
+        unsafe extern "C" fn(activity: *mut GameActivity, rect: *const ARect),
+    >,
 }
 #[test]
 fn bindgen_test_layout_GameActivityCallbacks() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityCallbacks> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<GameActivityCallbacks>(),
-        72usize,
+        76usize,
         concat!("Size of: ", stringify!(GameActivityCallbacks))
     );
     assert_eq!(
@@ -3422,7 +3349,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         concat!("Alignment of ", stringify!(GameActivityCallbacks))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onStart as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onStart) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -3432,7 +3359,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onResume as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onResume) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -3442,10 +3369,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onSaveInstanceState as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onSaveInstanceState) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -3455,7 +3379,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onPause as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onPause) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -3465,7 +3389,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onStop as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onStop) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -3475,7 +3399,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onDestroy as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onDestroy) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -3485,10 +3409,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onWindowFocusChanged as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onWindowFocusChanged) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -3498,10 +3419,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowCreated as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowCreated) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -3511,10 +3429,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowResized as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowResized) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -3524,10 +3439,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowRedrawNeeded as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowRedrawNeeded) as usize - ptr as usize },
         36usize,
         concat!(
             "Offset of field: ",
@@ -3537,10 +3449,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowDestroyed as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowDestroyed) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -3550,10 +3459,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onConfigurationChanged as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onConfigurationChanged) as usize - ptr as usize },
         44usize,
         concat!(
             "Offset of field: ",
@@ -3563,9 +3469,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onTrimMemory as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onTrimMemory) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -3575,9 +3479,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onTouchEvent as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onTouchEvent) as usize - ptr as usize },
         52usize,
         concat!(
             "Offset of field: ",
@@ -3587,7 +3489,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onKeyDown as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onKeyDown) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -3597,7 +3499,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onKeyUp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onKeyUp) as usize - ptr as usize },
         60usize,
         concat!(
             "Offset of field: ",
@@ -3607,9 +3509,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onTextInputEvent as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onTextInputEvent) as usize - ptr as usize },
         64usize,
         concat!(
             "Offset of field: ",
@@ -3619,281 +3519,133 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onWindowInsetsChanged as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onWindowInsetsChanged) as usize - ptr as usize },
         68usize,
         concat!(
             "Offset of field: ",
             stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onWindowInsetsChanged)
-        )
-    );
-}
-extern "C" {
-    #[doc = " \\brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`."]
-    #[doc = ""]
-    #[doc = " This is done automatically by the GameActivity: see `onTouchEvent` to set"]
-    #[doc = " a callback to consume the received events."]
-    #[doc = " This function can be used if you re-implement events handling in your own"]
-    #[doc = " activity. On return, the out_event->historicalStart will be zero, and should"]
-    #[doc = " be updated to index into whatever buffer out_historical is copied."]
-    #[doc = " On return the length of out_historical is"]
-    #[doc = " (out_event->pointerCount x out_event->historicalCount) and is in a"]
-    #[doc = " pointer-major order (i.e. all axis for a pointer are contiguous)"]
-    #[doc = " Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityMotionEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityMotionEvent,
-        out_historical: *mut GameActivityHistoricalPointerAxes,
-    ) -> ::std::os::raw::c_int;
-}
-extern "C" {
-    #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`."]
-    #[doc = ""]
-    #[doc = " This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`"]
-    #[doc = " to set a callback to consume the received events."]
-    #[doc = " This function can be used if you re-implement events handling in your own"]
-    #[doc = " activity."]
-    #[doc = " Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityKeyEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityKeyEvent,
+            "::",
+            stringify!(onWindowInsetsChanged)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).onContentRectChanged) as usize - ptr as usize },
+        72usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityCallbacks),
+            "::",
+            stringify!(onContentRectChanged)
+        )
     );
 }
-#[doc = " This is the function that must be in the native code to instantiate the"]
-#[doc = " application's native activity.  It is called with the activity instance (see"]
-#[doc = " above); if the code is being instantiated from a previously saved instance,"]
-#[doc = " the savedState will be non-NULL and point to the saved data.  You must make"]
-#[doc = " any copy of this data you need -- it will be released after you return from"]
-#[doc = " this function."]
+#[doc = " This is the function that must be in the native code to instantiate the\n application's native activity.  It is called with the activity instance (see\n above); if the code is being instantiated from a previously saved instance,\n the savedState will be non-NULL and point to the saved data.  You must make\n any copy of this data you need -- it will be released after you return from\n this function."]
 pub type GameActivity_createFunc = ::std::option::Option<
     unsafe extern "C" fn(
         activity: *mut GameActivity,
         savedState: *mut ::std::os::raw::c_void,
-        savedStateSize: size_t,
+        savedStateSize: usize,
     ),
 >;
 extern "C" {
-    #[doc = " Finish the given activity.  Its finish() method will be called, causing it"]
-    #[doc = " to be stopped and destroyed.  Note that this method can be called from"]
-    #[doc = " *any* thread; it will send a message to the main thread of the process"]
-    #[doc = " where the Java finish call will take place."]
+    #[doc = " Finish the given activity.  Its finish() method will be called, causing it\n to be stopped and destroyed.  Note that this method can be called from\n *any* thread; it will send a message to the main thread of the process\n where the Java finish call will take place."]
     pub fn GameActivity_finish(activity: *mut GameActivity);
 }
-#[doc = " As long as this window is visible to the user, allow the lock"]
-#[doc = " screen to activate while the screen is on.  This can be used"]
-#[doc = " independently, or in combination with {@link"]
-#[doc = " GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} and/or {@link"]
-#[doc = " GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}"]
+#[doc = " As long as this window is visible to the user, allow the lock\n screen to activate while the screen is on.  This can be used\n independently, or in combination with {@link\n GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} and/or {@link\n GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}"]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_ALLOW_LOCK_WHILE_SCREEN_ON:
     GameActivitySetWindowFlags = 1;
 #[doc = " Everything behind this window will be dimmed."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DIM_BEHIND: GameActivitySetWindowFlags = 2;
-#[doc = " Blur everything behind this window."]
-#[doc = " @deprecated Blurring is no longer supported."]
+#[doc = " Blur everything behind this window.\n @deprecated Blurring is no longer supported."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_BLUR_BEHIND: GameActivitySetWindowFlags = 4;
-#[doc = " This window won't ever get key input focus, so the"]
-#[doc = " user can not send key or other button events to it.  Those will"]
-#[doc = " instead go to whatever focusable window is behind it.  This flag"]
-#[doc = " will also enable {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL} whether or not"]
-#[doc = " that is explicitly set."]
-#[doc = ""]
-#[doc = " Setting this flag also implies that the window will not need to"]
-#[doc = " interact with"]
-#[doc = " a soft input method, so it will be Z-ordered and positioned"]
-#[doc = " independently of any active input method (typically this means it"]
-#[doc = " gets Z-ordered on top of the input method, so it can use the full"]
-#[doc = " screen for its content and cover the input method if needed.  You"]
-#[doc = " can use {@link GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM} to modify this"]
-#[doc = " behavior."]
+#[doc = " This window won't ever get key input focus, so the\n user can not send key or other button events to it.  Those will\n instead go to whatever focusable window is behind it.  This flag\n will also enable {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL} whether or not\n that is explicitly set.\n\n Setting this flag also implies that the window will not need to\n interact with\n a soft input method, so it will be Z-ordered and positioned\n independently of any active input method (typically this means it\n gets Z-ordered on top of the input method, so it can use the full\n screen for its content and cover the input method if needed.  You\n can use {@link GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM} to modify this\n behavior."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_NOT_FOCUSABLE: GameActivitySetWindowFlags =
     8;
 #[doc = " This window can never receive touch events."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_NOT_TOUCHABLE: GameActivitySetWindowFlags =
     16;
-#[doc = " Even when this window is focusable (its"]
-#[doc = " {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set), allow any pointer"]
-#[doc = " events outside of the window to be sent to the windows behind it."]
-#[doc = " Otherwise it will consume all pointer events itself, regardless of"]
-#[doc = " whether they are inside of the window."]
+#[doc = " Even when this window is focusable (its\n {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set), allow any pointer\n events outside of the window to be sent to the windows behind it.\n Otherwise it will consume all pointer events itself, regardless of\n whether they are inside of the window."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL: GameActivitySetWindowFlags =
     32;
-#[doc = " When set, if the device is asleep when the touch"]
-#[doc = " screen is pressed, you will receive this first touch event.  Usually"]
-#[doc = " the first touch event is consumed by the system since the user can"]
-#[doc = " not see what they are pressing on."]
-#[doc = ""]
-#[doc = " @deprecated This flag has no effect."]
+#[doc = " When set, if the device is asleep when the touch\n screen is pressed, you will receive this first touch event.  Usually\n the first touch event is consumed by the system since the user can\n not see what they are pressing on.\n\n @deprecated This flag has no effect."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_TOUCHABLE_WHEN_WAKING:
     GameActivitySetWindowFlags = 64;
-#[doc = " As long as this window is visible to the user, keep"]
-#[doc = " the device's screen turned on and bright."]
+#[doc = " As long as this window is visible to the user, keep\n the device's screen turned on and bright."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_KEEP_SCREEN_ON: GameActivitySetWindowFlags =
     128;
-#[doc = " Place the window within the entire screen, ignoring"]
-#[doc = " decorations around the border (such as the status bar).  The"]
-#[doc = " window must correctly position its contents to take the screen"]
-#[doc = " decoration into account."]
+#[doc = " Place the window within the entire screen, ignoring\n decorations around the border (such as the status bar).  The\n window must correctly position its contents to take the screen\n decoration into account."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN:
     GameActivitySetWindowFlags = 256;
 #[doc = " Allows the window to extend outside of the screen."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_LAYOUT_NO_LIMITS:
     GameActivitySetWindowFlags = 512;
-#[doc = " Hide all screen decorations (such as the status"]
-#[doc = " bar) while this window is displayed.  This allows the window to"]
-#[doc = " use the entire display space for itself -- the status bar will"]
-#[doc = " be hidden when an app window with this flag set is on the top"]
-#[doc = " layer. A fullscreen window will ignore a value of {@link"]
-#[doc = " GAMEACTIVITY_SOFT_INPUT_ADJUST_RESIZE}; the window will stay"]
-#[doc = " fullscreen and will not resize."]
+#[doc = " Hide all screen decorations (such as the status\n bar) while this window is displayed.  This allows the window to\n use the entire display space for itself -- the status bar will\n be hidden when an app window with this flag set is on the top\n layer. A fullscreen window will ignore a value of {@link\n GAMEACTIVITY_SOFT_INPUT_ADJUST_RESIZE}; the window will stay\n fullscreen and will not resize."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_FULLSCREEN: GameActivitySetWindowFlags =
     1024;
-#[doc = " Override {@link GAMEACTIVITY_FLAG_FULLSCREEN} and force the"]
-#[doc = " screen decorations (such as the status bar) to be shown."]
+#[doc = " Override {@link GAMEACTIVITY_FLAG_FULLSCREEN} and force the\n screen decorations (such as the status bar) to be shown."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_FORCE_NOT_FULLSCREEN:
     GameActivitySetWindowFlags = 2048;
-#[doc = " Turn on dithering when compositing this window to"]
-#[doc = " the screen."]
-#[doc = " @deprecated This flag is no longer used."]
+#[doc = " Turn on dithering when compositing this window to\n the screen.\n @deprecated This flag is no longer used."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DITHER: GameActivitySetWindowFlags = 4096;
-#[doc = " Treat the content of the window as secure, preventing"]
-#[doc = " it from appearing in screenshots or from being viewed on non-secure"]
-#[doc = " displays."]
+#[doc = " Treat the content of the window as secure, preventing\n it from appearing in screenshots or from being viewed on non-secure\n displays."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SECURE: GameActivitySetWindowFlags = 8192;
-#[doc = " A special mode where the layout parameters are used"]
-#[doc = " to perform scaling of the surface when it is composited to the"]
-#[doc = " screen."]
+#[doc = " A special mode where the layout parameters are used\n to perform scaling of the surface when it is composited to the\n screen."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SCALED: GameActivitySetWindowFlags = 16384;
-#[doc = " Intended for windows that will often be used when the user is"]
-#[doc = " holding the screen against their face, it will aggressively"]
-#[doc = " filter the event stream to prevent unintended presses in this"]
-#[doc = " situation that may not be desired for a particular window, when"]
-#[doc = " such an event stream is detected, the application will receive"]
-#[doc = " a {@link AMOTION_EVENT_ACTION_CANCEL} to indicate this so"]
-#[doc = " applications can handle this accordingly by taking no action on"]
-#[doc = " the event until the finger is released."]
+#[doc = " Intended for windows that will often be used when the user is\n holding the screen against their face, it will aggressively\n filter the event stream to prevent unintended presses in this\n situation that may not be desired for a particular window, when\n such an event stream is detected, the application will receive\n a {@link AMOTION_EVENT_ACTION_CANCEL} to indicate this so\n applications can handle this accordingly by taking no action on\n the event until the finger is released."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_IGNORE_CHEEK_PRESSES:
     GameActivitySetWindowFlags = 32768;
-#[doc = " A special option only for use in combination with"]
-#[doc = " {@link GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN}.  When requesting layout in"]
-#[doc = " the screen your window may appear on top of or behind screen decorations"]
-#[doc = " such as the status bar.  By also including this flag, the window"]
-#[doc = " manager will report the inset rectangle needed to ensure your"]
-#[doc = " content is not covered by screen decorations."]
+#[doc = " A special option only for use in combination with\n {@link GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN}.  When requesting layout in\n the screen your window may appear on top of or behind screen decorations\n such as the status bar.  By also including this flag, the window\n manager will report the inset rectangle needed to ensure your\n content is not covered by screen decorations."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_LAYOUT_INSET_DECOR:
     GameActivitySetWindowFlags = 65536;
-#[doc = " Invert the state of {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} with"]
-#[doc = " respect to how this window interacts with the current method."]
-#[doc = " That is, if FLAG_NOT_FOCUSABLE is set and this flag is set,"]
-#[doc = " then the window will behave as if it needs to interact with the"]
-#[doc = " input method and thus be placed behind/away from it; if {@link"]
-#[doc = " GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set and this flag is set,"]
-#[doc = " then the window will behave as if it doesn't need to interact"]
-#[doc = " with the input method and can be placed to use more space and"]
-#[doc = " cover the input method."]
+#[doc = " Invert the state of {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} with\n respect to how this window interacts with the current method.\n That is, if FLAG_NOT_FOCUSABLE is set and this flag is set,\n then the window will behave as if it needs to interact with the\n input method and thus be placed behind/away from it; if {@link\n GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set and this flag is set,\n then the window will behave as if it doesn't need to interact\n with the input method and can be placed to use more space and\n cover the input method."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM:
     GameActivitySetWindowFlags = 131072;
-#[doc = " If you have set {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL}, you"]
-#[doc = " can set this flag to receive a single special MotionEvent with"]
-#[doc = " the action"]
-#[doc = " {@link AMOTION_EVENT_ACTION_OUTSIDE} for"]
-#[doc = " touches that occur outside of your window.  Note that you will not"]
-#[doc = " receive the full down/move/up gesture, only the location of the"]
-#[doc = " first down as an {@link AMOTION_EVENT_ACTION_OUTSIDE}."]
+#[doc = " If you have set {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL}, you\n can set this flag to receive a single special MotionEvent with\n the action\n {@link AMOTION_EVENT_ACTION_OUTSIDE} for\n touches that occur outside of your window.  Note that you will not\n receive the full down/move/up gesture, only the location of the\n first down as an {@link AMOTION_EVENT_ACTION_OUTSIDE}."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_WATCH_OUTSIDE_TOUCH:
     GameActivitySetWindowFlags = 262144;
-#[doc = " Special flag to let windows be shown when the screen"]
-#[doc = " is locked. This will let application windows take precedence over"]
-#[doc = " key guard or any other lock screens. Can be used with"]
-#[doc = " {@link GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} to turn screen on and display"]
-#[doc = " windows directly before showing the key guard window.  Can be used with"]
-#[doc = " {@link GAMEACTIVITY_FLAG_DISMISS_KEYGUARD} to automatically fully"]
-#[doc = " dismisss non-secure keyguards.  This flag only applies to the top-most"]
-#[doc = " full-screen window."]
+#[doc = " Special flag to let windows be shown when the screen\n is locked. This will let application windows take precedence over\n key guard or any other lock screens. Can be used with\n {@link GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} to turn screen on and display\n windows directly before showing the key guard window.  Can be used with\n {@link GAMEACTIVITY_FLAG_DISMISS_KEYGUARD} to automatically fully\n dismisss non-secure keyguards.  This flag only applies to the top-most\n full-screen window."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED:
     GameActivitySetWindowFlags = 524288;
-#[doc = " Ask that the system wallpaper be shown behind"]
-#[doc = " your window.  The window surface must be translucent to be able"]
-#[doc = " to actually see the wallpaper behind it; this flag just ensures"]
-#[doc = " that the wallpaper surface will be there if this window actually"]
-#[doc = " has translucent regions."]
+#[doc = " Ask that the system wallpaper be shown behind\n your window.  The window surface must be translucent to be able\n to actually see the wallpaper behind it; this flag just ensures\n that the wallpaper surface will be there if this window actually\n has translucent regions."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SHOW_WALLPAPER: GameActivitySetWindowFlags =
     1048576;
-#[doc = " When set as a window is being added or made"]
-#[doc = " visible, once the window has been shown then the system will"]
-#[doc = " poke the power manager's user activity (as if the user had woken"]
-#[doc = " up the device) to turn the screen on."]
+#[doc = " When set as a window is being added or made\n visible, once the window has been shown then the system will\n poke the power manager's user activity (as if the user had woken\n up the device) to turn the screen on."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_TURN_SCREEN_ON: GameActivitySetWindowFlags =
     2097152;
-#[doc = " When set the window will cause the keyguard to"]
-#[doc = " be dismissed, only if it is not a secure lock keyguard.  Because such"]
-#[doc = " a keyguard is not needed for security, it will never re-appear if"]
-#[doc = " the user navigates to another window (in contrast to"]
-#[doc = " {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}, which will only temporarily"]
-#[doc = " hide both secure and non-secure keyguards but ensure they reappear"]
-#[doc = " when the user moves to another UI that doesn't hide them)."]
-#[doc = " If the keyguard is currently active and is secure (requires an"]
-#[doc = " unlock pattern) than the user will still need to confirm it before"]
-#[doc = " seeing this window, unless {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED} has"]
-#[doc = " also been set."]
+#[doc = " When set the window will cause the keyguard to\n be dismissed, only if it is not a secure lock keyguard.  Because such\n a keyguard is not needed for security, it will never re-appear if\n the user navigates to another window (in contrast to\n {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}, which will only temporarily\n hide both secure and non-secure keyguards but ensure they reappear\n when the user moves to another UI that doesn't hide them).\n If the keyguard is currently active and is secure (requires an\n unlock pattern) than the user will still need to confirm it before\n seeing this window, unless {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED} has\n also been set."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DISMISS_KEYGUARD:
     GameActivitySetWindowFlags = 4194304;
-#[doc = " Flags for GameActivity_setWindowFlags,"]
-#[doc = " as per the Java API at android.view.WindowManager.LayoutParams."]
+#[doc = " Flags for GameActivity_setWindowFlags,\n as per the Java API at android.view.WindowManager.LayoutParams."]
 pub type GameActivitySetWindowFlags = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Change the window flags of the given activity.  Calls getWindow().setFlags()"]
-    #[doc = " of the given activity."]
-    #[doc = " Note that some flags must be set before the window decoration is created,"]
-    #[doc = " see"]
-    #[doc = " https://developer.android.com/reference/android/view/Window#setFlags(int,%20int)."]
-    #[doc = " Note also that this method can be called from"]
-    #[doc = " *any* thread; it will send a message to the main thread of the process"]
-    #[doc = " where the Java finish call will take place."]
+    #[doc = " Change the window flags of the given activity.  Calls getWindow().setFlags()\n of the given activity.\n Note that some flags must be set before the window decoration is created,\n see\n https://developer.android.com/reference/android/view/Window#setFlags(int,%20int).\n Note also that this method can be called from\n *any* thread; it will send a message to the main thread of the process\n where the Java finish call will take place."]
     pub fn GameActivity_setWindowFlags(
         activity: *mut GameActivity,
         addFlags: u32,
         removeFlags: u32,
     );
 }
-#[doc = " Implicit request to show the input window, not as the result"]
-#[doc = " of a direct request by the user."]
+#[doc = " Implicit request to show the input window, not as the result\n of a direct request by the user."]
 pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT:
     GameActivityShowSoftInputFlags = 1;
-#[doc = " The user has forced the input method open (such as by"]
-#[doc = " long-pressing menu) so it should not be closed until they"]
-#[doc = " explicitly do so."]
+#[doc = " The user has forced the input method open (such as by\n long-pressing menu) so it should not be closed until they\n explicitly do so."]
 pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED:
     GameActivityShowSoftInputFlags = 2;
-#[doc = " Flags for GameActivity_showSoftInput; see the Java InputMethodManager"]
-#[doc = " API for documentation."]
+#[doc = " Flags for GameActivity_showSoftInput; see the Java InputMethodManager\n API for documentation."]
 pub type GameActivityShowSoftInputFlags = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Show the IME while in the given activity.  Calls"]
-    #[doc = " InputMethodManager.showSoftInput() for the given activity.  Note that this"]
-    #[doc = " method can be called from *any* thread; it will send a message to the main"]
-    #[doc = " thread of the process where the Java call will take place."]
+    #[doc = " Show the IME while in the given activity.  Calls\n InputMethodManager.showSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java call will take place."]
     pub fn GameActivity_showSoftInput(activity: *mut GameActivity, flags: u32);
 }
 extern "C" {
-    #[doc = " Set the text entry state (see documentation of the GameTextInputState struct"]
-    #[doc = " in the Game Text Input library reference)."]
-    #[doc = ""]
-    #[doc = " Ownership of the state is maintained by the caller."]
+    #[doc = " Set the text entry state (see documentation of the GameTextInputState struct\n in the Game Text Input library reference).\n\n Ownership of the state is maintained by the caller."]
     pub fn GameActivity_setTextInputState(
         activity: *mut GameActivity,
         state: *const GameTextInputState,
     );
 }
 extern "C" {
-    #[doc = " Get the last-received text entry state (see documentation of the"]
-    #[doc = " GameTextInputState struct in the Game Text Input library reference)."]
-    #[doc = ""]
+    #[doc = " Get the last-received text entry state (see documentation of the\n GameTextInputState struct in the Game Text Input library reference).\n"]
     pub fn GameActivity_getTextInputState(
         activity: *mut GameActivity,
         callback: GameTextInputGetStateCallback,
@@ -3904,29 +3656,20 @@ extern "C" {
     #[doc = " Get a pointer to the GameTextInput library instance."]
     pub fn GameActivity_getTextInput(activity: *const GameActivity) -> *mut GameTextInput;
 }
-#[doc = " The soft input window should only be hidden if it was not"]
-#[doc = " explicitly shown by the user."]
+#[doc = " The soft input window should only be hidden if it was not\n explicitly shown by the user."]
 pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_ONLY:
     GameActivityHideSoftInputFlags = 1;
-#[doc = " The soft input window should normally be hidden, unless it was"]
-#[doc = " originally shown with {@link GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED}."]
+#[doc = " The soft input window should normally be hidden, unless it was\n originally shown with {@link GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED}."]
 pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS:
     GameActivityHideSoftInputFlags = 2;
-#[doc = " Flags for GameActivity_hideSoftInput; see the Java InputMethodManager"]
-#[doc = " API for documentation."]
+#[doc = " Flags for GameActivity_hideSoftInput; see the Java InputMethodManager\n API for documentation."]
 pub type GameActivityHideSoftInputFlags = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Hide the IME while in the given activity.  Calls"]
-    #[doc = " InputMethodManager.hideSoftInput() for the given activity.  Note that this"]
-    #[doc = " method can be called from *any* thread; it will send a message to the main"]
-    #[doc = " thread of the process where the Java finish call will take place."]
+    #[doc = " Hide the IME while in the given activity.  Calls\n InputMethodManager.hideSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java finish call will take place."]
     pub fn GameActivity_hideSoftInput(activity: *mut GameActivity, flags: u32);
 }
 extern "C" {
-    #[doc = " Get the current window insets of the particular component. See"]
-    #[doc = " https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
-    #[doc = " for more details."]
-    #[doc = " You can use these insets to influence what you show on the screen."]
+    #[doc = " Get the current window insets of the particular component. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type\n for more details.\n You can use these insets to influence what you show on the screen."]
     pub fn GameActivity_getWindowInsets(
         activity: *mut GameActivity,
         type_: GameCommonInsetsType,
@@ -3934,14 +3677,7 @@ extern "C" {
     );
 }
 extern "C" {
-    #[doc = " Set options on how the IME behaves when it is requested for text input."]
-    #[doc = " See"]
-    #[doc = " https://developer.android.com/reference/android/view/inputmethod/EditorInfo"]
-    #[doc = " for the meaning of inputType, actionId and imeOptions."]
-    #[doc = ""]
-    #[doc = " Note that this function will attach the current thread to the JVM if it is"]
-    #[doc = " not already attached, so the caller must detach the thread from the JVM"]
-    #[doc = " before the thread is destroyed using DetachCurrentThread."]
+    #[doc = " Set options on how the IME behaves when it is requested for text input.\n See\n https://developer.android.com/reference/android/view/inputmethod/EditorInfo\n for the meaning of inputType, actionId and imeOptions.\n\n Note that this function will attach the current thread to the JVM if it is\n not already attached, so the caller must detach the thread from the JVM\n before the thread is destroyed using DetachCurrentThread."]
     pub fn GameActivity_setImeEditorInfo(
         activity: *mut GameActivity,
         inputType: ::std::os::raw::c_int,
@@ -3949,92 +3685,152 @@ extern "C" {
         imeOptions: ::std::os::raw::c_int,
     );
 }
-pub const ACONFIGURATION_ORIENTATION_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_ORIENTATION_PORT: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_ORIENTATION_LAND: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_ORIENTATION_SQUARE: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_TOUCHSCREEN_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_TOUCHSCREEN_NOTOUCH: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_TOUCHSCREEN_STYLUS: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_TOUCHSCREEN_FINGER: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_DENSITY_DEFAULT: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_DENSITY_LOW: ::std::os::raw::c_uint = 120;
-pub const ACONFIGURATION_DENSITY_MEDIUM: ::std::os::raw::c_uint = 160;
-pub const ACONFIGURATION_DENSITY_TV: ::std::os::raw::c_uint = 213;
-pub const ACONFIGURATION_DENSITY_HIGH: ::std::os::raw::c_uint = 240;
-pub const ACONFIGURATION_DENSITY_XHIGH: ::std::os::raw::c_uint = 320;
-pub const ACONFIGURATION_DENSITY_XXHIGH: ::std::os::raw::c_uint = 480;
-pub const ACONFIGURATION_DENSITY_XXXHIGH: ::std::os::raw::c_uint = 640;
-pub const ACONFIGURATION_DENSITY_ANY: ::std::os::raw::c_uint = 65534;
-pub const ACONFIGURATION_DENSITY_NONE: ::std::os::raw::c_uint = 65535;
-pub const ACONFIGURATION_KEYBOARD_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_KEYBOARD_NOKEYS: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_KEYBOARD_QWERTY: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_KEYBOARD_12KEY: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_NAVIGATION_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_NAVIGATION_NONAV: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_NAVIGATION_DPAD: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_NAVIGATION_TRACKBALL: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_NAVIGATION_WHEEL: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_KEYSHIDDEN_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_KEYSHIDDEN_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_KEYSHIDDEN_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_KEYSHIDDEN_SOFT: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_NAVHIDDEN_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_NAVHIDDEN_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_NAVHIDDEN_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREENSIZE_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREENSIZE_SMALL: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_SCREENSIZE_NORMAL: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREENSIZE_LARGE: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_SCREENSIZE_XLARGE: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_SCREENLONG_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREENLONG_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_SCREENLONG_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREENROUND_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREENROUND_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_SCREENROUND_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_WIDE_COLOR_GAMUT_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_WIDE_COLOR_GAMUT_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_WIDE_COLOR_GAMUT_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_HDR_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_HDR_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_HDR_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_UI_MODE_TYPE_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_UI_MODE_TYPE_NORMAL: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_UI_MODE_TYPE_DESK: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_UI_MODE_TYPE_CAR: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_UI_MODE_TYPE_TELEVISION: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_UI_MODE_TYPE_APPLIANCE: ::std::os::raw::c_uint = 5;
-pub const ACONFIGURATION_UI_MODE_TYPE_WATCH: ::std::os::raw::c_uint = 6;
-pub const ACONFIGURATION_UI_MODE_TYPE_VR_HEADSET: ::std::os::raw::c_uint = 7;
-pub const ACONFIGURATION_UI_MODE_NIGHT_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_UI_MODE_NIGHT_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_UI_MODE_NIGHT_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREEN_WIDTH_DP_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREEN_HEIGHT_DP_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_LAYOUTDIR_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_LAYOUTDIR_LTR: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_LAYOUTDIR_RTL: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_MCC: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_MNC: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_LOCALE: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_TOUCHSCREEN: ::std::os::raw::c_uint = 8;
-pub const ACONFIGURATION_KEYBOARD: ::std::os::raw::c_uint = 16;
-pub const ACONFIGURATION_KEYBOARD_HIDDEN: ::std::os::raw::c_uint = 32;
-pub const ACONFIGURATION_NAVIGATION: ::std::os::raw::c_uint = 64;
-pub const ACONFIGURATION_ORIENTATION: ::std::os::raw::c_uint = 128;
-pub const ACONFIGURATION_DENSITY: ::std::os::raw::c_uint = 256;
-pub const ACONFIGURATION_SCREEN_SIZE: ::std::os::raw::c_uint = 512;
-pub const ACONFIGURATION_VERSION: ::std::os::raw::c_uint = 1024;
-pub const ACONFIGURATION_SCREEN_LAYOUT: ::std::os::raw::c_uint = 2048;
-pub const ACONFIGURATION_UI_MODE: ::std::os::raw::c_uint = 4096;
-pub const ACONFIGURATION_SMALLEST_SCREEN_SIZE: ::std::os::raw::c_uint = 8192;
-pub const ACONFIGURATION_LAYOUTDIR: ::std::os::raw::c_uint = 16384;
-pub const ACONFIGURATION_SCREEN_ROUND: ::std::os::raw::c_uint = 32768;
-pub const ACONFIGURATION_COLOR_MODE: ::std::os::raw::c_uint = 65536;
-pub const ACONFIGURATION_MNC_ZERO: ::std::os::raw::c_uint = 65535;
+extern "C" {
+    #[doc = " These are getters for Configuration class members. They may be called from\n any thread."]
+    pub fn GameActivity_getOrientation(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getColorMode(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getDensityDpi(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getFontScale(activity: *mut GameActivity) -> f32;
+}
+extern "C" {
+    pub fn GameActivity_getFontWeightAdjustment(
+        activity: *mut GameActivity,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getHardKeyboardHidden(activity: *mut GameActivity)
+        -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getKeyboard(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getKeyboardHidden(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getMcc(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getMnc(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getNavigation(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getNavigationHidden(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getScreenHeightDp(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getScreenLayout(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getScreenWidthDp(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getSmallestScreenWidthDp(
+        activity: *mut GameActivity,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getTouchscreen(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getUIMode(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+pub const ACONFIGURATION_ORIENTATION_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_ORIENTATION_PORT: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_ORIENTATION_LAND: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_ORIENTATION_SQUARE: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_TOUCHSCREEN_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_TOUCHSCREEN_NOTOUCH: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_TOUCHSCREEN_STYLUS: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_TOUCHSCREEN_FINGER: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_DENSITY_DEFAULT: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_DENSITY_LOW: _bindgen_ty_21 = 120;
+pub const ACONFIGURATION_DENSITY_MEDIUM: _bindgen_ty_21 = 160;
+pub const ACONFIGURATION_DENSITY_TV: _bindgen_ty_21 = 213;
+pub const ACONFIGURATION_DENSITY_HIGH: _bindgen_ty_21 = 240;
+pub const ACONFIGURATION_DENSITY_XHIGH: _bindgen_ty_21 = 320;
+pub const ACONFIGURATION_DENSITY_XXHIGH: _bindgen_ty_21 = 480;
+pub const ACONFIGURATION_DENSITY_XXXHIGH: _bindgen_ty_21 = 640;
+pub const ACONFIGURATION_DENSITY_ANY: _bindgen_ty_21 = 65534;
+pub const ACONFIGURATION_DENSITY_NONE: _bindgen_ty_21 = 65535;
+pub const ACONFIGURATION_KEYBOARD_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_KEYBOARD_NOKEYS: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_KEYBOARD_QWERTY: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_KEYBOARD_12KEY: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_NAVIGATION_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_NAVIGATION_NONAV: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_NAVIGATION_DPAD: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_NAVIGATION_TRACKBALL: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_NAVIGATION_WHEEL: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_KEYSHIDDEN_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_KEYSHIDDEN_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_KEYSHIDDEN_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_KEYSHIDDEN_SOFT: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_NAVHIDDEN_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_NAVHIDDEN_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_NAVHIDDEN_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREENSIZE_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREENSIZE_SMALL: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_SCREENSIZE_NORMAL: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREENSIZE_LARGE: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_SCREENSIZE_XLARGE: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_SCREENLONG_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREENLONG_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_SCREENLONG_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREENROUND_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREENROUND_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_SCREENROUND_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_WIDE_COLOR_GAMUT_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_WIDE_COLOR_GAMUT_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_WIDE_COLOR_GAMUT_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_HDR_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_HDR_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_HDR_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_UI_MODE_TYPE_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_UI_MODE_TYPE_NORMAL: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_UI_MODE_TYPE_DESK: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_UI_MODE_TYPE_CAR: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_UI_MODE_TYPE_TELEVISION: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_UI_MODE_TYPE_APPLIANCE: _bindgen_ty_21 = 5;
+pub const ACONFIGURATION_UI_MODE_TYPE_WATCH: _bindgen_ty_21 = 6;
+pub const ACONFIGURATION_UI_MODE_TYPE_VR_HEADSET: _bindgen_ty_21 = 7;
+pub const ACONFIGURATION_UI_MODE_NIGHT_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_UI_MODE_NIGHT_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_UI_MODE_NIGHT_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREEN_WIDTH_DP_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREEN_HEIGHT_DP_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_LAYOUTDIR_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_LAYOUTDIR_LTR: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_LAYOUTDIR_RTL: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_MCC: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_MNC: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_LOCALE: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_TOUCHSCREEN: _bindgen_ty_21 = 8;
+pub const ACONFIGURATION_KEYBOARD: _bindgen_ty_21 = 16;
+pub const ACONFIGURATION_KEYBOARD_HIDDEN: _bindgen_ty_21 = 32;
+pub const ACONFIGURATION_NAVIGATION: _bindgen_ty_21 = 64;
+pub const ACONFIGURATION_ORIENTATION: _bindgen_ty_21 = 128;
+pub const ACONFIGURATION_DENSITY: _bindgen_ty_21 = 256;
+pub const ACONFIGURATION_SCREEN_SIZE: _bindgen_ty_21 = 512;
+pub const ACONFIGURATION_VERSION: _bindgen_ty_21 = 1024;
+pub const ACONFIGURATION_SCREEN_LAYOUT: _bindgen_ty_21 = 2048;
+pub const ACONFIGURATION_UI_MODE: _bindgen_ty_21 = 4096;
+pub const ACONFIGURATION_SMALLEST_SCREEN_SIZE: _bindgen_ty_21 = 8192;
+pub const ACONFIGURATION_LAYOUTDIR: _bindgen_ty_21 = 16384;
+pub const ACONFIGURATION_SCREEN_ROUND: _bindgen_ty_21 = 32768;
+pub const ACONFIGURATION_COLOR_MODE: _bindgen_ty_21 = 65536;
+pub const ACONFIGURATION_MNC_ZERO: _bindgen_ty_21 = 65535;
 pub type _bindgen_ty_21 = ::std::os::raw::c_uint;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -4045,6 +3841,8 @@ pub struct pollfd {
 }
 #[test]
 fn bindgen_test_layout_pollfd() {
+    const UNINIT: ::std::mem::MaybeUninit<pollfd> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<pollfd>(),
         8usize,
@@ -4056,7 +3854,7 @@ fn bindgen_test_layout_pollfd() {
         concat!("Alignment of ", stringify!(pollfd))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<pollfd>())).fd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4066,7 +3864,7 @@ fn bindgen_test_layout_pollfd() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<pollfd>())).events as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).events) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4076,7 +3874,7 @@ fn bindgen_test_layout_pollfd() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<pollfd>())).revents as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).revents) as usize - ptr as usize },
         6usize,
         concat!(
             "Offset of field: ",
@@ -4113,6 +3911,8 @@ pub struct sigcontext {
 }
 #[test]
 fn bindgen_test_layout_sigcontext() {
+    const UNINIT: ::std::mem::MaybeUninit<sigcontext> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigcontext>(),
         84usize,
@@ -4124,7 +3924,7 @@ fn bindgen_test_layout_sigcontext() {
         concat!("Alignment of ", stringify!(sigcontext))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).trap_no as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).trap_no) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4134,7 +3934,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).error_code as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).error_code) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4144,7 +3944,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).oldmask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4154,7 +3954,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_r0 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_r0) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -4164,7 +3964,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_r1 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_r1) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4174,7 +3974,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_r2 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_r2) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -4184,7 +3984,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_r3 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_r3) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -4194,7 +3994,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_r4 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_r4) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -4204,7 +4004,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_r5 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_r5) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -4214,7 +4014,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_r6 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_r6) as usize - ptr as usize },
         36usize,
         concat!(
             "Offset of field: ",
@@ -4224,7 +4024,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_r7 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_r7) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -4234,7 +4034,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_r8 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_r8) as usize - ptr as usize },
         44usize,
         concat!(
             "Offset of field: ",
@@ -4244,7 +4044,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_r9 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_r9) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -4254,7 +4054,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_r10 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_r10) as usize - ptr as usize },
         52usize,
         concat!(
             "Offset of field: ",
@@ -4264,7 +4064,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_fp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_fp) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -4274,7 +4074,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_ip as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_ip) as usize - ptr as usize },
         60usize,
         concat!(
             "Offset of field: ",
@@ -4284,7 +4084,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_sp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_sp) as usize - ptr as usize },
         64usize,
         concat!(
             "Offset of field: ",
@@ -4294,7 +4094,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_lr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_lr) as usize - ptr as usize },
         68usize,
         concat!(
             "Offset of field: ",
@@ -4304,7 +4104,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_pc as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_pc) as usize - ptr as usize },
         72usize,
         concat!(
             "Offset of field: ",
@@ -4314,7 +4114,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).arm_cpsr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).arm_cpsr) as usize - ptr as usize },
         76usize,
         concat!(
             "Offset of field: ",
@@ -4324,7 +4124,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).fault_address as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fault_address) as usize - ptr as usize },
         80usize,
         concat!(
             "Offset of field: ",
@@ -4361,6 +4161,9 @@ pub union __kernel_sigaction__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout___kernel_sigaction__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_sigaction__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_sigaction__bindgen_ty_1>(),
         4usize,
@@ -4375,10 +4178,7 @@ fn bindgen_test_layout___kernel_sigaction__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__kernel_sigaction__bindgen_ty_1>()))._sa_handler as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sa_handler) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4388,10 +4188,7 @@ fn bindgen_test_layout___kernel_sigaction__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__kernel_sigaction__bindgen_ty_1>()))._sa_sigaction as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sa_sigaction) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4403,6 +4200,8 @@ fn bindgen_test_layout___kernel_sigaction__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout___kernel_sigaction() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_sigaction> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_sigaction>(),
         16usize,
@@ -4414,7 +4213,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         concat!("Alignment of ", stringify!(__kernel_sigaction))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>()))._u as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._u) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4424,7 +4223,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>())).sa_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4434,7 +4233,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>())).sa_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4444,7 +4243,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>())).sa_restorer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -4455,13 +4254,16 @@ fn bindgen_test_layout___kernel_sigaction() {
     );
 }
 #[repr(C)]
+#[derive(Debug, Copy, Clone)]
 pub struct sigaltstack {
     pub ss_sp: *mut ::std::os::raw::c_void,
     pub ss_flags: ::std::os::raw::c_int,
-    pub ss_size: size_t,
+    pub ss_size: __kernel_size_t,
 }
 #[test]
 fn bindgen_test_layout_sigaltstack() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaltstack> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaltstack>(),
         12usize,
@@ -4473,7 +4275,7 @@ fn bindgen_test_layout_sigaltstack() {
         concat!("Alignment of ", stringify!(sigaltstack))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaltstack>())).ss_sp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss_sp) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4483,7 +4285,7 @@ fn bindgen_test_layout_sigaltstack() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaltstack>())).ss_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss_flags) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4493,7 +4295,7 @@ fn bindgen_test_layout_sigaltstack() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaltstack>())).ss_size as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss_size) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4512,6 +4314,8 @@ pub union sigval {
 }
 #[test]
 fn bindgen_test_layout_sigval() {
+    const UNINIT: ::std::mem::MaybeUninit<sigval> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigval>(),
         4usize,
@@ -4523,7 +4327,7 @@ fn bindgen_test_layout_sigval() {
         concat!("Alignment of ", stringify!(sigval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigval>())).sival_int as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sival_int) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4533,7 +4337,7 @@ fn bindgen_test_layout_sigval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigval>())).sival_ptr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sival_ptr) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4563,6 +4367,9 @@ pub struct __sifields__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_1>(),
         8usize,
@@ -4574,7 +4381,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_1>()))._pid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4584,7 +4391,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_1>()))._uid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4604,6 +4411,9 @@ pub struct __sifields__bindgen_ty_2 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_2() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_2> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_2>(),
         16usize,
@@ -4615,7 +4425,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_2))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4625,9 +4435,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._overrun as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._overrun) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4637,9 +4445,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._sigval as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4649,9 +4455,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._sys_private as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sys_private) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -4670,6 +4474,9 @@ pub struct __sifields__bindgen_ty_3 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_3() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_3> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_3>(),
         12usize,
@@ -4681,7 +4488,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_3))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_3>()))._pid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4691,7 +4498,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_3>()))._uid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4701,9 +4508,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_3>()))._sigval as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4724,6 +4529,9 @@ pub struct __sifields__bindgen_ty_4 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_4() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_4> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_4>(),
         20usize,
@@ -4735,7 +4543,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_4))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._pid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4745,7 +4553,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._uid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4755,9 +4563,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._status as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._status) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4767,7 +4573,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._utime as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._utime) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -4777,7 +4583,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._stime as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._stime) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4796,9 +4602,11 @@ pub struct __sifields__bindgen_ty_5 {
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub union __sifields__bindgen_ty_5__bindgen_ty_1 {
+    pub _trapno: ::std::os::raw::c_int,
     pub _addr_lsb: ::std::os::raw::c_short,
     pub _addr_bnd: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1,
     pub _addr_pkey: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2,
+    pub _perf: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -4809,6 +4617,9 @@ pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>(),
         12usize,
@@ -4826,10 +4637,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>()))
-                ._dummy_bnd as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._dummy_bnd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4839,10 +4647,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>()))._lower
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._lower) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4852,10 +4657,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>()))._upper
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._upper) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4873,6 +4675,9 @@ pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>(),
         8usize,
@@ -4890,10 +4695,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>()))
-                ._dummy_pkey as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._dummy_pkey) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4903,10 +4705,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>()))._pkey
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pkey) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4916,8 +4715,59 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
         )
     );
 }
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3 {
+    pub _data: ::std::os::raw::c_ulong,
+    pub _type: __u32,
+}
+#[test]
+fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
+        8usize,
+        concat!(
+            "Size of: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
+        )
+    );
+    assert_eq!(
+        ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
+        4usize,
+        concat!(
+            "Alignment of ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._data) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
+            "::",
+            stringify!(_data)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._type) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
+            "::",
+            stringify!(_type)
+        )
+    );
+}
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1>(),
         12usize,
@@ -4935,10 +4785,17 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1>()))._addr_lsb as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._trapno) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
+            "::",
+            stringify!(_trapno)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr_lsb) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4948,10 +4805,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1>()))._addr_bnd as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr_bnd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4961,10 +4815,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1>()))._addr_pkey
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr_pkey) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4973,9 +4824,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
             stringify!(_addr_pkey)
         )
     );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._perf) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
+            "::",
+            stringify!(_perf)
+        )
+    );
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5>(),
         16usize,
@@ -4987,7 +4851,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_5))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_5>()))._addr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5005,6 +4869,9 @@ pub struct __sifields__bindgen_ty_6 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_6() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_6> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_6>(),
         8usize,
@@ -5016,7 +4883,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_6() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_6))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_6>()))._band as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._band) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5026,7 +4893,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_6() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_6>()))._fd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._fd) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -5045,6 +4912,9 @@ pub struct __sifields__bindgen_ty_7 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_7() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_7> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_7>(),
         12usize,
@@ -5056,9 +4926,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_7))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_7>()))._call_addr as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._call_addr) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5068,9 +4936,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_7>()))._syscall as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._syscall) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -5080,7 +4946,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_7>()))._arch as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._arch) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5092,6 +4958,8 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
 }
 #[test]
 fn bindgen_test_layout___sifields() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields>(),
         20usize,
@@ -5103,7 +4971,7 @@ fn bindgen_test_layout___sifields() {
         concat!("Alignment of ", stringify!(__sifields))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._kill as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._kill) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5113,7 +4981,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._timer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._timer) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5123,7 +4991,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._rt as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._rt) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5133,7 +5001,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigchld as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigchld) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5143,7 +5011,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigfault as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigfault) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5153,7 +5021,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigpoll as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigpoll) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5163,7 +5031,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigsys as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigsys) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5194,6 +5062,9 @@ pub struct siginfo__bindgen_ty_1__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<siginfo__bindgen_ty_1__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1__bindgen_ty_1>(),
         32usize,
@@ -5208,10 +5079,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>())).si_signo as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).si_signo) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5221,10 +5089,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>())).si_errno as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).si_errno) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -5234,10 +5099,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>())).si_code as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).si_code) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5247,10 +5109,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>()))._sifields as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sifields) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -5262,6 +5121,9 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_siginfo__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<siginfo__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1>(),
         128usize,
@@ -5273,7 +5135,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(siginfo__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<siginfo__bindgen_ty_1>()))._si_pad as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._si_pad) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5320,6 +5182,9 @@ pub struct sigevent__bindgen_ty_1__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigevent__bindgen_ty_1__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1__bindgen_ty_1>(),
         8usize,
@@ -5337,10 +5202,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigevent__bindgen_ty_1__bindgen_ty_1>()))._function as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._function) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5350,10 +5212,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigevent__bindgen_ty_1__bindgen_ty_1>()))._attribute as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._attribute) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -5365,6 +5224,9 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigevent__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigevent__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1>(),
         52usize,
@@ -5376,7 +5238,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(sigevent__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent__bindgen_ty_1>()))._pad as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pad) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5386,7 +5248,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent__bindgen_ty_1>()))._tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5396,9 +5258,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigevent__bindgen_ty_1>()))._sigev_thread as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigev_thread) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5410,6 +5270,8 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigevent() {
+    const UNINIT: ::std::mem::MaybeUninit<sigevent> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigevent>(),
         64usize,
@@ -5421,7 +5283,7 @@ fn bindgen_test_layout_sigevent() {
         concat!("Alignment of ", stringify!(sigevent))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>())).sigev_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sigev_value) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5431,7 +5293,7 @@ fn bindgen_test_layout_sigevent() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>())).sigev_signo as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sigev_signo) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -5441,7 +5303,7 @@ fn bindgen_test_layout_sigevent() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>())).sigev_notify as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sigev_notify) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5451,7 +5313,7 @@ fn bindgen_test_layout_sigevent() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>()))._sigev_un as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigev_un) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -5472,6 +5334,8 @@ pub struct sigset64_t {
 }
 #[test]
 fn bindgen_test_layout_sigset64_t() {
+    const UNINIT: ::std::mem::MaybeUninit<sigset64_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigset64_t>(),
         8usize,
@@ -5483,7 +5347,7 @@ fn bindgen_test_layout_sigset64_t() {
         concat!("Alignment of ", stringify!(sigset64_t))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigset64_t>())).__bits as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__bits) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5515,6 +5379,9 @@ pub union sigaction__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_sigaction__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction__bindgen_ty_1>(),
         4usize,
@@ -5526,9 +5393,7 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(sigaction__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction__bindgen_ty_1>())).sa_handler as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5538,9 +5403,7 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction__bindgen_ty_1>())).sa_sigaction as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5552,6 +5415,8 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigaction() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction>(),
         16usize,
@@ -5563,7 +5428,7 @@ fn bindgen_test_layout_sigaction() {
         concat!("Alignment of ", stringify!(sigaction))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction>())).sa_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -5573,7 +5438,7 @@ fn bindgen_test_layout_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction>())).sa_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5583,7 +5448,7 @@ fn bindgen_test_layout_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction>())).sa_restorer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -5615,6 +5480,9 @@ pub union sigaction64__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction64__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction64__bindgen_ty_1>(),
         4usize,
@@ -5626,9 +5494,7 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(sigaction64__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction64__bindgen_ty_1>())).sa_handler as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5638,9 +5504,7 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction64__bindgen_ty_1>())).sa_sigaction as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5652,6 +5516,8 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigaction64() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction64> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction64>(),
         20usize,
@@ -5663,7 +5529,7 @@ fn bindgen_test_layout_sigaction64() {
         concat!("Alignment of ", stringify!(sigaction64))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction64>())).sa_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -5673,7 +5539,7 @@ fn bindgen_test_layout_sigaction64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction64>())).sa_restorer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5683,7 +5549,7 @@ fn bindgen_test_layout_sigaction64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction64>())).sa_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -5701,6 +5567,8 @@ pub struct timespec {
 }
 #[test]
 fn bindgen_test_layout_timespec() {
+    const UNINIT: ::std::mem::MaybeUninit<timespec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<timespec>(),
         8usize,
@@ -5712,7 +5580,7 @@ fn bindgen_test_layout_timespec() {
         concat!("Alignment of ", stringify!(timespec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timespec>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5722,7 +5590,7 @@ fn bindgen_test_layout_timespec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timespec>())).tv_nsec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -5883,6 +5751,8 @@ impl user_fpregs_fp_reg {
 }
 #[test]
 fn bindgen_test_layout_user_fpregs() {
+    const UNINIT: ::std::mem::MaybeUninit<user_fpregs> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<user_fpregs>(),
         116usize,
@@ -5894,7 +5764,7 @@ fn bindgen_test_layout_user_fpregs() {
         concat!("Alignment of ", stringify!(user_fpregs))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs>())).fpregs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpregs) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5904,7 +5774,7 @@ fn bindgen_test_layout_user_fpregs() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs>())).ftype as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ftype) as usize - ptr as usize },
         104usize,
         concat!(
             "Offset of field: ",
@@ -5914,7 +5784,7 @@ fn bindgen_test_layout_user_fpregs() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs>())).init_flag as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).init_flag) as usize - ptr as usize },
         112usize,
         concat!(
             "Offset of field: ",
@@ -5971,6 +5841,8 @@ pub struct user_regs {
 }
 #[test]
 fn bindgen_test_layout_user_regs() {
+    const UNINIT: ::std::mem::MaybeUninit<user_regs> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<user_regs>(),
         72usize,
@@ -5982,7 +5854,7 @@ fn bindgen_test_layout_user_regs() {
         concat!("Alignment of ", stringify!(user_regs))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs>())).uregs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uregs) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6000,6 +5872,8 @@ pub struct user_vfp {
 }
 #[test]
 fn bindgen_test_layout_user_vfp() {
+    const UNINIT: ::std::mem::MaybeUninit<user_vfp> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<user_vfp>(),
         264usize,
@@ -6011,7 +5885,7 @@ fn bindgen_test_layout_user_vfp() {
         concat!("Alignment of ", stringify!(user_vfp))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_vfp>())).fpregs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpregs) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6021,7 +5895,7 @@ fn bindgen_test_layout_user_vfp() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_vfp>())).fpscr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpscr) as usize - ptr as usize },
         256usize,
         concat!(
             "Offset of field: ",
@@ -6040,6 +5914,8 @@ pub struct user_vfp_exc {
 }
 #[test]
 fn bindgen_test_layout_user_vfp_exc() {
+    const UNINIT: ::std::mem::MaybeUninit<user_vfp_exc> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<user_vfp_exc>(),
         12usize,
@@ -6051,7 +5927,7 @@ fn bindgen_test_layout_user_vfp_exc() {
         concat!("Alignment of ", stringify!(user_vfp_exc))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_vfp_exc>())).fpexc as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpexc) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6061,7 +5937,7 @@ fn bindgen_test_layout_user_vfp_exc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_vfp_exc>())).fpinst as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpinst) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6071,7 +5947,7 @@ fn bindgen_test_layout_user_vfp_exc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_vfp_exc>())).fpinst2 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpinst2) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6102,6 +5978,8 @@ pub struct user {
 }
 #[test]
 fn bindgen_test_layout_user() {
+    const UNINIT: ::std::mem::MaybeUninit<user> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<user>(),
         296usize,
@@ -6113,7 +5991,7 @@ fn bindgen_test_layout_user() {
         concat!("Alignment of ", stringify!(user))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).regs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).regs) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6123,7 +6001,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_fpvalid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_fpvalid) as usize - ptr as usize },
         72usize,
         concat!(
             "Offset of field: ",
@@ -6133,7 +6011,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_tsize as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_tsize) as usize - ptr as usize },
         76usize,
         concat!(
             "Offset of field: ",
@@ -6143,7 +6021,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_dsize as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_dsize) as usize - ptr as usize },
         80usize,
         concat!(
             "Offset of field: ",
@@ -6153,7 +6031,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_ssize as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_ssize) as usize - ptr as usize },
         84usize,
         concat!(
             "Offset of field: ",
@@ -6163,7 +6041,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).start_code as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).start_code) as usize - ptr as usize },
         88usize,
         concat!(
             "Offset of field: ",
@@ -6173,7 +6051,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).start_stack as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).start_stack) as usize - ptr as usize },
         92usize,
         concat!(
             "Offset of field: ",
@@ -6183,7 +6061,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).signal as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).signal) as usize - ptr as usize },
         96usize,
         concat!(
             "Offset of field: ",
@@ -6193,7 +6071,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).reserved as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved) as usize - ptr as usize },
         100usize,
         concat!(
             "Offset of field: ",
@@ -6203,7 +6081,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_ar0 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_ar0) as usize - ptr as usize },
         104usize,
         concat!(
             "Offset of field: ",
@@ -6213,7 +6091,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).magic as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).magic) as usize - ptr as usize },
         108usize,
         concat!(
             "Offset of field: ",
@@ -6223,7 +6101,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_comm as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_comm) as usize - ptr as usize },
         112usize,
         concat!(
             "Offset of field: ",
@@ -6233,7 +6111,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_debugreg as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_debugreg) as usize - ptr as usize },
         144usize,
         concat!(
             "Offset of field: ",
@@ -6243,7 +6121,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_fp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_fp) as usize - ptr as usize },
         176usize,
         concat!(
             "Offset of field: ",
@@ -6253,7 +6131,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_fp0 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_fp0) as usize - ptr as usize },
         292usize,
         concat!(
             "Offset of field: ",
@@ -6263,22 +6141,22 @@ fn bindgen_test_layout_user() {
         )
     );
 }
-pub const REG_R0: ::std::os::raw::c_uint = 0;
-pub const REG_R1: ::std::os::raw::c_uint = 1;
-pub const REG_R2: ::std::os::raw::c_uint = 2;
-pub const REG_R3: ::std::os::raw::c_uint = 3;
-pub const REG_R4: ::std::os::raw::c_uint = 4;
-pub const REG_R5: ::std::os::raw::c_uint = 5;
-pub const REG_R6: ::std::os::raw::c_uint = 6;
-pub const REG_R7: ::std::os::raw::c_uint = 7;
-pub const REG_R8: ::std::os::raw::c_uint = 8;
-pub const REG_R9: ::std::os::raw::c_uint = 9;
-pub const REG_R10: ::std::os::raw::c_uint = 10;
-pub const REG_R11: ::std::os::raw::c_uint = 11;
-pub const REG_R12: ::std::os::raw::c_uint = 12;
-pub const REG_R13: ::std::os::raw::c_uint = 13;
-pub const REG_R14: ::std::os::raw::c_uint = 14;
-pub const REG_R15: ::std::os::raw::c_uint = 15;
+pub const REG_R0: _bindgen_ty_22 = 0;
+pub const REG_R1: _bindgen_ty_22 = 1;
+pub const REG_R2: _bindgen_ty_22 = 2;
+pub const REG_R3: _bindgen_ty_22 = 3;
+pub const REG_R4: _bindgen_ty_22 = 4;
+pub const REG_R5: _bindgen_ty_22 = 5;
+pub const REG_R6: _bindgen_ty_22 = 6;
+pub const REG_R7: _bindgen_ty_22 = 7;
+pub const REG_R8: _bindgen_ty_22 = 8;
+pub const REG_R9: _bindgen_ty_22 = 9;
+pub const REG_R10: _bindgen_ty_22 = 10;
+pub const REG_R11: _bindgen_ty_22 = 11;
+pub const REG_R12: _bindgen_ty_22 = 12;
+pub const REG_R13: _bindgen_ty_22 = 13;
+pub const REG_R14: _bindgen_ty_22 = 14;
+pub const REG_R15: _bindgen_ty_22 = 15;
 pub type _bindgen_ty_22 = ::std::os::raw::c_uint;
 pub type greg_t = ::std::os::raw::c_int;
 pub type gregset_t = [greg_t; 18usize];
@@ -6286,6 +6164,7 @@ pub type fpregset_t = user_fpregs;
 pub type mcontext_t = sigcontext;
 #[repr(C)]
 #[repr(align(8))]
+#[derive(Copy, Clone)]
 pub struct ucontext {
     pub uc_flags: ::std::os::raw::c_ulong,
     pub uc_link: *mut ucontext,
@@ -6309,6 +6188,9 @@ pub struct ucontext__bindgen_ty_1__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_ucontext__bindgen_ty_1__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<ucontext__bindgen_ty_1__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<ucontext__bindgen_ty_1__bindgen_ty_1>(),
         8usize,
@@ -6326,10 +6208,7 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<ucontext__bindgen_ty_1__bindgen_ty_1>())).uc_sigmask as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6339,10 +6218,7 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<ucontext__bindgen_ty_1__bindgen_ty_1>())).__padding_rt_sigset
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__padding_rt_sigset) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6354,6 +6230,9 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_ucontext__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<ucontext__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<ucontext__bindgen_ty_1>(),
         8usize,
@@ -6365,9 +6244,7 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(ucontext__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<ucontext__bindgen_ty_1>())).uc_sigmask64 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask64) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6379,6 +6256,8 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_ucontext() {
+    const UNINIT: ::std::mem::MaybeUninit<ucontext> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<ucontext>(),
         744usize,
@@ -6390,7 +6269,7 @@ fn bindgen_test_layout_ucontext() {
         concat!("Alignment of ", stringify!(ucontext))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_flags) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6400,7 +6279,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_link as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_link) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6410,7 +6289,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_stack as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_stack) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6420,7 +6299,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_mcontext as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_mcontext) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -6430,7 +6309,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).__padding as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__padding) as usize - ptr as usize },
         112usize,
         concat!(
             "Offset of field: ",
@@ -6440,7 +6319,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_regspace as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_regspace) as usize - ptr as usize },
         232usize,
         concat!(
             "Offset of field: ",
@@ -6654,6 +6533,8 @@ pub struct __kernel_timespec {
 }
 #[test]
 fn bindgen_test_layout___kernel_timespec() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_timespec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_timespec>(),
         16usize,
@@ -6665,7 +6546,7 @@ fn bindgen_test_layout___kernel_timespec() {
         concat!("Alignment of ", stringify!(__kernel_timespec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_timespec>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6675,7 +6556,7 @@ fn bindgen_test_layout___kernel_timespec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_timespec>())).tv_nsec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6693,6 +6574,8 @@ pub struct __kernel_itimerspec {
 }
 #[test]
 fn bindgen_test_layout___kernel_itimerspec() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_itimerspec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_itimerspec>(),
         32usize,
@@ -6704,7 +6587,7 @@ fn bindgen_test_layout___kernel_itimerspec() {
         concat!("Alignment of ", stringify!(__kernel_itimerspec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_itimerspec>())).it_interval as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6714,7 +6597,7 @@ fn bindgen_test_layout___kernel_itimerspec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_itimerspec>())).it_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -6726,40 +6609,43 @@ fn bindgen_test_layout___kernel_itimerspec() {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct __kernel_old_timeval {
-    pub tv_sec: __kernel_long_t,
-    pub tv_usec: __kernel_long_t,
+pub struct __kernel_old_timespec {
+    pub tv_sec: __kernel_old_time_t,
+    pub tv_nsec: ::std::os::raw::c_long,
 }
 #[test]
-fn bindgen_test_layout___kernel_old_timeval() {
+fn bindgen_test_layout___kernel_old_timespec() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_old_timespec> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<__kernel_old_timeval>(),
+        ::std::mem::size_of::<__kernel_old_timespec>(),
         8usize,
-        concat!("Size of: ", stringify!(__kernel_old_timeval))
+        concat!("Size of: ", stringify!(__kernel_old_timespec))
     );
     assert_eq!(
-        ::std::mem::align_of::<__kernel_old_timeval>(),
+        ::std::mem::align_of::<__kernel_old_timespec>(),
         4usize,
-        concat!("Alignment of ", stringify!(__kernel_old_timeval))
+        concat!("Alignment of ", stringify!(__kernel_old_timespec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_old_timeval>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(__kernel_old_timeval),
+            stringify!(__kernel_old_timespec),
             "::",
             stringify!(tv_sec)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_old_timeval>())).tv_usec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
-            stringify!(__kernel_old_timeval),
+            stringify!(__kernel_old_timespec),
             "::",
-            stringify!(tv_usec)
+            stringify!(tv_nsec)
         )
     );
 }
@@ -6771,6 +6657,9 @@ pub struct __kernel_sock_timeval {
 }
 #[test]
 fn bindgen_test_layout___kernel_sock_timeval() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_sock_timeval> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_sock_timeval>(),
         16usize,
@@ -6782,7 +6671,7 @@ fn bindgen_test_layout___kernel_sock_timeval() {
         concat!("Alignment of ", stringify!(__kernel_sock_timeval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sock_timeval>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6792,7 +6681,7 @@ fn bindgen_test_layout___kernel_sock_timeval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sock_timeval>())).tv_usec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6805,11 +6694,13 @@ fn bindgen_test_layout___kernel_sock_timeval() {
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct timeval {
-    pub tv_sec: __kernel_time_t,
+    pub tv_sec: __kernel_old_time_t,
     pub tv_usec: __kernel_suseconds_t,
 }
 #[test]
 fn bindgen_test_layout_timeval() {
+    const UNINIT: ::std::mem::MaybeUninit<timeval> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<timeval>(),
         8usize,
@@ -6821,7 +6712,7 @@ fn bindgen_test_layout_timeval() {
         concat!("Alignment of ", stringify!(timeval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timeval>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6831,7 +6722,7 @@ fn bindgen_test_layout_timeval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timeval>())).tv_usec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6843,51 +6734,14 @@ fn bindgen_test_layout_timeval() {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct timezone {
-    pub tz_minuteswest: ::std::os::raw::c_int,
-    pub tz_dsttime: ::std::os::raw::c_int,
-}
-#[test]
-fn bindgen_test_layout_timezone() {
-    assert_eq!(
-        ::std::mem::size_of::<timezone>(),
-        8usize,
-        concat!("Size of: ", stringify!(timezone))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<timezone>(),
-        4usize,
-        concat!("Alignment of ", stringify!(timezone))
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timezone>())).tz_minuteswest as *const _ as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_minuteswest)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timezone>())).tz_dsttime as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_dsttime)
-        )
-    );
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
 pub struct itimerspec {
     pub it_interval: timespec,
     pub it_value: timespec,
 }
 #[test]
 fn bindgen_test_layout_itimerspec() {
+    const UNINIT: ::std::mem::MaybeUninit<itimerspec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<itimerspec>(),
         16usize,
@@ -6899,7 +6753,7 @@ fn bindgen_test_layout_itimerspec() {
         concat!("Alignment of ", stringify!(itimerspec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerspec>())).it_interval as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6909,7 +6763,7 @@ fn bindgen_test_layout_itimerspec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerspec>())).it_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6927,6 +6781,8 @@ pub struct itimerval {
 }
 #[test]
 fn bindgen_test_layout_itimerval() {
+    const UNINIT: ::std::mem::MaybeUninit<itimerval> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<itimerval>(),
         16usize,
@@ -6938,7 +6794,7 @@ fn bindgen_test_layout_itimerval() {
         concat!("Alignment of ", stringify!(itimerval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerval>())).it_interval as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6948,7 +6804,7 @@ fn bindgen_test_layout_itimerval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerval>())).it_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6958,6 +6814,47 @@ fn bindgen_test_layout_itimerval() {
         )
     );
 }
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct timezone {
+    pub tz_minuteswest: ::std::os::raw::c_int,
+    pub tz_dsttime: ::std::os::raw::c_int,
+}
+#[test]
+fn bindgen_test_layout_timezone() {
+    const UNINIT: ::std::mem::MaybeUninit<timezone> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<timezone>(),
+        8usize,
+        concat!("Size of: ", stringify!(timezone))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<timezone>(),
+        4usize,
+        concat!("Alignment of ", stringify!(timezone))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).tz_minuteswest) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(timezone),
+            "::",
+            stringify!(tz_minuteswest)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).tz_dsttime) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(timezone),
+            "::",
+            stringify!(tz_dsttime)
+        )
+    );
+}
 pub type fd_mask = ::std::os::raw::c_ulong;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -6966,6 +6863,8 @@ pub struct fd_set {
 }
 #[test]
 fn bindgen_test_layout_fd_set() {
+    const UNINIT: ::std::mem::MaybeUninit<fd_set> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<fd_set>(),
         128usize,
@@ -6977,7 +6876,7 @@ fn bindgen_test_layout_fd_set() {
         concat!("Alignment of ", stringify!(fd_set))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<fd_set>())).fds_bits as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6988,21 +6887,21 @@ fn bindgen_test_layout_fd_set() {
     );
 }
 extern "C" {
-    pub fn __FD_CLR_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: size_t);
+    pub fn __FD_CLR_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: usize);
 }
 extern "C" {
-    pub fn __FD_SET_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: size_t);
+    pub fn __FD_SET_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: usize);
 }
 extern "C" {
     pub fn __FD_ISSET_chk(
         arg1: ::std::os::raw::c_int,
         arg2: *const fd_set,
-        arg3: size_t,
+        arg3: usize,
     ) -> ::std::os::raw::c_int;
 }
 extern "C" {
     pub fn select(
-        __fd_count: ::std::os::raw::c_int,
+        __max_fd_plus_one: ::std::os::raw::c_int,
         __read_fds: *mut fd_set,
         __write_fds: *mut fd_set,
         __exception_fds: *mut fd_set,
@@ -7011,7 +6910,7 @@ extern "C" {
 }
 extern "C" {
     pub fn pselect(
-        __fd_count: ::std::os::raw::c_int,
+        __max_fd_plus_one: ::std::os::raw::c_int,
         __read_fds: *mut fd_set,
         __write_fds: *mut fd_set,
         __exception_fds: *mut fd_set,
@@ -7021,7 +6920,7 @@ extern "C" {
 }
 extern "C" {
     pub fn pselect64(
-        __fd_count: ::std::os::raw::c_int,
+        __max_fd_plus_one: ::std::os::raw::c_int,
         __read_fds: *mut fd_set,
         __write_fds: *mut fd_set,
         __exception_fds: *mut fd_set,
@@ -7086,6 +6985,8 @@ pub struct tm {
 }
 #[test]
 fn bindgen_test_layout_tm() {
+    const UNINIT: ::std::mem::MaybeUninit<tm> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<tm>(),
         44usize,
@@ -7097,7 +6998,7 @@ fn bindgen_test_layout_tm() {
         concat!("Alignment of ", stringify!(tm))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7107,7 +7008,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_min as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_min) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -7117,7 +7018,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_hour as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_hour) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7127,7 +7028,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_mday as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_mday) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -7137,7 +7038,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_mon as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_mon) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -7147,7 +7048,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_year as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_year) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -7157,7 +7058,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_wday as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_wday) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -7167,7 +7068,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_yday as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_yday) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -7177,7 +7078,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_isdst as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_isdst) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -7187,7 +7088,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_gmtoff as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_gmtoff) as usize - ptr as usize },
         36usize,
         concat!(
             "Offset of field: ",
@@ -7197,7 +7098,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_zone as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_zone) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -7261,19 +7162,19 @@ extern "C" {
 extern "C" {
     pub fn strftime(
         __buf: *mut ::std::os::raw::c_char,
-        __n: size_t,
+        __n: usize,
         __fmt: *const ::std::os::raw::c_char,
         __tm: *const tm,
-    ) -> size_t;
+    ) -> usize;
 }
 extern "C" {
     pub fn strftime_l(
         __buf: *mut ::std::os::raw::c_char,
-        __n: size_t,
+        __n: usize,
         __fmt: *const ::std::os::raw::c_char,
         __tm: *const tm,
         __l: locale_t,
-    ) -> size_t;
+    ) -> usize;
 }
 extern "C" {
     pub fn ctime(__t: *const time_t) -> *mut ::std::os::raw::c_char;
@@ -7381,12 +7282,17 @@ pub struct clone_args {
     pub stack: __u64,
     pub stack_size: __u64,
     pub tls: __u64,
+    pub set_tid: __u64,
+    pub set_tid_size: __u64,
+    pub cgroup: __u64,
 }
 #[test]
 fn bindgen_test_layout_clone_args() {
+    const UNINIT: ::std::mem::MaybeUninit<clone_args> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<clone_args>(),
-        64usize,
+        88usize,
         concat!("Size of: ", stringify!(clone_args))
     );
     assert_eq!(
@@ -7395,7 +7301,7 @@ fn bindgen_test_layout_clone_args() {
         concat!("Alignment of ", stringify!(clone_args))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7405,7 +7311,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).pidfd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).pidfd) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7415,7 +7321,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).child_tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).child_tid) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -7425,7 +7331,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).parent_tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).parent_tid) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -7435,7 +7341,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).exit_signal as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).exit_signal) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -7445,7 +7351,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).stack as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).stack) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -7455,7 +7361,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).stack_size as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).stack_size) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -7465,7 +7371,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).tls as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tls) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -7474,6 +7380,36 @@ fn bindgen_test_layout_clone_args() {
             stringify!(tls)
         )
     );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).set_tid) as usize - ptr as usize },
+        64usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(clone_args),
+            "::",
+            stringify!(set_tid)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).set_tid_size) as usize - ptr as usize },
+        72usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(clone_args),
+            "::",
+            stringify!(set_tid_size)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).cgroup) as usize - ptr as usize },
+        80usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(clone_args),
+            "::",
+            stringify!(cgroup)
+        )
+    );
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -7482,6 +7418,8 @@ pub struct sched_param {
 }
 #[test]
 fn bindgen_test_layout_sched_param() {
+    const UNINIT: ::std::mem::MaybeUninit<sched_param> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sched_param>(),
         4usize,
@@ -7493,7 +7431,7 @@ fn bindgen_test_layout_sched_param() {
         concat!("Alignment of ", stringify!(sched_param))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sched_param>())).sched_priority as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sched_priority) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7531,15 +7469,15 @@ extern "C" {
 extern "C" {
     pub fn sched_rr_get_interval(__pid: pid_t, __quantum: *mut timespec) -> ::std::os::raw::c_int;
 }
-pub const PTHREAD_MUTEX_NORMAL: ::std::os::raw::c_uint = 0;
-pub const PTHREAD_MUTEX_RECURSIVE: ::std::os::raw::c_uint = 1;
-pub const PTHREAD_MUTEX_ERRORCHECK: ::std::os::raw::c_uint = 2;
-pub const PTHREAD_MUTEX_ERRORCHECK_NP: ::std::os::raw::c_uint = 2;
-pub const PTHREAD_MUTEX_RECURSIVE_NP: ::std::os::raw::c_uint = 1;
-pub const PTHREAD_MUTEX_DEFAULT: ::std::os::raw::c_uint = 0;
+pub const PTHREAD_MUTEX_NORMAL: _bindgen_ty_23 = 0;
+pub const PTHREAD_MUTEX_RECURSIVE: _bindgen_ty_23 = 1;
+pub const PTHREAD_MUTEX_ERRORCHECK: _bindgen_ty_23 = 2;
+pub const PTHREAD_MUTEX_ERRORCHECK_NP: _bindgen_ty_23 = 2;
+pub const PTHREAD_MUTEX_RECURSIVE_NP: _bindgen_ty_23 = 1;
+pub const PTHREAD_MUTEX_DEFAULT: _bindgen_ty_23 = 0;
 pub type _bindgen_ty_23 = ::std::os::raw::c_uint;
-pub const PTHREAD_RWLOCK_PREFER_READER_NP: ::std::os::raw::c_uint = 0;
-pub const PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP: ::std::os::raw::c_uint = 1;
+pub const PTHREAD_RWLOCK_PREFER_READER_NP: _bindgen_ty_24 = 0;
+pub const PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP: _bindgen_ty_24 = 1;
 pub type _bindgen_ty_24 = ::std::os::raw::c_uint;
 pub type __pthread_cleanup_func_t =
     ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>;
@@ -7552,6 +7490,8 @@ pub struct __pthread_cleanup_t {
 }
 #[test]
 fn bindgen_test_layout___pthread_cleanup_t() {
+    const UNINIT: ::std::mem::MaybeUninit<__pthread_cleanup_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__pthread_cleanup_t>(),
         12usize,
@@ -7563,9 +7503,7 @@ fn bindgen_test_layout___pthread_cleanup_t() {
         concat!("Alignment of ", stringify!(__pthread_cleanup_t))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__pthread_cleanup_t>())).__cleanup_prev as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_prev) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7575,9 +7513,7 @@ fn bindgen_test_layout___pthread_cleanup_t() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__pthread_cleanup_t>())).__cleanup_routine as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_routine) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -7587,9 +7523,7 @@ fn bindgen_test_layout___pthread_cleanup_t() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__pthread_cleanup_t>())).__cleanup_arg as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_arg) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7609,24 +7543,23 @@ extern "C" {
 extern "C" {
     pub fn __pthread_cleanup_pop(arg1: *mut __pthread_cleanup_t, arg2: ::std::os::raw::c_int);
 }
-#[doc = " Data associated with an ALooper fd that will be returned as the \"outData\""]
-#[doc = " when that source has data ready."]
+#[doc = " Data associated with an ALooper fd that will be returned as the \"outData\"\n when that source has data ready."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct android_poll_source {
-    #[doc = " The identifier of this source.  May be LOOPER_ID_MAIN or"]
-    #[doc = " LOOPER_ID_INPUT."]
+    #[doc = " The identifier of this source.  May be LOOPER_ID_MAIN or\n LOOPER_ID_INPUT."]
     pub id: i32,
     #[doc = " The android_app this ident is associated with."]
     pub app: *mut android_app,
-    #[doc = " Function to call to perform the standard processing of data from"]
-    #[doc = " this source."]
+    #[doc = " Function to call to perform the standard processing of data from\n this source."]
     pub process: ::std::option::Option<
         unsafe extern "C" fn(app: *mut android_app, source: *mut android_poll_source),
     >,
 }
 #[test]
 fn bindgen_test_layout_android_poll_source() {
+    const UNINIT: ::std::mem::MaybeUninit<android_poll_source> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_poll_source>(),
         12usize,
@@ -7638,7 +7571,7 @@ fn bindgen_test_layout_android_poll_source() {
         concat!("Alignment of ", stringify!(android_poll_source))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_poll_source>())).id as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7648,7 +7581,7 @@ fn bindgen_test_layout_android_poll_source() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_poll_source>())).app as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).app) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -7658,7 +7591,7 @@ fn bindgen_test_layout_android_poll_source() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_poll_source>())).process as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).process) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7671,37 +7604,26 @@ fn bindgen_test_layout_android_poll_source() {
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct android_input_buffer {
-    #[doc = " Pointer to a read-only array of pointers to GameActivityMotionEvent."]
-    #[doc = " Only the first motionEventsCount events are valid."]
-    pub motionEvents: [GameActivityMotionEvent; 16usize],
+    #[doc = " Pointer to a read-only array of GameActivityMotionEvent.\n Only the first motionEventsCount events are valid."]
+    pub motionEvents: *mut GameActivityMotionEvent,
     #[doc = " The number of valid motion events in `motionEvents`."]
     pub motionEventsCount: u64,
-    #[doc = " Pointer to a read-only array of pointers to GameActivityHistoricalPointerAxes."]
-    #[doc = ""]
-    #[doc = " Only the first historicalSamplesCount samples are valid."]
-    #[doc = " Refer to event->historicalStart, event->pointerCount and event->historicalCount"]
-    #[doc = " to access the specific samples that relate to an event."]
-    #[doc = ""]
-    #[doc = " Each slice of samples for one event has a length of"]
-    #[doc = " (event->pointerCount and event->historicalCount) and is in pointer-major"]
-    #[doc = " order so the historic samples for each pointer are contiguous."]
-    #[doc = " E.g. you would access historic sample index 3 for pointer 2 of an event with:"]
-    #[doc = ""]
-    #[doc = "   historicalAxisSamples[event->historicalStart + (event->historicalCount * 2) + 3];"]
-    pub historicalAxisSamples: [GameActivityHistoricalPointerAxes; 64usize],
-    #[doc = " The number of valid historical samples in `historicalAxisSamples`."]
-    pub historicalSamplesCount: u64,
-    #[doc = " Pointer to a read-only array of pointers to GameActivityKeyEvent."]
-    #[doc = " Only the first keyEventsCount events are valid."]
-    pub keyEvents: [GameActivityKeyEvent; 4usize],
+    #[doc = " The size of the `motionEvents` buffer."]
+    pub motionEventsBufferSize: u64,
+    #[doc = " Pointer to a read-only array of GameActivityKeyEvent.\n Only the first keyEventsCount events are valid."]
+    pub keyEvents: *mut GameActivityKeyEvent,
     #[doc = " The number of valid \"Key\" events in `keyEvents`."]
     pub keyEventsCount: u64,
+    #[doc = " The size of the `keyEvents` buffer."]
+    pub keyEventsBufferSize: u64,
 }
 #[test]
 fn bindgen_test_layout_android_input_buffer() {
+    const UNINIT: ::std::mem::MaybeUninit<android_input_buffer> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_input_buffer>(),
-        40824usize,
+        48usize,
         concat!("Size of: ", stringify!(android_input_buffer))
     );
     assert_eq!(
@@ -7710,9 +7632,7 @@ fn bindgen_test_layout_android_input_buffer() {
         concat!("Alignment of ", stringify!(android_input_buffer))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).motionEvents as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEvents) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7722,10 +7642,8 @@ fn bindgen_test_layout_android_input_buffer() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).motionEventsCount as *const _ as usize
-        },
-        27776usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEventsCount) as usize - ptr as usize },
+        8usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
@@ -7734,153 +7652,81 @@ fn bindgen_test_layout_android_input_buffer() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).historicalAxisSamples as *const _
-                as usize
-        },
-        27784usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEventsBufferSize) as usize - ptr as usize },
+        16usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(historicalAxisSamples)
+            stringify!(motionEventsBufferSize)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).historicalSamplesCount as *const _
-                as usize
-        },
-        40584usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEvents) as usize - ptr as usize },
+        24usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(historicalSamplesCount)
+            stringify!(keyEvents)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_input_buffer>())).keyEvents as *const _ as usize },
-        40592usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEventsCount) as usize - ptr as usize },
+        32usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(keyEvents)
+            stringify!(keyEventsCount)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).keyEventsCount as *const _ as usize
-        },
-        40816usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEventsBufferSize) as usize - ptr as usize },
+        40usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(keyEventsCount)
+            stringify!(keyEventsBufferSize)
         )
     );
 }
-#[doc = " Function pointer declaration for the filtering of key events."]
-#[doc = " A function with this signature should be passed to"]
-#[doc = " android_app_set_key_event_filter and return false for any events that should"]
-#[doc = " not be handled by android_native_app_glue. These events will be handled by"]
-#[doc = " the system instead."]
+#[doc = " Function pointer declaration for the filtering of key events.\n A function with this signature should be passed to\n android_app_set_key_event_filter and return false for any events that should\n not be handled by android_native_app_glue. These events will be handled by\n the system instead."]
 pub type android_key_event_filter =
     ::std::option::Option<unsafe extern "C" fn(arg1: *const GameActivityKeyEvent) -> bool>;
-#[doc = " Function pointer definition for the filtering of motion events."]
-#[doc = " A function with this signature should be passed to"]
-#[doc = " android_app_set_motion_event_filter and return false for any events that"]
-#[doc = " should not be handled by android_native_app_glue. These events will be"]
-#[doc = " handled by the system instead."]
+#[doc = " Function pointer definition for the filtering of motion events.\n A function with this signature should be passed to\n android_app_set_motion_event_filter and return false for any events that\n should not be handled by android_native_app_glue. These events will be\n handled by the system instead."]
 pub type android_motion_event_filter =
     ::std::option::Option<unsafe extern "C" fn(arg1: *const GameActivityMotionEvent) -> bool>;
-#[doc = " The GameActivity interface provided by <game-activity/GameActivity.h>"]
-#[doc = " is based on a set of application-provided callbacks that will be called"]
-#[doc = " by the Activity's main thread when certain events occur."]
-#[doc = ""]
-#[doc = " This means that each one of this callbacks _should_ _not_ block, or they"]
-#[doc = " risk having the system force-close the application. This programming"]
-#[doc = " model is direct, lightweight, but constraining."]
-#[doc = ""]
-#[doc = " The 'android_native_app_glue' static library is used to provide a different"]
-#[doc = " execution model where the application can implement its own main event"]
-#[doc = " loop in a different thread instead. Here's how it works:"]
-#[doc = ""]
-#[doc = " 1/ The application must provide a function named \"android_main()\" that"]
-#[doc = "    will be called when the activity is created, in a new thread that is"]
-#[doc = "    distinct from the activity's main thread."]
-#[doc = ""]
-#[doc = " 2/ android_main() receives a pointer to a valid \"android_app\" structure"]
-#[doc = "    that contains references to other important objects, e.g. the"]
-#[doc = "    GameActivity obejct instance the application is running in."]
-#[doc = ""]
-#[doc = " 3/ the \"android_app\" object holds an ALooper instance that already"]
-#[doc = "    listens to activity lifecycle events (e.g. \"pause\", \"resume\")."]
-#[doc = "    See APP_CMD_XXX declarations below."]
-#[doc = ""]
-#[doc = "    This corresponds to an ALooper identifier returned by"]
-#[doc = "    ALooper_pollOnce with value LOOPER_ID_MAIN."]
-#[doc = ""]
-#[doc = "    Your application can use the same ALooper to listen to additional"]
-#[doc = "    file-descriptors.  They can either be callback based, or with return"]
-#[doc = "    identifiers starting with LOOPER_ID_USER."]
-#[doc = ""]
-#[doc = " 4/ Whenever you receive a LOOPER_ID_MAIN event,"]
-#[doc = "    the returned data will point to an android_poll_source structure.  You"]
-#[doc = "    can call the process() function on it, and fill in android_app->onAppCmd"]
-#[doc = "    to be called for your own processing of the event."]
-#[doc = ""]
-#[doc = "    Alternatively, you can call the low-level functions to read and process"]
-#[doc = "    the data directly...  look at the process_cmd() and process_input()"]
-#[doc = "    implementations in the glue to see how to do this."]
-#[doc = ""]
-#[doc = " See the sample named \"native-activity\" that comes with the NDK with a"]
-#[doc = " full usage example.  Also look at the documentation of GameActivity."]
+#[doc = " The GameActivity interface provided by <game-activity/GameActivity.h>\n is based on a set of application-provided callbacks that will be called\n by the Activity's main thread when certain events occur.\n\n This means that each one of this callbacks _should_ _not_ block, or they\n risk having the system force-close the application. This programming\n model is direct, lightweight, but constraining.\n\n The 'android_native_app_glue' static library is used to provide a different\n execution model where the application can implement its own main event\n loop in a different thread instead. Here's how it works:\n\n 1/ The application must provide a function named \"android_main()\" that\n    will be called when the activity is created, in a new thread that is\n    distinct from the activity's main thread.\n\n 2/ android_main() receives a pointer to a valid \"android_app\" structure\n    that contains references to other important objects, e.g. the\n    GameActivity obejct instance the application is running in.\n\n 3/ the \"android_app\" object holds an ALooper instance that already\n    listens to activity lifecycle events (e.g. \"pause\", \"resume\").\n    See APP_CMD_XXX declarations below.\n\n    This corresponds to an ALooper identifier returned by\n    ALooper_pollOnce with value LOOPER_ID_MAIN.\n\n    Your application can use the same ALooper to listen to additional\n    file-descriptors.  They can either be callback based, or with return\n    identifiers starting with LOOPER_ID_USER.\n\n 4/ Whenever you receive a LOOPER_ID_MAIN event,\n    the returned data will point to an android_poll_source structure.  You\n    can call the process() function on it, and fill in android_app->onAppCmd\n    to be called for your own processing of the event.\n\n    Alternatively, you can call the low-level functions to read and process\n    the data directly...  look at the process_cmd() and process_input()\n    implementations in the glue to see how to do this.\n\n See the sample named \"native-activity\" that comes with the NDK with a\n full usage example.  Also look at the documentation of GameActivity."]
 #[repr(C)]
 pub struct android_app {
     #[doc = " An optional pointer to application-defined state."]
     pub userData: *mut ::std::os::raw::c_void,
-    #[doc = " A required callback for processing main app commands (`APP_CMD_*`)."]
-    #[doc = " This is called each frame if there are app commands that need processing."]
+    #[doc = " A required callback for processing main app commands (`APP_CMD_*`).\n This is called each frame if there are app commands that need processing."]
     pub onAppCmd: ::std::option::Option<unsafe extern "C" fn(app: *mut android_app, cmd: i32)>,
     #[doc = " The GameActivity object instance that this app is running in."]
     pub activity: *mut GameActivity,
     #[doc = " The current configuration the app is running in."]
     pub config: *mut AConfiguration,
-    #[doc = " The last activity saved state, as provided at creation time."]
-    #[doc = " It is NULL if there was no state.  You can use this as you need; the"]
-    #[doc = " memory will remain around until you call android_app_exec_cmd() for"]
-    #[doc = " APP_CMD_RESUME, at which point it will be freed and savedState set to"]
-    #[doc = " NULL. These variables should only be changed when processing a"]
-    #[doc = " APP_CMD_SAVE_STATE, at which point they will be initialized to NULL and"]
-    #[doc = " you can malloc your state and place the information here.  In that case"]
-    #[doc = " the memory will be freed for you later."]
+    #[doc = " The last activity saved state, as provided at creation time.\n It is NULL if there was no state.  You can use this as you need; the\n memory will remain around until you call android_app_exec_cmd() for\n APP_CMD_RESUME, at which point it will be freed and savedState set to\n NULL. These variables should only be changed when processing a\n APP_CMD_SAVE_STATE, at which point they will be initialized to NULL and\n you can malloc your state and place the information here.  In that case\n the memory will be freed for you later."]
     pub savedState: *mut ::std::os::raw::c_void,
     #[doc = " The size of the activity saved state. It is 0 if `savedState` is NULL."]
-    pub savedStateSize: size_t,
+    pub savedStateSize: usize,
     #[doc = " The ALooper associated with the app's thread."]
     pub looper: *mut ALooper,
     #[doc = " When non-NULL, this is the window surface that the app can draw in."]
     pub window: *mut ANativeWindow,
-    #[doc = " Current content rectangle of the window; this is the area where the"]
-    #[doc = " window's content should be placed to be seen by the user."]
+    #[doc = " Current content rectangle of the window; this is the area where the\n window's content should be placed to be seen by the user."]
     pub contentRect: ARect,
-    #[doc = " Current state of the app's activity.  May be either APP_CMD_START,"]
-    #[doc = " APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP."]
+    #[doc = " Current state of the app's activity.  May be either APP_CMD_START,\n APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP."]
     pub activityState: ::std::os::raw::c_int,
-    #[doc = " This is non-zero when the application's GameActivity is being"]
-    #[doc = " destroyed and waiting for the app thread to complete."]
+    #[doc = " This is non-zero when the application's GameActivity is being\n destroyed and waiting for the app thread to complete."]
     pub destroyRequested: ::std::os::raw::c_int,
-    #[doc = " This is used for buffering input from GameActivity. Once ready, the"]
-    #[doc = " application thread switches the buffers and processes what was"]
-    #[doc = " accumulated."]
+    #[doc = " This is used for buffering input from GameActivity. Once ready, the\n application thread switches the buffers and processes what was\n accumulated."]
     pub inputBuffers: [android_input_buffer; 2usize],
     pub currentInputBuffer: ::std::os::raw::c_int,
-    #[doc = " 0 if no text input event is outstanding, 1 if it is."]
-    #[doc = " Use `GameActivity_getTextInputState` to get information"]
-    #[doc = " about the text entered by the user."]
+    #[doc = " 0 if no text input event is outstanding, 1 if it is.\n Use `GameActivity_getTextInputState` to get information\n about the text entered by the user."]
     pub textInputState: ::std::os::raw::c_int,
     #[doc = " @cond INTERNAL"]
     pub mutex: pthread_mutex_t,
@@ -7902,9 +7748,11 @@ pub struct android_app {
 }
 #[test]
 fn bindgen_test_layout_android_app() {
+    const UNINIT: ::std::mem::MaybeUninit<android_app> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_app>(),
-        81792usize,
+        240usize,
         concat!("Size of: ", stringify!(android_app))
     );
     assert_eq!(
@@ -7913,7 +7761,7 @@ fn bindgen_test_layout_android_app() {
         concat!("Alignment of ", stringify!(android_app))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).userData as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).userData) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7923,7 +7771,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).onAppCmd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onAppCmd) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -7933,7 +7781,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).activity as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).activity) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7943,7 +7791,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).config as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).config) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -7953,7 +7801,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).savedState as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).savedState) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -7963,7 +7811,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).savedStateSize as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).savedStateSize) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -7973,7 +7821,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).looper as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).looper) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -7983,7 +7831,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).window as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).window) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -7993,7 +7841,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).contentRect as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).contentRect) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -8003,7 +7851,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).activityState as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).activityState) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -8013,7 +7861,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).destroyRequested as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).destroyRequested) as usize - ptr as usize },
         52usize,
         concat!(
             "Offset of field: ",
@@ -8023,7 +7871,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).inputBuffers as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).inputBuffers) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -8033,8 +7881,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).currentInputBuffer as *const _ as usize },
-        81704usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).currentInputBuffer) as usize - ptr as usize },
+        152usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8043,8 +7891,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).textInputState as *const _ as usize },
-        81708usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).textInputState) as usize - ptr as usize },
+        156usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8053,8 +7901,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).mutex as *const _ as usize },
-        81712usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).mutex) as usize - ptr as usize },
+        160usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8063,8 +7911,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).cond as *const _ as usize },
-        81716usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).cond) as usize - ptr as usize },
+        164usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8073,8 +7921,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).msgread as *const _ as usize },
-        81720usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).msgread) as usize - ptr as usize },
+        168usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8083,8 +7931,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).msgwrite as *const _ as usize },
-        81724usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).msgwrite) as usize - ptr as usize },
+        172usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8093,8 +7941,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).thread as *const _ as usize },
-        81728usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).thread) as usize - ptr as usize },
+        176usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8103,8 +7951,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).cmdPollSource as *const _ as usize },
-        81732usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).cmdPollSource) as usize - ptr as usize },
+        180usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8113,8 +7961,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).running as *const _ as usize },
-        81744usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).running) as usize - ptr as usize },
+        192usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8123,8 +7971,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).stateSaved as *const _ as usize },
-        81748usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).stateSaved) as usize - ptr as usize },
+        196usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8133,8 +7981,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).destroyed as *const _ as usize },
-        81752usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).destroyed) as usize - ptr as usize },
+        200usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8143,8 +7991,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).redrawNeeded as *const _ as usize },
-        81756usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).redrawNeeded) as usize - ptr as usize },
+        204usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8153,8 +8001,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).pendingWindow as *const _ as usize },
-        81760usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pendingWindow) as usize - ptr as usize },
+        208usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8163,8 +8011,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).pendingContentRect as *const _ as usize },
-        81764usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pendingContentRect) as usize - ptr as usize },
+        212usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8173,8 +8021,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).keyEventFilter as *const _ as usize },
-        81780usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEventFilter) as usize - ptr as usize },
+        228usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8183,8 +8031,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).motionEventFilter as *const _ as usize },
-        81784usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEventFilter) as usize - ptr as usize },
+        232usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8193,10 +8041,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_app>())).inputAvailableWakeUp as *const _ as usize
-        },
-        81788usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).inputAvailableWakeUp) as usize - ptr as usize },
+        236usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8205,8 +8051,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).inputSwapPending as *const _ as usize },
-        81789usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).inputSwapPending) as usize - ptr as usize },
+        237usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -8215,139 +8061,89 @@ fn bindgen_test_layout_android_app() {
         )
     );
 }
-#[doc = " Looper data ID of commands coming from the app's main thread, which"]
-#[doc = " is returned as an identifier from ALooper_pollOnce().  The data for this"]
-#[doc = " identifier is a pointer to an android_poll_source structure."]
-#[doc = " These can be retrieved and processed with android_app_read_cmd()"]
-#[doc = " and android_app_exec_cmd()."]
+#[doc = " Looper data ID of commands coming from the app's main thread, which\n is returned as an identifier from ALooper_pollOnce().  The data for this\n identifier is a pointer to an android_poll_source structure.\n These can be retrieved and processed with android_app_read_cmd()\n and android_app_exec_cmd()."]
 pub const NativeAppGlueLooperId_LOOPER_ID_MAIN: NativeAppGlueLooperId = 1;
-#[doc = " Unused. Reserved for future use when usage of AInputQueue will be"]
-#[doc = " supported."]
+#[doc = " Unused. Reserved for future use when usage of AInputQueue will be\n supported."]
 pub const NativeAppGlueLooperId_LOOPER_ID_INPUT: NativeAppGlueLooperId = 2;
 #[doc = " Start of user-defined ALooper identifiers."]
 pub const NativeAppGlueLooperId_LOOPER_ID_USER: NativeAppGlueLooperId = 3;
-#[doc = " Looper ID of commands coming from the app's main thread, an AInputQueue or"]
-#[doc = " user-defined sources."]
+#[doc = " Looper ID of commands coming from the app's main thread, an AInputQueue or\n user-defined sources."]
 pub type NativeAppGlueLooperId = ::std::os::raw::c_uint;
-#[doc = " Unused. Reserved for future use when usage of AInputQueue will be"]
-#[doc = " supported."]
+#[doc = " Unused. Reserved for future use when usage of AInputQueue will be\n supported."]
 pub const NativeAppGlueAppCmd_UNUSED_APP_CMD_INPUT_CHANGED: NativeAppGlueAppCmd = 0;
-#[doc = " Command from main thread: a new ANativeWindow is ready for use.  Upon"]
-#[doc = " receiving this command, android_app->window will contain the new window"]
-#[doc = " surface."]
+#[doc = " Command from main thread: a new ANativeWindow is ready for use.  Upon\n receiving this command, android_app->window will contain the new window\n surface."]
 pub const NativeAppGlueAppCmd_APP_CMD_INIT_WINDOW: NativeAppGlueAppCmd = 1;
-#[doc = " Command from main thread: the existing ANativeWindow needs to be"]
-#[doc = " terminated.  Upon receiving this command, android_app->window still"]
-#[doc = " contains the existing window; after calling android_app_exec_cmd"]
-#[doc = " it will be set to NULL."]
+#[doc = " Command from main thread: the existing ANativeWindow needs to be\n terminated.  Upon receiving this command, android_app->window still\n contains the existing window; after calling android_app_exec_cmd\n it will be set to NULL."]
 pub const NativeAppGlueAppCmd_APP_CMD_TERM_WINDOW: NativeAppGlueAppCmd = 2;
-#[doc = " Command from main thread: the current ANativeWindow has been resized."]
-#[doc = " Please redraw with its new size."]
+#[doc = " Command from main thread: the current ANativeWindow has been resized.\n Please redraw with its new size."]
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_RESIZED: NativeAppGlueAppCmd = 3;
-#[doc = " Command from main thread: the system needs that the current ANativeWindow"]
-#[doc = " be redrawn.  You should redraw the window before handing this to"]
-#[doc = " android_app_exec_cmd() in order to avoid transient drawing glitches."]
+#[doc = " Command from main thread: the system needs that the current ANativeWindow\n be redrawn.  You should redraw the window before handing this to\n android_app_exec_cmd() in order to avoid transient drawing glitches."]
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_REDRAW_NEEDED: NativeAppGlueAppCmd = 4;
-#[doc = " Command from main thread: the content area of the window has changed,"]
-#[doc = " such as from the soft input window being shown or hidden.  You can"]
-#[doc = " find the new content rect in android_app::contentRect."]
+#[doc = " Command from main thread: the content area of the window has changed,\n such as from the soft input window being shown or hidden.  You can\n find the new content rect in android_app::contentRect."]
 pub const NativeAppGlueAppCmd_APP_CMD_CONTENT_RECT_CHANGED: NativeAppGlueAppCmd = 5;
-#[doc = " Command from main thread: the app's activity window has gained"]
-#[doc = " input focus."]
+#[doc = " Command from main thread: the app's activity window has gained\n input focus."]
 pub const NativeAppGlueAppCmd_APP_CMD_GAINED_FOCUS: NativeAppGlueAppCmd = 6;
-#[doc = " Command from main thread: the app's activity window has lost"]
-#[doc = " input focus."]
+#[doc = " Command from main thread: the app's activity window has lost\n input focus."]
 pub const NativeAppGlueAppCmd_APP_CMD_LOST_FOCUS: NativeAppGlueAppCmd = 7;
 #[doc = " Command from main thread: the current device configuration has changed."]
 pub const NativeAppGlueAppCmd_APP_CMD_CONFIG_CHANGED: NativeAppGlueAppCmd = 8;
-#[doc = " Command from main thread: the system is running low on memory."]
-#[doc = " Try to reduce your memory use."]
+#[doc = " Command from main thread: the system is running low on memory.\n Try to reduce your memory use."]
 pub const NativeAppGlueAppCmd_APP_CMD_LOW_MEMORY: NativeAppGlueAppCmd = 9;
 #[doc = " Command from main thread: the app's activity has been started."]
 pub const NativeAppGlueAppCmd_APP_CMD_START: NativeAppGlueAppCmd = 10;
 #[doc = " Command from main thread: the app's activity has been resumed."]
 pub const NativeAppGlueAppCmd_APP_CMD_RESUME: NativeAppGlueAppCmd = 11;
-#[doc = " Command from main thread: the app should generate a new saved state"]
-#[doc = " for itself, to restore from later if needed.  If you have saved state,"]
-#[doc = " allocate it with malloc and place it in android_app.savedState with"]
-#[doc = " the size in android_app.savedStateSize.  The will be freed for you"]
-#[doc = " later."]
+#[doc = " Command from main thread: the app should generate a new saved state\n for itself, to restore from later if needed.  If you have saved state,\n allocate it with malloc and place it in android_app.savedState with\n the size in android_app.savedStateSize.  The will be freed for you\n later."]
 pub const NativeAppGlueAppCmd_APP_CMD_SAVE_STATE: NativeAppGlueAppCmd = 12;
 #[doc = " Command from main thread: the app's activity has been paused."]
 pub const NativeAppGlueAppCmd_APP_CMD_PAUSE: NativeAppGlueAppCmd = 13;
 #[doc = " Command from main thread: the app's activity has been stopped."]
 pub const NativeAppGlueAppCmd_APP_CMD_STOP: NativeAppGlueAppCmd = 14;
-#[doc = " Command from main thread: the app's activity is being destroyed,"]
-#[doc = " and waiting for the app thread to clean up and exit before proceeding."]
+#[doc = " Command from main thread: the app's activity is being destroyed,\n and waiting for the app thread to clean up and exit before proceeding."]
 pub const NativeAppGlueAppCmd_APP_CMD_DESTROY: NativeAppGlueAppCmd = 15;
 #[doc = " Command from main thread: the app's insets have changed."]
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_INSETS_CHANGED: NativeAppGlueAppCmd = 16;
 #[doc = " Commands passed from the application's main Java thread to the game's thread."]
 pub type NativeAppGlueAppCmd = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next"]
-    #[doc = " app command message."]
+    #[doc = " Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next\n app command message."]
     pub fn android_app_read_cmd(android_app: *mut android_app) -> i8;
 }
 extern "C" {
-    #[doc = " Call with the command returned by android_app_read_cmd() to do the"]
-    #[doc = " initial pre-processing of the given command.  You can perform your own"]
-    #[doc = " actions for the command after calling this function."]
+    #[doc = " Call with the command returned by android_app_read_cmd() to do the\n initial pre-processing of the given command.  You can perform your own\n actions for the command after calling this function."]
     pub fn android_app_pre_exec_cmd(android_app: *mut android_app, cmd: i8);
 }
 extern "C" {
-    #[doc = " Call with the command returned by android_app_read_cmd() to do the"]
-    #[doc = " final post-processing of the given command.  You must have done your own"]
-    #[doc = " actions for the command before calling this function."]
+    #[doc = " Call with the command returned by android_app_read_cmd() to do the\n final post-processing of the given command.  You must have done your own\n actions for the command before calling this function."]
     pub fn android_app_post_exec_cmd(android_app: *mut android_app, cmd: i8);
 }
 extern "C" {
-    #[doc = " Call this before processing input events to get the events buffer."]
-    #[doc = " The function returns NULL if there are no events to process."]
+    #[doc = " Call this before processing input events to get the events buffer.\n The function returns NULL if there are no events to process."]
     pub fn android_app_swap_input_buffers(
         android_app: *mut android_app,
     ) -> *mut android_input_buffer;
 }
 extern "C" {
-    #[doc = " Clear the array of motion events that were waiting to be handled, and release"]
-    #[doc = " each of them."]
-    #[doc = ""]
-    #[doc = " This method should be called after you have processed the motion events in"]
-    #[doc = " your game loop. You should handle events at each iteration of your game loop."]
+    #[doc = " Clear the array of motion events that were waiting to be handled, and release\n each of them.\n\n This method should be called after you have processed the motion events in\n your game loop. You should handle events at each iteration of your game loop."]
     pub fn android_app_clear_motion_events(inputBuffer: *mut android_input_buffer);
 }
 extern "C" {
-    #[doc = " Clear the array of key events that were waiting to be handled, and release"]
-    #[doc = " each of them."]
-    #[doc = ""]
-    #[doc = " This method should be called after you have processed the key up events in"]
-    #[doc = " your game loop. You should handle events at each iteration of your game loop."]
+    #[doc = " Clear the array of key events that were waiting to be handled, and release\n each of them.\n\n This method should be called after you have processed the key up events in\n your game loop. You should handle events at each iteration of your game loop."]
     pub fn android_app_clear_key_events(inputBuffer: *mut android_input_buffer);
 }
 extern "C" {
-    #[doc = " This is a springboard into the Rust glue layer that wraps calling the"]
-    #[doc = " main entry for the app itself."]
+    #[doc = " This is a springboard into the Rust glue layer that wraps calling the\n main entry for the app itself."]
     pub fn _rust_glue_entry(app: *mut android_app);
 }
 extern "C" {
-    #[doc = " Set the filter to use when processing key events."]
-    #[doc = " Any events for which the filter returns false will be ignored by"]
-    #[doc = " android_native_app_glue. If filter is set to NULL, no filtering is done."]
-    #[doc = ""]
-    #[doc = " The default key filter will filter out volume and camera button presses."]
+    #[doc = " Set the filter to use when processing key events.\n Any events for which the filter returns false will be ignored by\n android_native_app_glue. If filter is set to NULL, no filtering is done.\n\n The default key filter will filter out volume and camera button presses."]
     pub fn android_app_set_key_event_filter(
         app: *mut android_app,
         filter: android_key_event_filter,
     );
 }
 extern "C" {
-    #[doc = " Set the filter to use when processing touch and motion events."]
-    #[doc = " Any events for which the filter returns false will be ignored by"]
-    #[doc = " android_native_app_glue. If filter is set to NULL, no filtering is done."]
-    #[doc = ""]
-    #[doc = " Note that the default motion event filter will only allow touchscreen events"]
-    #[doc = " through, in order to mimic NativeActivity's behaviour, so for controller"]
-    #[doc = " events to be passed to the app, set the filter to NULL."]
+    #[doc = " Set the filter to use when processing touch and motion events.\n Any events for which the filter returns false will be ignored by\n android_native_app_glue. If filter is set to NULL, no filtering is done.\n\n Note that the default motion event filter will only allow touchscreen events\n through, in order to mimic NativeActivity's behaviour, so for controller\n events to be passed to the app, set the filter to NULL."]
     pub fn android_app_set_motion_event_filter(
         app: *mut android_app,
         filter: android_motion_event_filter,
diff --git a/android-activity/src/game_activity/ffi_i686.rs b/android-activity/src/game_activity/ffi_i686.rs
index 65c9cc9..ed9075f 100644
--- a/android-activity/src/game_activity/ffi_i686.rs
+++ b/android-activity/src/game_activity/ffi_i686.rs
@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.59.2 */
+/* automatically generated by rust-bindgen 0.66.1 */
 
 pub const __BIONIC__: u32 = 1;
 pub const __WORDSIZE: u32 = 32;
@@ -21,10 +21,14 @@ pub const __ANDROID_API_O_MR1__: u32 = 27;
 pub const __ANDROID_API_P__: u32 = 28;
 pub const __ANDROID_API_Q__: u32 = 29;
 pub const __ANDROID_API_R__: u32 = 30;
-pub const __NDK_MAJOR__: u32 = 21;
-pub const __NDK_MINOR__: u32 = 1;
+pub const __ANDROID_API_S__: u32 = 31;
+pub const __ANDROID_API_T__: u32 = 33;
+pub const __ANDROID_API_U__: u32 = 34;
+pub const __ANDROID_NDK__: u32 = 1;
+pub const __NDK_MAJOR__: u32 = 25;
+pub const __NDK_MINOR__: u32 = 2;
 pub const __NDK_BETA__: u32 = 0;
-pub const __NDK_BUILD__: u32 = 6352462;
+pub const __NDK_BUILD__: u32 = 9519653;
 pub const __NDK_CANARY__: u32 = 0;
 pub const INT8_MIN: i32 = -128;
 pub const INT8_MAX: u32 = 127;
@@ -62,136 +66,141 @@ pub const PTRDIFF_MAX: u32 = 2147483647;
 pub const SIZE_MAX: u32 = 4294967295;
 pub const __BITS_PER_LONG: u32 = 32;
 pub const __FD_SETSIZE: u32 = 1024;
-pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8;
-pub const __PRI_64_prefix: &[u8; 3usize] = b"ll\0";
-pub const PRId8: &[u8; 2usize] = b"d\0";
-pub const PRId16: &[u8; 2usize] = b"d\0";
-pub const PRId32: &[u8; 2usize] = b"d\0";
-pub const PRId64: &[u8; 4usize] = b"lld\0";
-pub const PRIdLEAST8: &[u8; 2usize] = b"d\0";
-pub const PRIdLEAST16: &[u8; 2usize] = b"d\0";
-pub const PRIdLEAST32: &[u8; 2usize] = b"d\0";
-pub const PRIdLEAST64: &[u8; 4usize] = b"lld\0";
-pub const PRIdFAST8: &[u8; 2usize] = b"d\0";
-pub const PRIdFAST64: &[u8; 4usize] = b"lld\0";
-pub const PRIdMAX: &[u8; 3usize] = b"jd\0";
-pub const PRIi8: &[u8; 2usize] = b"i\0";
-pub const PRIi16: &[u8; 2usize] = b"i\0";
-pub const PRIi32: &[u8; 2usize] = b"i\0";
-pub const PRIi64: &[u8; 4usize] = b"lli\0";
-pub const PRIiLEAST8: &[u8; 2usize] = b"i\0";
-pub const PRIiLEAST16: &[u8; 2usize] = b"i\0";
-pub const PRIiLEAST32: &[u8; 2usize] = b"i\0";
-pub const PRIiLEAST64: &[u8; 4usize] = b"lli\0";
-pub const PRIiFAST8: &[u8; 2usize] = b"i\0";
-pub const PRIiFAST64: &[u8; 4usize] = b"lli\0";
-pub const PRIiMAX: &[u8; 3usize] = b"ji\0";
-pub const PRIo8: &[u8; 2usize] = b"o\0";
-pub const PRIo16: &[u8; 2usize] = b"o\0";
-pub const PRIo32: &[u8; 2usize] = b"o\0";
-pub const PRIo64: &[u8; 4usize] = b"llo\0";
-pub const PRIoLEAST8: &[u8; 2usize] = b"o\0";
-pub const PRIoLEAST16: &[u8; 2usize] = b"o\0";
-pub const PRIoLEAST32: &[u8; 2usize] = b"o\0";
-pub const PRIoLEAST64: &[u8; 4usize] = b"llo\0";
-pub const PRIoFAST8: &[u8; 2usize] = b"o\0";
-pub const PRIoFAST64: &[u8; 4usize] = b"llo\0";
-pub const PRIoMAX: &[u8; 3usize] = b"jo\0";
-pub const PRIu8: &[u8; 2usize] = b"u\0";
-pub const PRIu16: &[u8; 2usize] = b"u\0";
-pub const PRIu32: &[u8; 2usize] = b"u\0";
-pub const PRIu64: &[u8; 4usize] = b"llu\0";
-pub const PRIuLEAST8: &[u8; 2usize] = b"u\0";
-pub const PRIuLEAST16: &[u8; 2usize] = b"u\0";
-pub const PRIuLEAST32: &[u8; 2usize] = b"u\0";
-pub const PRIuLEAST64: &[u8; 4usize] = b"llu\0";
-pub const PRIuFAST8: &[u8; 2usize] = b"u\0";
-pub const PRIuFAST64: &[u8; 4usize] = b"llu\0";
-pub const PRIuMAX: &[u8; 3usize] = b"ju\0";
-pub const PRIx8: &[u8; 2usize] = b"x\0";
-pub const PRIx16: &[u8; 2usize] = b"x\0";
-pub const PRIx32: &[u8; 2usize] = b"x\0";
-pub const PRIx64: &[u8; 4usize] = b"llx\0";
-pub const PRIxLEAST8: &[u8; 2usize] = b"x\0";
-pub const PRIxLEAST16: &[u8; 2usize] = b"x\0";
-pub const PRIxLEAST32: &[u8; 2usize] = b"x\0";
-pub const PRIxLEAST64: &[u8; 4usize] = b"llx\0";
-pub const PRIxFAST8: &[u8; 2usize] = b"x\0";
-pub const PRIxFAST64: &[u8; 4usize] = b"llx\0";
-pub const PRIxMAX: &[u8; 3usize] = b"jx\0";
-pub const PRIX8: &[u8; 2usize] = b"X\0";
-pub const PRIX16: &[u8; 2usize] = b"X\0";
-pub const PRIX32: &[u8; 2usize] = b"X\0";
-pub const PRIX64: &[u8; 4usize] = b"llX\0";
-pub const PRIXLEAST8: &[u8; 2usize] = b"X\0";
-pub const PRIXLEAST16: &[u8; 2usize] = b"X\0";
-pub const PRIXLEAST32: &[u8; 2usize] = b"X\0";
-pub const PRIXLEAST64: &[u8; 4usize] = b"llX\0";
-pub const PRIXFAST8: &[u8; 2usize] = b"X\0";
-pub const PRIXFAST64: &[u8; 4usize] = b"llX\0";
-pub const PRIXMAX: &[u8; 3usize] = b"jX\0";
-pub const SCNd8: &[u8; 4usize] = b"hhd\0";
-pub const SCNd16: &[u8; 3usize] = b"hd\0";
-pub const SCNd32: &[u8; 2usize] = b"d\0";
-pub const SCNd64: &[u8; 4usize] = b"lld\0";
-pub const SCNdLEAST8: &[u8; 4usize] = b"hhd\0";
-pub const SCNdLEAST16: &[u8; 3usize] = b"hd\0";
-pub const SCNdLEAST32: &[u8; 2usize] = b"d\0";
-pub const SCNdLEAST64: &[u8; 4usize] = b"lld\0";
-pub const SCNdFAST8: &[u8; 4usize] = b"hhd\0";
-pub const SCNdFAST64: &[u8; 4usize] = b"lld\0";
-pub const SCNdMAX: &[u8; 3usize] = b"jd\0";
-pub const SCNi8: &[u8; 4usize] = b"hhi\0";
-pub const SCNi16: &[u8; 3usize] = b"hi\0";
-pub const SCNi32: &[u8; 2usize] = b"i\0";
-pub const SCNi64: &[u8; 4usize] = b"lli\0";
-pub const SCNiLEAST8: &[u8; 4usize] = b"hhi\0";
-pub const SCNiLEAST16: &[u8; 3usize] = b"hi\0";
-pub const SCNiLEAST32: &[u8; 2usize] = b"i\0";
-pub const SCNiLEAST64: &[u8; 4usize] = b"lli\0";
-pub const SCNiFAST8: &[u8; 4usize] = b"hhi\0";
-pub const SCNiFAST64: &[u8; 4usize] = b"lli\0";
-pub const SCNiMAX: &[u8; 3usize] = b"ji\0";
-pub const SCNo8: &[u8; 4usize] = b"hho\0";
-pub const SCNo16: &[u8; 3usize] = b"ho\0";
-pub const SCNo32: &[u8; 2usize] = b"o\0";
-pub const SCNo64: &[u8; 4usize] = b"llo\0";
-pub const SCNoLEAST8: &[u8; 4usize] = b"hho\0";
-pub const SCNoLEAST16: &[u8; 3usize] = b"ho\0";
-pub const SCNoLEAST32: &[u8; 2usize] = b"o\0";
-pub const SCNoLEAST64: &[u8; 4usize] = b"llo\0";
-pub const SCNoFAST8: &[u8; 4usize] = b"hho\0";
-pub const SCNoFAST64: &[u8; 4usize] = b"llo\0";
-pub const SCNoMAX: &[u8; 3usize] = b"jo\0";
-pub const SCNu8: &[u8; 4usize] = b"hhu\0";
-pub const SCNu16: &[u8; 3usize] = b"hu\0";
-pub const SCNu32: &[u8; 2usize] = b"u\0";
-pub const SCNu64: &[u8; 4usize] = b"llu\0";
-pub const SCNuLEAST8: &[u8; 4usize] = b"hhu\0";
-pub const SCNuLEAST16: &[u8; 3usize] = b"hu\0";
-pub const SCNuLEAST32: &[u8; 2usize] = b"u\0";
-pub const SCNuLEAST64: &[u8; 4usize] = b"llu\0";
-pub const SCNuFAST8: &[u8; 4usize] = b"hhu\0";
-pub const SCNuFAST64: &[u8; 4usize] = b"llu\0";
-pub const SCNuMAX: &[u8; 3usize] = b"ju\0";
-pub const SCNx8: &[u8; 4usize] = b"hhx\0";
-pub const SCNx16: &[u8; 3usize] = b"hx\0";
-pub const SCNx32: &[u8; 2usize] = b"x\0";
-pub const SCNx64: &[u8; 4usize] = b"llx\0";
-pub const SCNxLEAST8: &[u8; 4usize] = b"hhx\0";
-pub const SCNxLEAST16: &[u8; 3usize] = b"hx\0";
-pub const SCNxLEAST32: &[u8; 2usize] = b"x\0";
-pub const SCNxLEAST64: &[u8; 4usize] = b"llx\0";
-pub const SCNxFAST8: &[u8; 4usize] = b"hhx\0";
-pub const SCNxFAST64: &[u8; 4usize] = b"llx\0";
-pub const SCNxMAX: &[u8; 3usize] = b"jx\0";
 pub const __GNUC_VA_LIST: u32 = 1;
+pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8;
 pub const true_: u32 = 1;
 pub const false_: u32 = 0;
 pub const __bool_true_false_are_defined: u32 = 1;
+pub const __PRI_64_prefix: &[u8; 3] = b"ll\0";
+pub const PRId8: &[u8; 2] = b"d\0";
+pub const PRId16: &[u8; 2] = b"d\0";
+pub const PRId32: &[u8; 2] = b"d\0";
+pub const PRId64: &[u8; 4] = b"lld\0";
+pub const PRIdLEAST8: &[u8; 2] = b"d\0";
+pub const PRIdLEAST16: &[u8; 2] = b"d\0";
+pub const PRIdLEAST32: &[u8; 2] = b"d\0";
+pub const PRIdLEAST64: &[u8; 4] = b"lld\0";
+pub const PRIdFAST8: &[u8; 2] = b"d\0";
+pub const PRIdFAST64: &[u8; 4] = b"lld\0";
+pub const PRIdMAX: &[u8; 3] = b"jd\0";
+pub const PRIi8: &[u8; 2] = b"i\0";
+pub const PRIi16: &[u8; 2] = b"i\0";
+pub const PRIi32: &[u8; 2] = b"i\0";
+pub const PRIi64: &[u8; 4] = b"lli\0";
+pub const PRIiLEAST8: &[u8; 2] = b"i\0";
+pub const PRIiLEAST16: &[u8; 2] = b"i\0";
+pub const PRIiLEAST32: &[u8; 2] = b"i\0";
+pub const PRIiLEAST64: &[u8; 4] = b"lli\0";
+pub const PRIiFAST8: &[u8; 2] = b"i\0";
+pub const PRIiFAST64: &[u8; 4] = b"lli\0";
+pub const PRIiMAX: &[u8; 3] = b"ji\0";
+pub const PRIo8: &[u8; 2] = b"o\0";
+pub const PRIo16: &[u8; 2] = b"o\0";
+pub const PRIo32: &[u8; 2] = b"o\0";
+pub const PRIo64: &[u8; 4] = b"llo\0";
+pub const PRIoLEAST8: &[u8; 2] = b"o\0";
+pub const PRIoLEAST16: &[u8; 2] = b"o\0";
+pub const PRIoLEAST32: &[u8; 2] = b"o\0";
+pub const PRIoLEAST64: &[u8; 4] = b"llo\0";
+pub const PRIoFAST8: &[u8; 2] = b"o\0";
+pub const PRIoFAST64: &[u8; 4] = b"llo\0";
+pub const PRIoMAX: &[u8; 3] = b"jo\0";
+pub const PRIu8: &[u8; 2] = b"u\0";
+pub const PRIu16: &[u8; 2] = b"u\0";
+pub const PRIu32: &[u8; 2] = b"u\0";
+pub const PRIu64: &[u8; 4] = b"llu\0";
+pub const PRIuLEAST8: &[u8; 2] = b"u\0";
+pub const PRIuLEAST16: &[u8; 2] = b"u\0";
+pub const PRIuLEAST32: &[u8; 2] = b"u\0";
+pub const PRIuLEAST64: &[u8; 4] = b"llu\0";
+pub const PRIuFAST8: &[u8; 2] = b"u\0";
+pub const PRIuFAST64: &[u8; 4] = b"llu\0";
+pub const PRIuMAX: &[u8; 3] = b"ju\0";
+pub const PRIx8: &[u8; 2] = b"x\0";
+pub const PRIx16: &[u8; 2] = b"x\0";
+pub const PRIx32: &[u8; 2] = b"x\0";
+pub const PRIx64: &[u8; 4] = b"llx\0";
+pub const PRIxLEAST8: &[u8; 2] = b"x\0";
+pub const PRIxLEAST16: &[u8; 2] = b"x\0";
+pub const PRIxLEAST32: &[u8; 2] = b"x\0";
+pub const PRIxLEAST64: &[u8; 4] = b"llx\0";
+pub const PRIxFAST8: &[u8; 2] = b"x\0";
+pub const PRIxFAST64: &[u8; 4] = b"llx\0";
+pub const PRIxMAX: &[u8; 3] = b"jx\0";
+pub const PRIX8: &[u8; 2] = b"X\0";
+pub const PRIX16: &[u8; 2] = b"X\0";
+pub const PRIX32: &[u8; 2] = b"X\0";
+pub const PRIX64: &[u8; 4] = b"llX\0";
+pub const PRIXLEAST8: &[u8; 2] = b"X\0";
+pub const PRIXLEAST16: &[u8; 2] = b"X\0";
+pub const PRIXLEAST32: &[u8; 2] = b"X\0";
+pub const PRIXLEAST64: &[u8; 4] = b"llX\0";
+pub const PRIXFAST8: &[u8; 2] = b"X\0";
+pub const PRIXFAST64: &[u8; 4] = b"llX\0";
+pub const PRIXMAX: &[u8; 3] = b"jX\0";
+pub const SCNd8: &[u8; 4] = b"hhd\0";
+pub const SCNd16: &[u8; 3] = b"hd\0";
+pub const SCNd32: &[u8; 2] = b"d\0";
+pub const SCNd64: &[u8; 4] = b"lld\0";
+pub const SCNdLEAST8: &[u8; 4] = b"hhd\0";
+pub const SCNdLEAST16: &[u8; 3] = b"hd\0";
+pub const SCNdLEAST32: &[u8; 2] = b"d\0";
+pub const SCNdLEAST64: &[u8; 4] = b"lld\0";
+pub const SCNdFAST8: &[u8; 4] = b"hhd\0";
+pub const SCNdFAST64: &[u8; 4] = b"lld\0";
+pub const SCNdMAX: &[u8; 3] = b"jd\0";
+pub const SCNi8: &[u8; 4] = b"hhi\0";
+pub const SCNi16: &[u8; 3] = b"hi\0";
+pub const SCNi32: &[u8; 2] = b"i\0";
+pub const SCNi64: &[u8; 4] = b"lli\0";
+pub const SCNiLEAST8: &[u8; 4] = b"hhi\0";
+pub const SCNiLEAST16: &[u8; 3] = b"hi\0";
+pub const SCNiLEAST32: &[u8; 2] = b"i\0";
+pub const SCNiLEAST64: &[u8; 4] = b"lli\0";
+pub const SCNiFAST8: &[u8; 4] = b"hhi\0";
+pub const SCNiFAST64: &[u8; 4] = b"lli\0";
+pub const SCNiMAX: &[u8; 3] = b"ji\0";
+pub const SCNo8: &[u8; 4] = b"hho\0";
+pub const SCNo16: &[u8; 3] = b"ho\0";
+pub const SCNo32: &[u8; 2] = b"o\0";
+pub const SCNo64: &[u8; 4] = b"llo\0";
+pub const SCNoLEAST8: &[u8; 4] = b"hho\0";
+pub const SCNoLEAST16: &[u8; 3] = b"ho\0";
+pub const SCNoLEAST32: &[u8; 2] = b"o\0";
+pub const SCNoLEAST64: &[u8; 4] = b"llo\0";
+pub const SCNoFAST8: &[u8; 4] = b"hho\0";
+pub const SCNoFAST64: &[u8; 4] = b"llo\0";
+pub const SCNoMAX: &[u8; 3] = b"jo\0";
+pub const SCNu8: &[u8; 4] = b"hhu\0";
+pub const SCNu16: &[u8; 3] = b"hu\0";
+pub const SCNu32: &[u8; 2] = b"u\0";
+pub const SCNu64: &[u8; 4] = b"llu\0";
+pub const SCNuLEAST8: &[u8; 4] = b"hhu\0";
+pub const SCNuLEAST16: &[u8; 3] = b"hu\0";
+pub const SCNuLEAST32: &[u8; 2] = b"u\0";
+pub const SCNuLEAST64: &[u8; 4] = b"llu\0";
+pub const SCNuFAST8: &[u8; 4] = b"hhu\0";
+pub const SCNuFAST64: &[u8; 4] = b"llu\0";
+pub const SCNuMAX: &[u8; 3] = b"ju\0";
+pub const SCNx8: &[u8; 4] = b"hhx\0";
+pub const SCNx16: &[u8; 3] = b"hx\0";
+pub const SCNx32: &[u8; 2] = b"x\0";
+pub const SCNx64: &[u8; 4] = b"llx\0";
+pub const SCNxLEAST8: &[u8; 4] = b"hhx\0";
+pub const SCNxLEAST16: &[u8; 3] = b"hx\0";
+pub const SCNxLEAST32: &[u8; 2] = b"x\0";
+pub const SCNxLEAST64: &[u8; 4] = b"llx\0";
+pub const SCNxFAST8: &[u8; 4] = b"hhx\0";
+pub const SCNxFAST64: &[u8; 4] = b"llx\0";
+pub const SCNxMAX: &[u8; 3] = b"jx\0";
 pub const GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT: u32 = 48;
 pub const GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT: u32 = 8;
-pub const GAMEACTIVITY_MAX_NUM_HISTORICAL_IN_MOTION_EVENT: u32 = 8;
+pub const GAMETEXTINPUT_MAJOR_VERSION: u32 = 2;
+pub const GAMETEXTINPUT_MINOR_VERSION: u32 = 0;
+pub const GAMETEXTINPUT_BUGFIX_VERSION: u32 = 0;
+pub const GAMEACTIVITY_MAJOR_VERSION: u32 = 2;
+pub const GAMEACTIVITY_MINOR_VERSION: u32 = 0;
+pub const GAMEACTIVITY_BUGFIX_VERSION: u32 = 2;
 pub const POLLIN: u32 = 1;
 pub const POLLPRI: u32 = 2;
 pub const POLLOUT: u32 = 4;
@@ -435,18 +444,20 @@ pub const SIGPWR: u32 = 30;
 pub const SIGSYS: u32 = 31;
 pub const SIGUNUSED: u32 = 31;
 pub const __SIGRTMIN: u32 = 32;
+pub const SA_RESTORER: u32 = 67108864;
+pub const MINSIGSTKSZ: u32 = 2048;
+pub const SIGSTKSZ: u32 = 8192;
 pub const SA_NOCLDSTOP: u32 = 1;
 pub const SA_NOCLDWAIT: u32 = 2;
 pub const SA_SIGINFO: u32 = 4;
+pub const SA_UNSUPPORTED: u32 = 1024;
+pub const SA_EXPOSE_TAGBITS: u32 = 2048;
 pub const SA_ONSTACK: u32 = 134217728;
 pub const SA_RESTART: u32 = 268435456;
 pub const SA_NODEFER: u32 = 1073741824;
 pub const SA_RESETHAND: u32 = 2147483648;
 pub const SA_NOMASK: u32 = 1073741824;
 pub const SA_ONESHOT: u32 = 2147483648;
-pub const SA_RESTORER: u32 = 67108864;
-pub const MINSIGSTKSZ: u32 = 2048;
-pub const SIGSTKSZ: u32 = 8192;
 pub const SIG_BLOCK: u32 = 0;
 pub const SIG_UNBLOCK: u32 = 1;
 pub const SIG_SETMASK: u32 = 2;
@@ -496,7 +507,9 @@ pub const SEGV_PKUERR: u32 = 4;
 pub const SEGV_ACCADI: u32 = 5;
 pub const SEGV_ADIDERR: u32 = 6;
 pub const SEGV_ADIPERR: u32 = 7;
-pub const NSIGSEGV: u32 = 7;
+pub const SEGV_MTEAERR: u32 = 8;
+pub const SEGV_MTESERR: u32 = 9;
+pub const NSIGSEGV: u32 = 9;
 pub const BUS_ADRALN: u32 = 1;
 pub const BUS_ADRERR: u32 = 2;
 pub const BUS_OBJERR: u32 = 3;
@@ -508,7 +521,8 @@ pub const TRAP_TRACE: u32 = 2;
 pub const TRAP_BRANCH: u32 = 3;
 pub const TRAP_HWBKPT: u32 = 4;
 pub const TRAP_UNK: u32 = 5;
-pub const NSIGTRAP: u32 = 5;
+pub const TRAP_PERF: u32 = 6;
+pub const NSIGTRAP: u32 = 6;
 pub const CLD_EXITED: u32 = 1;
 pub const CLD_KILLED: u32 = 2;
 pub const CLD_DUMPED: u32 = 3;
@@ -524,7 +538,8 @@ pub const POLL_PRI: u32 = 5;
 pub const POLL_HUP: u32 = 6;
 pub const NSIGPOLL: u32 = 6;
 pub const SYS_SECCOMP: u32 = 1;
-pub const NSIGSYS: u32 = 1;
+pub const SYS_USER_DISPATCH: u32 = 2;
+pub const NSIGSYS: u32 = 2;
 pub const EMT_TAGOVF: u32 = 1;
 pub const NSIGEMT: u32 = 1;
 pub const SIGEV_SIGNAL: u32 = 0;
@@ -570,6 +585,12 @@ pub const CLONE_NEWUSER: u32 = 268435456;
 pub const CLONE_NEWPID: u32 = 536870912;
 pub const CLONE_NEWNET: u32 = 1073741824;
 pub const CLONE_IO: u32 = 2147483648;
+pub const CLONE_CLEAR_SIGHAND: u64 = 4294967296;
+pub const CLONE_INTO_CGROUP: u64 = 8589934592;
+pub const CLONE_NEWTIME: u32 = 128;
+pub const CLONE_ARGS_SIZE_VER0: u32 = 64;
+pub const CLONE_ARGS_SIZE_VER1: u32 = 80;
+pub const CLONE_ARGS_SIZE_VER2: u32 = 88;
 pub const SCHED_NORMAL: u32 = 0;
 pub const SCHED_FIFO: u32 = 1;
 pub const SCHED_RR: u32 = 2;
@@ -601,9 +622,6 @@ pub const PTHREAD_PROCESS_PRIVATE: u32 = 0;
 pub const PTHREAD_PROCESS_SHARED: u32 = 1;
 pub const PTHREAD_SCOPE_SYSTEM: u32 = 0;
 pub const PTHREAD_SCOPE_PROCESS: u32 = 1;
-pub const NATIVE_APP_GLUE_MAX_NUM_MOTION_EVENTS: u32 = 16;
-pub const NATIVE_APP_GLUE_MAX_HISTORICAL_POINTER_SAMPLES: u32 = 64;
-pub const NATIVE_APP_GLUE_MAX_NUM_KEY_EVENTS: u32 = 4;
 pub const NATIVE_APP_GLUE_MAX_INPUT_BUFFERS: u32 = 2;
 extern "C" {
     pub fn android_get_application_target_sdk_version() -> ::std::os::raw::c_int;
@@ -621,6 +639,8 @@ pub struct max_align_t {
 }
 #[test]
 fn bindgen_test_layout_max_align_t() {
+    const UNINIT: ::std::mem::MaybeUninit<max_align_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<max_align_t>(),
         16usize,
@@ -632,9 +652,7 @@ fn bindgen_test_layout_max_align_t() {
         concat!("Alignment of ", stringify!(max_align_t))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<max_align_t>())).__clang_max_align_nonce1 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce1) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -644,9 +662,7 @@ fn bindgen_test_layout_max_align_t() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<max_align_t>())).__clang_max_align_nonce2 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce2) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -699,6 +715,8 @@ pub struct __kernel_fd_set {
 }
 #[test]
 fn bindgen_test_layout___kernel_fd_set() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_fd_set> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_fd_set>(),
         128usize,
@@ -710,7 +728,7 @@ fn bindgen_test_layout___kernel_fd_set() {
         concat!("Alignment of ", stringify!(__kernel_fd_set))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_fd_set>())).fds_bits as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -749,6 +767,8 @@ pub struct __kernel_fsid_t {
 }
 #[test]
 fn bindgen_test_layout___kernel_fsid_t() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_fsid_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_fsid_t>(),
         8usize,
@@ -760,7 +780,7 @@ fn bindgen_test_layout___kernel_fsid_t() {
         concat!("Alignment of ", stringify!(__kernel_fsid_t))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_fsid_t>())).val as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).val) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -772,6 +792,7 @@ fn bindgen_test_layout___kernel_fsid_t() {
 }
 pub type __kernel_off_t = __kernel_long_t;
 pub type __kernel_loff_t = ::std::os::raw::c_longlong;
+pub type __kernel_old_time_t = __kernel_long_t;
 pub type __kernel_time_t = __kernel_long_t;
 pub type __kernel_time64_t = ::std::os::raw::c_longlong;
 pub type __kernel_clock_t = __kernel_long_t;
@@ -830,7 +851,6 @@ pub type off64_t = loff_t;
 pub type __socklen_t = i32;
 pub type socklen_t = __socklen_t;
 pub type __va_list = __builtin_va_list;
-pub type ssize_t = __kernel_ssize_t;
 pub type uint_t = ::std::os::raw::c_uint;
 pub type uint = ::std::os::raw::c_uint;
 pub type u_char = ::std::os::raw::c_uchar;
@@ -841,483 +861,651 @@ pub type u_int32_t = u32;
 pub type u_int16_t = u16;
 pub type u_int8_t = u8;
 pub type u_int64_t = u64;
-pub const AASSET_MODE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AASSET_MODE_RANDOM: ::std::os::raw::c_uint = 1;
-pub const AASSET_MODE_STREAMING: ::std::os::raw::c_uint = 2;
-pub const AASSET_MODE_BUFFER: ::std::os::raw::c_uint = 3;
+pub const AASSET_MODE_UNKNOWN: _bindgen_ty_1 = 0;
+pub const AASSET_MODE_RANDOM: _bindgen_ty_1 = 1;
+pub const AASSET_MODE_STREAMING: _bindgen_ty_1 = 2;
+pub const AASSET_MODE_BUFFER: _bindgen_ty_1 = 3;
 pub type _bindgen_ty_1 = ::std::os::raw::c_uint;
-pub const AKEYCODE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AKEYCODE_SOFT_LEFT: ::std::os::raw::c_uint = 1;
-pub const AKEYCODE_SOFT_RIGHT: ::std::os::raw::c_uint = 2;
-pub const AKEYCODE_HOME: ::std::os::raw::c_uint = 3;
-pub const AKEYCODE_BACK: ::std::os::raw::c_uint = 4;
-pub const AKEYCODE_CALL: ::std::os::raw::c_uint = 5;
-pub const AKEYCODE_ENDCALL: ::std::os::raw::c_uint = 6;
-pub const AKEYCODE_0: ::std::os::raw::c_uint = 7;
-pub const AKEYCODE_1: ::std::os::raw::c_uint = 8;
-pub const AKEYCODE_2: ::std::os::raw::c_uint = 9;
-pub const AKEYCODE_3: ::std::os::raw::c_uint = 10;
-pub const AKEYCODE_4: ::std::os::raw::c_uint = 11;
-pub const AKEYCODE_5: ::std::os::raw::c_uint = 12;
-pub const AKEYCODE_6: ::std::os::raw::c_uint = 13;
-pub const AKEYCODE_7: ::std::os::raw::c_uint = 14;
-pub const AKEYCODE_8: ::std::os::raw::c_uint = 15;
-pub const AKEYCODE_9: ::std::os::raw::c_uint = 16;
-pub const AKEYCODE_STAR: ::std::os::raw::c_uint = 17;
-pub const AKEYCODE_POUND: ::std::os::raw::c_uint = 18;
-pub const AKEYCODE_DPAD_UP: ::std::os::raw::c_uint = 19;
-pub const AKEYCODE_DPAD_DOWN: ::std::os::raw::c_uint = 20;
-pub const AKEYCODE_DPAD_LEFT: ::std::os::raw::c_uint = 21;
-pub const AKEYCODE_DPAD_RIGHT: ::std::os::raw::c_uint = 22;
-pub const AKEYCODE_DPAD_CENTER: ::std::os::raw::c_uint = 23;
-pub const AKEYCODE_VOLUME_UP: ::std::os::raw::c_uint = 24;
-pub const AKEYCODE_VOLUME_DOWN: ::std::os::raw::c_uint = 25;
-pub const AKEYCODE_POWER: ::std::os::raw::c_uint = 26;
-pub const AKEYCODE_CAMERA: ::std::os::raw::c_uint = 27;
-pub const AKEYCODE_CLEAR: ::std::os::raw::c_uint = 28;
-pub const AKEYCODE_A: ::std::os::raw::c_uint = 29;
-pub const AKEYCODE_B: ::std::os::raw::c_uint = 30;
-pub const AKEYCODE_C: ::std::os::raw::c_uint = 31;
-pub const AKEYCODE_D: ::std::os::raw::c_uint = 32;
-pub const AKEYCODE_E: ::std::os::raw::c_uint = 33;
-pub const AKEYCODE_F: ::std::os::raw::c_uint = 34;
-pub const AKEYCODE_G: ::std::os::raw::c_uint = 35;
-pub const AKEYCODE_H: ::std::os::raw::c_uint = 36;
-pub const AKEYCODE_I: ::std::os::raw::c_uint = 37;
-pub const AKEYCODE_J: ::std::os::raw::c_uint = 38;
-pub const AKEYCODE_K: ::std::os::raw::c_uint = 39;
-pub const AKEYCODE_L: ::std::os::raw::c_uint = 40;
-pub const AKEYCODE_M: ::std::os::raw::c_uint = 41;
-pub const AKEYCODE_N: ::std::os::raw::c_uint = 42;
-pub const AKEYCODE_O: ::std::os::raw::c_uint = 43;
-pub const AKEYCODE_P: ::std::os::raw::c_uint = 44;
-pub const AKEYCODE_Q: ::std::os::raw::c_uint = 45;
-pub const AKEYCODE_R: ::std::os::raw::c_uint = 46;
-pub const AKEYCODE_S: ::std::os::raw::c_uint = 47;
-pub const AKEYCODE_T: ::std::os::raw::c_uint = 48;
-pub const AKEYCODE_U: ::std::os::raw::c_uint = 49;
-pub const AKEYCODE_V: ::std::os::raw::c_uint = 50;
-pub const AKEYCODE_W: ::std::os::raw::c_uint = 51;
-pub const AKEYCODE_X: ::std::os::raw::c_uint = 52;
-pub const AKEYCODE_Y: ::std::os::raw::c_uint = 53;
-pub const AKEYCODE_Z: ::std::os::raw::c_uint = 54;
-pub const AKEYCODE_COMMA: ::std::os::raw::c_uint = 55;
-pub const AKEYCODE_PERIOD: ::std::os::raw::c_uint = 56;
-pub const AKEYCODE_ALT_LEFT: ::std::os::raw::c_uint = 57;
-pub const AKEYCODE_ALT_RIGHT: ::std::os::raw::c_uint = 58;
-pub const AKEYCODE_SHIFT_LEFT: ::std::os::raw::c_uint = 59;
-pub const AKEYCODE_SHIFT_RIGHT: ::std::os::raw::c_uint = 60;
-pub const AKEYCODE_TAB: ::std::os::raw::c_uint = 61;
-pub const AKEYCODE_SPACE: ::std::os::raw::c_uint = 62;
-pub const AKEYCODE_SYM: ::std::os::raw::c_uint = 63;
-pub const AKEYCODE_EXPLORER: ::std::os::raw::c_uint = 64;
-pub const AKEYCODE_ENVELOPE: ::std::os::raw::c_uint = 65;
-pub const AKEYCODE_ENTER: ::std::os::raw::c_uint = 66;
-pub const AKEYCODE_DEL: ::std::os::raw::c_uint = 67;
-pub const AKEYCODE_GRAVE: ::std::os::raw::c_uint = 68;
-pub const AKEYCODE_MINUS: ::std::os::raw::c_uint = 69;
-pub const AKEYCODE_EQUALS: ::std::os::raw::c_uint = 70;
-pub const AKEYCODE_LEFT_BRACKET: ::std::os::raw::c_uint = 71;
-pub const AKEYCODE_RIGHT_BRACKET: ::std::os::raw::c_uint = 72;
-pub const AKEYCODE_BACKSLASH: ::std::os::raw::c_uint = 73;
-pub const AKEYCODE_SEMICOLON: ::std::os::raw::c_uint = 74;
-pub const AKEYCODE_APOSTROPHE: ::std::os::raw::c_uint = 75;
-pub const AKEYCODE_SLASH: ::std::os::raw::c_uint = 76;
-pub const AKEYCODE_AT: ::std::os::raw::c_uint = 77;
-pub const AKEYCODE_NUM: ::std::os::raw::c_uint = 78;
-pub const AKEYCODE_HEADSETHOOK: ::std::os::raw::c_uint = 79;
-pub const AKEYCODE_FOCUS: ::std::os::raw::c_uint = 80;
-pub const AKEYCODE_PLUS: ::std::os::raw::c_uint = 81;
-pub const AKEYCODE_MENU: ::std::os::raw::c_uint = 82;
-pub const AKEYCODE_NOTIFICATION: ::std::os::raw::c_uint = 83;
-pub const AKEYCODE_SEARCH: ::std::os::raw::c_uint = 84;
-pub const AKEYCODE_MEDIA_PLAY_PAUSE: ::std::os::raw::c_uint = 85;
-pub const AKEYCODE_MEDIA_STOP: ::std::os::raw::c_uint = 86;
-pub const AKEYCODE_MEDIA_NEXT: ::std::os::raw::c_uint = 87;
-pub const AKEYCODE_MEDIA_PREVIOUS: ::std::os::raw::c_uint = 88;
-pub const AKEYCODE_MEDIA_REWIND: ::std::os::raw::c_uint = 89;
-pub const AKEYCODE_MEDIA_FAST_FORWARD: ::std::os::raw::c_uint = 90;
-pub const AKEYCODE_MUTE: ::std::os::raw::c_uint = 91;
-pub const AKEYCODE_PAGE_UP: ::std::os::raw::c_uint = 92;
-pub const AKEYCODE_PAGE_DOWN: ::std::os::raw::c_uint = 93;
-pub const AKEYCODE_PICTSYMBOLS: ::std::os::raw::c_uint = 94;
-pub const AKEYCODE_SWITCH_CHARSET: ::std::os::raw::c_uint = 95;
-pub const AKEYCODE_BUTTON_A: ::std::os::raw::c_uint = 96;
-pub const AKEYCODE_BUTTON_B: ::std::os::raw::c_uint = 97;
-pub const AKEYCODE_BUTTON_C: ::std::os::raw::c_uint = 98;
-pub const AKEYCODE_BUTTON_X: ::std::os::raw::c_uint = 99;
-pub const AKEYCODE_BUTTON_Y: ::std::os::raw::c_uint = 100;
-pub const AKEYCODE_BUTTON_Z: ::std::os::raw::c_uint = 101;
-pub const AKEYCODE_BUTTON_L1: ::std::os::raw::c_uint = 102;
-pub const AKEYCODE_BUTTON_R1: ::std::os::raw::c_uint = 103;
-pub const AKEYCODE_BUTTON_L2: ::std::os::raw::c_uint = 104;
-pub const AKEYCODE_BUTTON_R2: ::std::os::raw::c_uint = 105;
-pub const AKEYCODE_BUTTON_THUMBL: ::std::os::raw::c_uint = 106;
-pub const AKEYCODE_BUTTON_THUMBR: ::std::os::raw::c_uint = 107;
-pub const AKEYCODE_BUTTON_START: ::std::os::raw::c_uint = 108;
-pub const AKEYCODE_BUTTON_SELECT: ::std::os::raw::c_uint = 109;
-pub const AKEYCODE_BUTTON_MODE: ::std::os::raw::c_uint = 110;
-pub const AKEYCODE_ESCAPE: ::std::os::raw::c_uint = 111;
-pub const AKEYCODE_FORWARD_DEL: ::std::os::raw::c_uint = 112;
-pub const AKEYCODE_CTRL_LEFT: ::std::os::raw::c_uint = 113;
-pub const AKEYCODE_CTRL_RIGHT: ::std::os::raw::c_uint = 114;
-pub const AKEYCODE_CAPS_LOCK: ::std::os::raw::c_uint = 115;
-pub const AKEYCODE_SCROLL_LOCK: ::std::os::raw::c_uint = 116;
-pub const AKEYCODE_META_LEFT: ::std::os::raw::c_uint = 117;
-pub const AKEYCODE_META_RIGHT: ::std::os::raw::c_uint = 118;
-pub const AKEYCODE_FUNCTION: ::std::os::raw::c_uint = 119;
-pub const AKEYCODE_SYSRQ: ::std::os::raw::c_uint = 120;
-pub const AKEYCODE_BREAK: ::std::os::raw::c_uint = 121;
-pub const AKEYCODE_MOVE_HOME: ::std::os::raw::c_uint = 122;
-pub const AKEYCODE_MOVE_END: ::std::os::raw::c_uint = 123;
-pub const AKEYCODE_INSERT: ::std::os::raw::c_uint = 124;
-pub const AKEYCODE_FORWARD: ::std::os::raw::c_uint = 125;
-pub const AKEYCODE_MEDIA_PLAY: ::std::os::raw::c_uint = 126;
-pub const AKEYCODE_MEDIA_PAUSE: ::std::os::raw::c_uint = 127;
-pub const AKEYCODE_MEDIA_CLOSE: ::std::os::raw::c_uint = 128;
-pub const AKEYCODE_MEDIA_EJECT: ::std::os::raw::c_uint = 129;
-pub const AKEYCODE_MEDIA_RECORD: ::std::os::raw::c_uint = 130;
-pub const AKEYCODE_F1: ::std::os::raw::c_uint = 131;
-pub const AKEYCODE_F2: ::std::os::raw::c_uint = 132;
-pub const AKEYCODE_F3: ::std::os::raw::c_uint = 133;
-pub const AKEYCODE_F4: ::std::os::raw::c_uint = 134;
-pub const AKEYCODE_F5: ::std::os::raw::c_uint = 135;
-pub const AKEYCODE_F6: ::std::os::raw::c_uint = 136;
-pub const AKEYCODE_F7: ::std::os::raw::c_uint = 137;
-pub const AKEYCODE_F8: ::std::os::raw::c_uint = 138;
-pub const AKEYCODE_F9: ::std::os::raw::c_uint = 139;
-pub const AKEYCODE_F10: ::std::os::raw::c_uint = 140;
-pub const AKEYCODE_F11: ::std::os::raw::c_uint = 141;
-pub const AKEYCODE_F12: ::std::os::raw::c_uint = 142;
-pub const AKEYCODE_NUM_LOCK: ::std::os::raw::c_uint = 143;
-pub const AKEYCODE_NUMPAD_0: ::std::os::raw::c_uint = 144;
-pub const AKEYCODE_NUMPAD_1: ::std::os::raw::c_uint = 145;
-pub const AKEYCODE_NUMPAD_2: ::std::os::raw::c_uint = 146;
-pub const AKEYCODE_NUMPAD_3: ::std::os::raw::c_uint = 147;
-pub const AKEYCODE_NUMPAD_4: ::std::os::raw::c_uint = 148;
-pub const AKEYCODE_NUMPAD_5: ::std::os::raw::c_uint = 149;
-pub const AKEYCODE_NUMPAD_6: ::std::os::raw::c_uint = 150;
-pub const AKEYCODE_NUMPAD_7: ::std::os::raw::c_uint = 151;
-pub const AKEYCODE_NUMPAD_8: ::std::os::raw::c_uint = 152;
-pub const AKEYCODE_NUMPAD_9: ::std::os::raw::c_uint = 153;
-pub const AKEYCODE_NUMPAD_DIVIDE: ::std::os::raw::c_uint = 154;
-pub const AKEYCODE_NUMPAD_MULTIPLY: ::std::os::raw::c_uint = 155;
-pub const AKEYCODE_NUMPAD_SUBTRACT: ::std::os::raw::c_uint = 156;
-pub const AKEYCODE_NUMPAD_ADD: ::std::os::raw::c_uint = 157;
-pub const AKEYCODE_NUMPAD_DOT: ::std::os::raw::c_uint = 158;
-pub const AKEYCODE_NUMPAD_COMMA: ::std::os::raw::c_uint = 159;
-pub const AKEYCODE_NUMPAD_ENTER: ::std::os::raw::c_uint = 160;
-pub const AKEYCODE_NUMPAD_EQUALS: ::std::os::raw::c_uint = 161;
-pub const AKEYCODE_NUMPAD_LEFT_PAREN: ::std::os::raw::c_uint = 162;
-pub const AKEYCODE_NUMPAD_RIGHT_PAREN: ::std::os::raw::c_uint = 163;
-pub const AKEYCODE_VOLUME_MUTE: ::std::os::raw::c_uint = 164;
-pub const AKEYCODE_INFO: ::std::os::raw::c_uint = 165;
-pub const AKEYCODE_CHANNEL_UP: ::std::os::raw::c_uint = 166;
-pub const AKEYCODE_CHANNEL_DOWN: ::std::os::raw::c_uint = 167;
-pub const AKEYCODE_ZOOM_IN: ::std::os::raw::c_uint = 168;
-pub const AKEYCODE_ZOOM_OUT: ::std::os::raw::c_uint = 169;
-pub const AKEYCODE_TV: ::std::os::raw::c_uint = 170;
-pub const AKEYCODE_WINDOW: ::std::os::raw::c_uint = 171;
-pub const AKEYCODE_GUIDE: ::std::os::raw::c_uint = 172;
-pub const AKEYCODE_DVR: ::std::os::raw::c_uint = 173;
-pub const AKEYCODE_BOOKMARK: ::std::os::raw::c_uint = 174;
-pub const AKEYCODE_CAPTIONS: ::std::os::raw::c_uint = 175;
-pub const AKEYCODE_SETTINGS: ::std::os::raw::c_uint = 176;
-pub const AKEYCODE_TV_POWER: ::std::os::raw::c_uint = 177;
-pub const AKEYCODE_TV_INPUT: ::std::os::raw::c_uint = 178;
-pub const AKEYCODE_STB_POWER: ::std::os::raw::c_uint = 179;
-pub const AKEYCODE_STB_INPUT: ::std::os::raw::c_uint = 180;
-pub const AKEYCODE_AVR_POWER: ::std::os::raw::c_uint = 181;
-pub const AKEYCODE_AVR_INPUT: ::std::os::raw::c_uint = 182;
-pub const AKEYCODE_PROG_RED: ::std::os::raw::c_uint = 183;
-pub const AKEYCODE_PROG_GREEN: ::std::os::raw::c_uint = 184;
-pub const AKEYCODE_PROG_YELLOW: ::std::os::raw::c_uint = 185;
-pub const AKEYCODE_PROG_BLUE: ::std::os::raw::c_uint = 186;
-pub const AKEYCODE_APP_SWITCH: ::std::os::raw::c_uint = 187;
-pub const AKEYCODE_BUTTON_1: ::std::os::raw::c_uint = 188;
-pub const AKEYCODE_BUTTON_2: ::std::os::raw::c_uint = 189;
-pub const AKEYCODE_BUTTON_3: ::std::os::raw::c_uint = 190;
-pub const AKEYCODE_BUTTON_4: ::std::os::raw::c_uint = 191;
-pub const AKEYCODE_BUTTON_5: ::std::os::raw::c_uint = 192;
-pub const AKEYCODE_BUTTON_6: ::std::os::raw::c_uint = 193;
-pub const AKEYCODE_BUTTON_7: ::std::os::raw::c_uint = 194;
-pub const AKEYCODE_BUTTON_8: ::std::os::raw::c_uint = 195;
-pub const AKEYCODE_BUTTON_9: ::std::os::raw::c_uint = 196;
-pub const AKEYCODE_BUTTON_10: ::std::os::raw::c_uint = 197;
-pub const AKEYCODE_BUTTON_11: ::std::os::raw::c_uint = 198;
-pub const AKEYCODE_BUTTON_12: ::std::os::raw::c_uint = 199;
-pub const AKEYCODE_BUTTON_13: ::std::os::raw::c_uint = 200;
-pub const AKEYCODE_BUTTON_14: ::std::os::raw::c_uint = 201;
-pub const AKEYCODE_BUTTON_15: ::std::os::raw::c_uint = 202;
-pub const AKEYCODE_BUTTON_16: ::std::os::raw::c_uint = 203;
-pub const AKEYCODE_LANGUAGE_SWITCH: ::std::os::raw::c_uint = 204;
-pub const AKEYCODE_MANNER_MODE: ::std::os::raw::c_uint = 205;
-pub const AKEYCODE_3D_MODE: ::std::os::raw::c_uint = 206;
-pub const AKEYCODE_CONTACTS: ::std::os::raw::c_uint = 207;
-pub const AKEYCODE_CALENDAR: ::std::os::raw::c_uint = 208;
-pub const AKEYCODE_MUSIC: ::std::os::raw::c_uint = 209;
-pub const AKEYCODE_CALCULATOR: ::std::os::raw::c_uint = 210;
-pub const AKEYCODE_ZENKAKU_HANKAKU: ::std::os::raw::c_uint = 211;
-pub const AKEYCODE_EISU: ::std::os::raw::c_uint = 212;
-pub const AKEYCODE_MUHENKAN: ::std::os::raw::c_uint = 213;
-pub const AKEYCODE_HENKAN: ::std::os::raw::c_uint = 214;
-pub const AKEYCODE_KATAKANA_HIRAGANA: ::std::os::raw::c_uint = 215;
-pub const AKEYCODE_YEN: ::std::os::raw::c_uint = 216;
-pub const AKEYCODE_RO: ::std::os::raw::c_uint = 217;
-pub const AKEYCODE_KANA: ::std::os::raw::c_uint = 218;
-pub const AKEYCODE_ASSIST: ::std::os::raw::c_uint = 219;
-pub const AKEYCODE_BRIGHTNESS_DOWN: ::std::os::raw::c_uint = 220;
-pub const AKEYCODE_BRIGHTNESS_UP: ::std::os::raw::c_uint = 221;
-pub const AKEYCODE_MEDIA_AUDIO_TRACK: ::std::os::raw::c_uint = 222;
-pub const AKEYCODE_SLEEP: ::std::os::raw::c_uint = 223;
-pub const AKEYCODE_WAKEUP: ::std::os::raw::c_uint = 224;
-pub const AKEYCODE_PAIRING: ::std::os::raw::c_uint = 225;
-pub const AKEYCODE_MEDIA_TOP_MENU: ::std::os::raw::c_uint = 226;
-pub const AKEYCODE_11: ::std::os::raw::c_uint = 227;
-pub const AKEYCODE_12: ::std::os::raw::c_uint = 228;
-pub const AKEYCODE_LAST_CHANNEL: ::std::os::raw::c_uint = 229;
-pub const AKEYCODE_TV_DATA_SERVICE: ::std::os::raw::c_uint = 230;
-pub const AKEYCODE_VOICE_ASSIST: ::std::os::raw::c_uint = 231;
-pub const AKEYCODE_TV_RADIO_SERVICE: ::std::os::raw::c_uint = 232;
-pub const AKEYCODE_TV_TELETEXT: ::std::os::raw::c_uint = 233;
-pub const AKEYCODE_TV_NUMBER_ENTRY: ::std::os::raw::c_uint = 234;
-pub const AKEYCODE_TV_TERRESTRIAL_ANALOG: ::std::os::raw::c_uint = 235;
-pub const AKEYCODE_TV_TERRESTRIAL_DIGITAL: ::std::os::raw::c_uint = 236;
-pub const AKEYCODE_TV_SATELLITE: ::std::os::raw::c_uint = 237;
-pub const AKEYCODE_TV_SATELLITE_BS: ::std::os::raw::c_uint = 238;
-pub const AKEYCODE_TV_SATELLITE_CS: ::std::os::raw::c_uint = 239;
-pub const AKEYCODE_TV_SATELLITE_SERVICE: ::std::os::raw::c_uint = 240;
-pub const AKEYCODE_TV_NETWORK: ::std::os::raw::c_uint = 241;
-pub const AKEYCODE_TV_ANTENNA_CABLE: ::std::os::raw::c_uint = 242;
-pub const AKEYCODE_TV_INPUT_HDMI_1: ::std::os::raw::c_uint = 243;
-pub const AKEYCODE_TV_INPUT_HDMI_2: ::std::os::raw::c_uint = 244;
-pub const AKEYCODE_TV_INPUT_HDMI_3: ::std::os::raw::c_uint = 245;
-pub const AKEYCODE_TV_INPUT_HDMI_4: ::std::os::raw::c_uint = 246;
-pub const AKEYCODE_TV_INPUT_COMPOSITE_1: ::std::os::raw::c_uint = 247;
-pub const AKEYCODE_TV_INPUT_COMPOSITE_2: ::std::os::raw::c_uint = 248;
-pub const AKEYCODE_TV_INPUT_COMPONENT_1: ::std::os::raw::c_uint = 249;
-pub const AKEYCODE_TV_INPUT_COMPONENT_2: ::std::os::raw::c_uint = 250;
-pub const AKEYCODE_TV_INPUT_VGA_1: ::std::os::raw::c_uint = 251;
-pub const AKEYCODE_TV_AUDIO_DESCRIPTION: ::std::os::raw::c_uint = 252;
-pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP: ::std::os::raw::c_uint = 253;
-pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN: ::std::os::raw::c_uint = 254;
-pub const AKEYCODE_TV_ZOOM_MODE: ::std::os::raw::c_uint = 255;
-pub const AKEYCODE_TV_CONTENTS_MENU: ::std::os::raw::c_uint = 256;
-pub const AKEYCODE_TV_MEDIA_CONTEXT_MENU: ::std::os::raw::c_uint = 257;
-pub const AKEYCODE_TV_TIMER_PROGRAMMING: ::std::os::raw::c_uint = 258;
-pub const AKEYCODE_HELP: ::std::os::raw::c_uint = 259;
-pub const AKEYCODE_NAVIGATE_PREVIOUS: ::std::os::raw::c_uint = 260;
-pub const AKEYCODE_NAVIGATE_NEXT: ::std::os::raw::c_uint = 261;
-pub const AKEYCODE_NAVIGATE_IN: ::std::os::raw::c_uint = 262;
-pub const AKEYCODE_NAVIGATE_OUT: ::std::os::raw::c_uint = 263;
-pub const AKEYCODE_STEM_PRIMARY: ::std::os::raw::c_uint = 264;
-pub const AKEYCODE_STEM_1: ::std::os::raw::c_uint = 265;
-pub const AKEYCODE_STEM_2: ::std::os::raw::c_uint = 266;
-pub const AKEYCODE_STEM_3: ::std::os::raw::c_uint = 267;
-pub const AKEYCODE_DPAD_UP_LEFT: ::std::os::raw::c_uint = 268;
-pub const AKEYCODE_DPAD_DOWN_LEFT: ::std::os::raw::c_uint = 269;
-pub const AKEYCODE_DPAD_UP_RIGHT: ::std::os::raw::c_uint = 270;
-pub const AKEYCODE_DPAD_DOWN_RIGHT: ::std::os::raw::c_uint = 271;
-pub const AKEYCODE_MEDIA_SKIP_FORWARD: ::std::os::raw::c_uint = 272;
-pub const AKEYCODE_MEDIA_SKIP_BACKWARD: ::std::os::raw::c_uint = 273;
-pub const AKEYCODE_MEDIA_STEP_FORWARD: ::std::os::raw::c_uint = 274;
-pub const AKEYCODE_MEDIA_STEP_BACKWARD: ::std::os::raw::c_uint = 275;
-pub const AKEYCODE_SOFT_SLEEP: ::std::os::raw::c_uint = 276;
-pub const AKEYCODE_CUT: ::std::os::raw::c_uint = 277;
-pub const AKEYCODE_COPY: ::std::os::raw::c_uint = 278;
-pub const AKEYCODE_PASTE: ::std::os::raw::c_uint = 279;
-pub const AKEYCODE_SYSTEM_NAVIGATION_UP: ::std::os::raw::c_uint = 280;
-pub const AKEYCODE_SYSTEM_NAVIGATION_DOWN: ::std::os::raw::c_uint = 281;
-pub const AKEYCODE_SYSTEM_NAVIGATION_LEFT: ::std::os::raw::c_uint = 282;
-pub const AKEYCODE_SYSTEM_NAVIGATION_RIGHT: ::std::os::raw::c_uint = 283;
-pub const AKEYCODE_ALL_APPS: ::std::os::raw::c_uint = 284;
-pub const AKEYCODE_REFRESH: ::std::os::raw::c_uint = 285;
-pub const AKEYCODE_THUMBS_UP: ::std::os::raw::c_uint = 286;
-pub const AKEYCODE_THUMBS_DOWN: ::std::os::raw::c_uint = 287;
-pub const AKEYCODE_PROFILE_SWITCH: ::std::os::raw::c_uint = 288;
+pub const AKEYCODE_UNKNOWN: _bindgen_ty_2 = 0;
+pub const AKEYCODE_SOFT_LEFT: _bindgen_ty_2 = 1;
+pub const AKEYCODE_SOFT_RIGHT: _bindgen_ty_2 = 2;
+pub const AKEYCODE_HOME: _bindgen_ty_2 = 3;
+pub const AKEYCODE_BACK: _bindgen_ty_2 = 4;
+pub const AKEYCODE_CALL: _bindgen_ty_2 = 5;
+pub const AKEYCODE_ENDCALL: _bindgen_ty_2 = 6;
+pub const AKEYCODE_0: _bindgen_ty_2 = 7;
+pub const AKEYCODE_1: _bindgen_ty_2 = 8;
+pub const AKEYCODE_2: _bindgen_ty_2 = 9;
+pub const AKEYCODE_3: _bindgen_ty_2 = 10;
+pub const AKEYCODE_4: _bindgen_ty_2 = 11;
+pub const AKEYCODE_5: _bindgen_ty_2 = 12;
+pub const AKEYCODE_6: _bindgen_ty_2 = 13;
+pub const AKEYCODE_7: _bindgen_ty_2 = 14;
+pub const AKEYCODE_8: _bindgen_ty_2 = 15;
+pub const AKEYCODE_9: _bindgen_ty_2 = 16;
+pub const AKEYCODE_STAR: _bindgen_ty_2 = 17;
+pub const AKEYCODE_POUND: _bindgen_ty_2 = 18;
+pub const AKEYCODE_DPAD_UP: _bindgen_ty_2 = 19;
+pub const AKEYCODE_DPAD_DOWN: _bindgen_ty_2 = 20;
+pub const AKEYCODE_DPAD_LEFT: _bindgen_ty_2 = 21;
+pub const AKEYCODE_DPAD_RIGHT: _bindgen_ty_2 = 22;
+pub const AKEYCODE_DPAD_CENTER: _bindgen_ty_2 = 23;
+pub const AKEYCODE_VOLUME_UP: _bindgen_ty_2 = 24;
+pub const AKEYCODE_VOLUME_DOWN: _bindgen_ty_2 = 25;
+pub const AKEYCODE_POWER: _bindgen_ty_2 = 26;
+pub const AKEYCODE_CAMERA: _bindgen_ty_2 = 27;
+pub const AKEYCODE_CLEAR: _bindgen_ty_2 = 28;
+pub const AKEYCODE_A: _bindgen_ty_2 = 29;
+pub const AKEYCODE_B: _bindgen_ty_2 = 30;
+pub const AKEYCODE_C: _bindgen_ty_2 = 31;
+pub const AKEYCODE_D: _bindgen_ty_2 = 32;
+pub const AKEYCODE_E: _bindgen_ty_2 = 33;
+pub const AKEYCODE_F: _bindgen_ty_2 = 34;
+pub const AKEYCODE_G: _bindgen_ty_2 = 35;
+pub const AKEYCODE_H: _bindgen_ty_2 = 36;
+pub const AKEYCODE_I: _bindgen_ty_2 = 37;
+pub const AKEYCODE_J: _bindgen_ty_2 = 38;
+pub const AKEYCODE_K: _bindgen_ty_2 = 39;
+pub const AKEYCODE_L: _bindgen_ty_2 = 40;
+pub const AKEYCODE_M: _bindgen_ty_2 = 41;
+pub const AKEYCODE_N: _bindgen_ty_2 = 42;
+pub const AKEYCODE_O: _bindgen_ty_2 = 43;
+pub const AKEYCODE_P: _bindgen_ty_2 = 44;
+pub const AKEYCODE_Q: _bindgen_ty_2 = 45;
+pub const AKEYCODE_R: _bindgen_ty_2 = 46;
+pub const AKEYCODE_S: _bindgen_ty_2 = 47;
+pub const AKEYCODE_T: _bindgen_ty_2 = 48;
+pub const AKEYCODE_U: _bindgen_ty_2 = 49;
+pub const AKEYCODE_V: _bindgen_ty_2 = 50;
+pub const AKEYCODE_W: _bindgen_ty_2 = 51;
+pub const AKEYCODE_X: _bindgen_ty_2 = 52;
+pub const AKEYCODE_Y: _bindgen_ty_2 = 53;
+pub const AKEYCODE_Z: _bindgen_ty_2 = 54;
+pub const AKEYCODE_COMMA: _bindgen_ty_2 = 55;
+pub const AKEYCODE_PERIOD: _bindgen_ty_2 = 56;
+pub const AKEYCODE_ALT_LEFT: _bindgen_ty_2 = 57;
+pub const AKEYCODE_ALT_RIGHT: _bindgen_ty_2 = 58;
+pub const AKEYCODE_SHIFT_LEFT: _bindgen_ty_2 = 59;
+pub const AKEYCODE_SHIFT_RIGHT: _bindgen_ty_2 = 60;
+pub const AKEYCODE_TAB: _bindgen_ty_2 = 61;
+pub const AKEYCODE_SPACE: _bindgen_ty_2 = 62;
+pub const AKEYCODE_SYM: _bindgen_ty_2 = 63;
+pub const AKEYCODE_EXPLORER: _bindgen_ty_2 = 64;
+pub const AKEYCODE_ENVELOPE: _bindgen_ty_2 = 65;
+pub const AKEYCODE_ENTER: _bindgen_ty_2 = 66;
+pub const AKEYCODE_DEL: _bindgen_ty_2 = 67;
+pub const AKEYCODE_GRAVE: _bindgen_ty_2 = 68;
+pub const AKEYCODE_MINUS: _bindgen_ty_2 = 69;
+pub const AKEYCODE_EQUALS: _bindgen_ty_2 = 70;
+pub const AKEYCODE_LEFT_BRACKET: _bindgen_ty_2 = 71;
+pub const AKEYCODE_RIGHT_BRACKET: _bindgen_ty_2 = 72;
+pub const AKEYCODE_BACKSLASH: _bindgen_ty_2 = 73;
+pub const AKEYCODE_SEMICOLON: _bindgen_ty_2 = 74;
+pub const AKEYCODE_APOSTROPHE: _bindgen_ty_2 = 75;
+pub const AKEYCODE_SLASH: _bindgen_ty_2 = 76;
+pub const AKEYCODE_AT: _bindgen_ty_2 = 77;
+pub const AKEYCODE_NUM: _bindgen_ty_2 = 78;
+pub const AKEYCODE_HEADSETHOOK: _bindgen_ty_2 = 79;
+pub const AKEYCODE_FOCUS: _bindgen_ty_2 = 80;
+pub const AKEYCODE_PLUS: _bindgen_ty_2 = 81;
+pub const AKEYCODE_MENU: _bindgen_ty_2 = 82;
+pub const AKEYCODE_NOTIFICATION: _bindgen_ty_2 = 83;
+pub const AKEYCODE_SEARCH: _bindgen_ty_2 = 84;
+pub const AKEYCODE_MEDIA_PLAY_PAUSE: _bindgen_ty_2 = 85;
+pub const AKEYCODE_MEDIA_STOP: _bindgen_ty_2 = 86;
+pub const AKEYCODE_MEDIA_NEXT: _bindgen_ty_2 = 87;
+pub const AKEYCODE_MEDIA_PREVIOUS: _bindgen_ty_2 = 88;
+pub const AKEYCODE_MEDIA_REWIND: _bindgen_ty_2 = 89;
+pub const AKEYCODE_MEDIA_FAST_FORWARD: _bindgen_ty_2 = 90;
+pub const AKEYCODE_MUTE: _bindgen_ty_2 = 91;
+pub const AKEYCODE_PAGE_UP: _bindgen_ty_2 = 92;
+pub const AKEYCODE_PAGE_DOWN: _bindgen_ty_2 = 93;
+pub const AKEYCODE_PICTSYMBOLS: _bindgen_ty_2 = 94;
+pub const AKEYCODE_SWITCH_CHARSET: _bindgen_ty_2 = 95;
+pub const AKEYCODE_BUTTON_A: _bindgen_ty_2 = 96;
+pub const AKEYCODE_BUTTON_B: _bindgen_ty_2 = 97;
+pub const AKEYCODE_BUTTON_C: _bindgen_ty_2 = 98;
+pub const AKEYCODE_BUTTON_X: _bindgen_ty_2 = 99;
+pub const AKEYCODE_BUTTON_Y: _bindgen_ty_2 = 100;
+pub const AKEYCODE_BUTTON_Z: _bindgen_ty_2 = 101;
+pub const AKEYCODE_BUTTON_L1: _bindgen_ty_2 = 102;
+pub const AKEYCODE_BUTTON_R1: _bindgen_ty_2 = 103;
+pub const AKEYCODE_BUTTON_L2: _bindgen_ty_2 = 104;
+pub const AKEYCODE_BUTTON_R2: _bindgen_ty_2 = 105;
+pub const AKEYCODE_BUTTON_THUMBL: _bindgen_ty_2 = 106;
+pub const AKEYCODE_BUTTON_THUMBR: _bindgen_ty_2 = 107;
+pub const AKEYCODE_BUTTON_START: _bindgen_ty_2 = 108;
+pub const AKEYCODE_BUTTON_SELECT: _bindgen_ty_2 = 109;
+pub const AKEYCODE_BUTTON_MODE: _bindgen_ty_2 = 110;
+pub const AKEYCODE_ESCAPE: _bindgen_ty_2 = 111;
+pub const AKEYCODE_FORWARD_DEL: _bindgen_ty_2 = 112;
+pub const AKEYCODE_CTRL_LEFT: _bindgen_ty_2 = 113;
+pub const AKEYCODE_CTRL_RIGHT: _bindgen_ty_2 = 114;
+pub const AKEYCODE_CAPS_LOCK: _bindgen_ty_2 = 115;
+pub const AKEYCODE_SCROLL_LOCK: _bindgen_ty_2 = 116;
+pub const AKEYCODE_META_LEFT: _bindgen_ty_2 = 117;
+pub const AKEYCODE_META_RIGHT: _bindgen_ty_2 = 118;
+pub const AKEYCODE_FUNCTION: _bindgen_ty_2 = 119;
+pub const AKEYCODE_SYSRQ: _bindgen_ty_2 = 120;
+pub const AKEYCODE_BREAK: _bindgen_ty_2 = 121;
+pub const AKEYCODE_MOVE_HOME: _bindgen_ty_2 = 122;
+pub const AKEYCODE_MOVE_END: _bindgen_ty_2 = 123;
+pub const AKEYCODE_INSERT: _bindgen_ty_2 = 124;
+pub const AKEYCODE_FORWARD: _bindgen_ty_2 = 125;
+pub const AKEYCODE_MEDIA_PLAY: _bindgen_ty_2 = 126;
+pub const AKEYCODE_MEDIA_PAUSE: _bindgen_ty_2 = 127;
+pub const AKEYCODE_MEDIA_CLOSE: _bindgen_ty_2 = 128;
+pub const AKEYCODE_MEDIA_EJECT: _bindgen_ty_2 = 129;
+pub const AKEYCODE_MEDIA_RECORD: _bindgen_ty_2 = 130;
+pub const AKEYCODE_F1: _bindgen_ty_2 = 131;
+pub const AKEYCODE_F2: _bindgen_ty_2 = 132;
+pub const AKEYCODE_F3: _bindgen_ty_2 = 133;
+pub const AKEYCODE_F4: _bindgen_ty_2 = 134;
+pub const AKEYCODE_F5: _bindgen_ty_2 = 135;
+pub const AKEYCODE_F6: _bindgen_ty_2 = 136;
+pub const AKEYCODE_F7: _bindgen_ty_2 = 137;
+pub const AKEYCODE_F8: _bindgen_ty_2 = 138;
+pub const AKEYCODE_F9: _bindgen_ty_2 = 139;
+pub const AKEYCODE_F10: _bindgen_ty_2 = 140;
+pub const AKEYCODE_F11: _bindgen_ty_2 = 141;
+pub const AKEYCODE_F12: _bindgen_ty_2 = 142;
+pub const AKEYCODE_NUM_LOCK: _bindgen_ty_2 = 143;
+pub const AKEYCODE_NUMPAD_0: _bindgen_ty_2 = 144;
+pub const AKEYCODE_NUMPAD_1: _bindgen_ty_2 = 145;
+pub const AKEYCODE_NUMPAD_2: _bindgen_ty_2 = 146;
+pub const AKEYCODE_NUMPAD_3: _bindgen_ty_2 = 147;
+pub const AKEYCODE_NUMPAD_4: _bindgen_ty_2 = 148;
+pub const AKEYCODE_NUMPAD_5: _bindgen_ty_2 = 149;
+pub const AKEYCODE_NUMPAD_6: _bindgen_ty_2 = 150;
+pub const AKEYCODE_NUMPAD_7: _bindgen_ty_2 = 151;
+pub const AKEYCODE_NUMPAD_8: _bindgen_ty_2 = 152;
+pub const AKEYCODE_NUMPAD_9: _bindgen_ty_2 = 153;
+pub const AKEYCODE_NUMPAD_DIVIDE: _bindgen_ty_2 = 154;
+pub const AKEYCODE_NUMPAD_MULTIPLY: _bindgen_ty_2 = 155;
+pub const AKEYCODE_NUMPAD_SUBTRACT: _bindgen_ty_2 = 156;
+pub const AKEYCODE_NUMPAD_ADD: _bindgen_ty_2 = 157;
+pub const AKEYCODE_NUMPAD_DOT: _bindgen_ty_2 = 158;
+pub const AKEYCODE_NUMPAD_COMMA: _bindgen_ty_2 = 159;
+pub const AKEYCODE_NUMPAD_ENTER: _bindgen_ty_2 = 160;
+pub const AKEYCODE_NUMPAD_EQUALS: _bindgen_ty_2 = 161;
+pub const AKEYCODE_NUMPAD_LEFT_PAREN: _bindgen_ty_2 = 162;
+pub const AKEYCODE_NUMPAD_RIGHT_PAREN: _bindgen_ty_2 = 163;
+pub const AKEYCODE_VOLUME_MUTE: _bindgen_ty_2 = 164;
+pub const AKEYCODE_INFO: _bindgen_ty_2 = 165;
+pub const AKEYCODE_CHANNEL_UP: _bindgen_ty_2 = 166;
+pub const AKEYCODE_CHANNEL_DOWN: _bindgen_ty_2 = 167;
+pub const AKEYCODE_ZOOM_IN: _bindgen_ty_2 = 168;
+pub const AKEYCODE_ZOOM_OUT: _bindgen_ty_2 = 169;
+pub const AKEYCODE_TV: _bindgen_ty_2 = 170;
+pub const AKEYCODE_WINDOW: _bindgen_ty_2 = 171;
+pub const AKEYCODE_GUIDE: _bindgen_ty_2 = 172;
+pub const AKEYCODE_DVR: _bindgen_ty_2 = 173;
+pub const AKEYCODE_BOOKMARK: _bindgen_ty_2 = 174;
+pub const AKEYCODE_CAPTIONS: _bindgen_ty_2 = 175;
+pub const AKEYCODE_SETTINGS: _bindgen_ty_2 = 176;
+pub const AKEYCODE_TV_POWER: _bindgen_ty_2 = 177;
+pub const AKEYCODE_TV_INPUT: _bindgen_ty_2 = 178;
+pub const AKEYCODE_STB_POWER: _bindgen_ty_2 = 179;
+pub const AKEYCODE_STB_INPUT: _bindgen_ty_2 = 180;
+pub const AKEYCODE_AVR_POWER: _bindgen_ty_2 = 181;
+pub const AKEYCODE_AVR_INPUT: _bindgen_ty_2 = 182;
+pub const AKEYCODE_PROG_RED: _bindgen_ty_2 = 183;
+pub const AKEYCODE_PROG_GREEN: _bindgen_ty_2 = 184;
+pub const AKEYCODE_PROG_YELLOW: _bindgen_ty_2 = 185;
+pub const AKEYCODE_PROG_BLUE: _bindgen_ty_2 = 186;
+pub const AKEYCODE_APP_SWITCH: _bindgen_ty_2 = 187;
+pub const AKEYCODE_BUTTON_1: _bindgen_ty_2 = 188;
+pub const AKEYCODE_BUTTON_2: _bindgen_ty_2 = 189;
+pub const AKEYCODE_BUTTON_3: _bindgen_ty_2 = 190;
+pub const AKEYCODE_BUTTON_4: _bindgen_ty_2 = 191;
+pub const AKEYCODE_BUTTON_5: _bindgen_ty_2 = 192;
+pub const AKEYCODE_BUTTON_6: _bindgen_ty_2 = 193;
+pub const AKEYCODE_BUTTON_7: _bindgen_ty_2 = 194;
+pub const AKEYCODE_BUTTON_8: _bindgen_ty_2 = 195;
+pub const AKEYCODE_BUTTON_9: _bindgen_ty_2 = 196;
+pub const AKEYCODE_BUTTON_10: _bindgen_ty_2 = 197;
+pub const AKEYCODE_BUTTON_11: _bindgen_ty_2 = 198;
+pub const AKEYCODE_BUTTON_12: _bindgen_ty_2 = 199;
+pub const AKEYCODE_BUTTON_13: _bindgen_ty_2 = 200;
+pub const AKEYCODE_BUTTON_14: _bindgen_ty_2 = 201;
+pub const AKEYCODE_BUTTON_15: _bindgen_ty_2 = 202;
+pub const AKEYCODE_BUTTON_16: _bindgen_ty_2 = 203;
+pub const AKEYCODE_LANGUAGE_SWITCH: _bindgen_ty_2 = 204;
+pub const AKEYCODE_MANNER_MODE: _bindgen_ty_2 = 205;
+pub const AKEYCODE_3D_MODE: _bindgen_ty_2 = 206;
+pub const AKEYCODE_CONTACTS: _bindgen_ty_2 = 207;
+pub const AKEYCODE_CALENDAR: _bindgen_ty_2 = 208;
+pub const AKEYCODE_MUSIC: _bindgen_ty_2 = 209;
+pub const AKEYCODE_CALCULATOR: _bindgen_ty_2 = 210;
+pub const AKEYCODE_ZENKAKU_HANKAKU: _bindgen_ty_2 = 211;
+pub const AKEYCODE_EISU: _bindgen_ty_2 = 212;
+pub const AKEYCODE_MUHENKAN: _bindgen_ty_2 = 213;
+pub const AKEYCODE_HENKAN: _bindgen_ty_2 = 214;
+pub const AKEYCODE_KATAKANA_HIRAGANA: _bindgen_ty_2 = 215;
+pub const AKEYCODE_YEN: _bindgen_ty_2 = 216;
+pub const AKEYCODE_RO: _bindgen_ty_2 = 217;
+pub const AKEYCODE_KANA: _bindgen_ty_2 = 218;
+pub const AKEYCODE_ASSIST: _bindgen_ty_2 = 219;
+pub const AKEYCODE_BRIGHTNESS_DOWN: _bindgen_ty_2 = 220;
+pub const AKEYCODE_BRIGHTNESS_UP: _bindgen_ty_2 = 221;
+pub const AKEYCODE_MEDIA_AUDIO_TRACK: _bindgen_ty_2 = 222;
+pub const AKEYCODE_SLEEP: _bindgen_ty_2 = 223;
+pub const AKEYCODE_WAKEUP: _bindgen_ty_2 = 224;
+pub const AKEYCODE_PAIRING: _bindgen_ty_2 = 225;
+pub const AKEYCODE_MEDIA_TOP_MENU: _bindgen_ty_2 = 226;
+pub const AKEYCODE_11: _bindgen_ty_2 = 227;
+pub const AKEYCODE_12: _bindgen_ty_2 = 228;
+pub const AKEYCODE_LAST_CHANNEL: _bindgen_ty_2 = 229;
+pub const AKEYCODE_TV_DATA_SERVICE: _bindgen_ty_2 = 230;
+pub const AKEYCODE_VOICE_ASSIST: _bindgen_ty_2 = 231;
+pub const AKEYCODE_TV_RADIO_SERVICE: _bindgen_ty_2 = 232;
+pub const AKEYCODE_TV_TELETEXT: _bindgen_ty_2 = 233;
+pub const AKEYCODE_TV_NUMBER_ENTRY: _bindgen_ty_2 = 234;
+pub const AKEYCODE_TV_TERRESTRIAL_ANALOG: _bindgen_ty_2 = 235;
+pub const AKEYCODE_TV_TERRESTRIAL_DIGITAL: _bindgen_ty_2 = 236;
+pub const AKEYCODE_TV_SATELLITE: _bindgen_ty_2 = 237;
+pub const AKEYCODE_TV_SATELLITE_BS: _bindgen_ty_2 = 238;
+pub const AKEYCODE_TV_SATELLITE_CS: _bindgen_ty_2 = 239;
+pub const AKEYCODE_TV_SATELLITE_SERVICE: _bindgen_ty_2 = 240;
+pub const AKEYCODE_TV_NETWORK: _bindgen_ty_2 = 241;
+pub const AKEYCODE_TV_ANTENNA_CABLE: _bindgen_ty_2 = 242;
+pub const AKEYCODE_TV_INPUT_HDMI_1: _bindgen_ty_2 = 243;
+pub const AKEYCODE_TV_INPUT_HDMI_2: _bindgen_ty_2 = 244;
+pub const AKEYCODE_TV_INPUT_HDMI_3: _bindgen_ty_2 = 245;
+pub const AKEYCODE_TV_INPUT_HDMI_4: _bindgen_ty_2 = 246;
+pub const AKEYCODE_TV_INPUT_COMPOSITE_1: _bindgen_ty_2 = 247;
+pub const AKEYCODE_TV_INPUT_COMPOSITE_2: _bindgen_ty_2 = 248;
+pub const AKEYCODE_TV_INPUT_COMPONENT_1: _bindgen_ty_2 = 249;
+pub const AKEYCODE_TV_INPUT_COMPONENT_2: _bindgen_ty_2 = 250;
+pub const AKEYCODE_TV_INPUT_VGA_1: _bindgen_ty_2 = 251;
+pub const AKEYCODE_TV_AUDIO_DESCRIPTION: _bindgen_ty_2 = 252;
+pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP: _bindgen_ty_2 = 253;
+pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN: _bindgen_ty_2 = 254;
+pub const AKEYCODE_TV_ZOOM_MODE: _bindgen_ty_2 = 255;
+pub const AKEYCODE_TV_CONTENTS_MENU: _bindgen_ty_2 = 256;
+pub const AKEYCODE_TV_MEDIA_CONTEXT_MENU: _bindgen_ty_2 = 257;
+pub const AKEYCODE_TV_TIMER_PROGRAMMING: _bindgen_ty_2 = 258;
+pub const AKEYCODE_HELP: _bindgen_ty_2 = 259;
+pub const AKEYCODE_NAVIGATE_PREVIOUS: _bindgen_ty_2 = 260;
+pub const AKEYCODE_NAVIGATE_NEXT: _bindgen_ty_2 = 261;
+pub const AKEYCODE_NAVIGATE_IN: _bindgen_ty_2 = 262;
+pub const AKEYCODE_NAVIGATE_OUT: _bindgen_ty_2 = 263;
+pub const AKEYCODE_STEM_PRIMARY: _bindgen_ty_2 = 264;
+pub const AKEYCODE_STEM_1: _bindgen_ty_2 = 265;
+pub const AKEYCODE_STEM_2: _bindgen_ty_2 = 266;
+pub const AKEYCODE_STEM_3: _bindgen_ty_2 = 267;
+pub const AKEYCODE_DPAD_UP_LEFT: _bindgen_ty_2 = 268;
+pub const AKEYCODE_DPAD_DOWN_LEFT: _bindgen_ty_2 = 269;
+pub const AKEYCODE_DPAD_UP_RIGHT: _bindgen_ty_2 = 270;
+pub const AKEYCODE_DPAD_DOWN_RIGHT: _bindgen_ty_2 = 271;
+pub const AKEYCODE_MEDIA_SKIP_FORWARD: _bindgen_ty_2 = 272;
+pub const AKEYCODE_MEDIA_SKIP_BACKWARD: _bindgen_ty_2 = 273;
+pub const AKEYCODE_MEDIA_STEP_FORWARD: _bindgen_ty_2 = 274;
+pub const AKEYCODE_MEDIA_STEP_BACKWARD: _bindgen_ty_2 = 275;
+pub const AKEYCODE_SOFT_SLEEP: _bindgen_ty_2 = 276;
+pub const AKEYCODE_CUT: _bindgen_ty_2 = 277;
+pub const AKEYCODE_COPY: _bindgen_ty_2 = 278;
+pub const AKEYCODE_PASTE: _bindgen_ty_2 = 279;
+pub const AKEYCODE_SYSTEM_NAVIGATION_UP: _bindgen_ty_2 = 280;
+pub const AKEYCODE_SYSTEM_NAVIGATION_DOWN: _bindgen_ty_2 = 281;
+pub const AKEYCODE_SYSTEM_NAVIGATION_LEFT: _bindgen_ty_2 = 282;
+pub const AKEYCODE_SYSTEM_NAVIGATION_RIGHT: _bindgen_ty_2 = 283;
+pub const AKEYCODE_ALL_APPS: _bindgen_ty_2 = 284;
+pub const AKEYCODE_REFRESH: _bindgen_ty_2 = 285;
+pub const AKEYCODE_THUMBS_UP: _bindgen_ty_2 = 286;
+pub const AKEYCODE_THUMBS_DOWN: _bindgen_ty_2 = 287;
+pub const AKEYCODE_PROFILE_SWITCH: _bindgen_ty_2 = 288;
 pub type _bindgen_ty_2 = ::std::os::raw::c_uint;
-pub const ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: ::std::os::raw::c_uint = 1;
+pub const ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: _bindgen_ty_3 = 1;
 pub type _bindgen_ty_3 = ::std::os::raw::c_uint;
-pub const ALOOPER_POLL_WAKE: ::std::os::raw::c_int = -1;
-pub const ALOOPER_POLL_CALLBACK: ::std::os::raw::c_int = -2;
-pub const ALOOPER_POLL_TIMEOUT: ::std::os::raw::c_int = -3;
-pub const ALOOPER_POLL_ERROR: ::std::os::raw::c_int = -4;
+pub const ALOOPER_POLL_WAKE: _bindgen_ty_4 = -1;
+pub const ALOOPER_POLL_CALLBACK: _bindgen_ty_4 = -2;
+pub const ALOOPER_POLL_TIMEOUT: _bindgen_ty_4 = -3;
+pub const ALOOPER_POLL_ERROR: _bindgen_ty_4 = -4;
 pub type _bindgen_ty_4 = ::std::os::raw::c_int;
-pub const ALOOPER_EVENT_INPUT: ::std::os::raw::c_uint = 1;
-pub const ALOOPER_EVENT_OUTPUT: ::std::os::raw::c_uint = 2;
-pub const ALOOPER_EVENT_ERROR: ::std::os::raw::c_uint = 4;
-pub const ALOOPER_EVENT_HANGUP: ::std::os::raw::c_uint = 8;
-pub const ALOOPER_EVENT_INVALID: ::std::os::raw::c_uint = 16;
+pub const ALOOPER_EVENT_INPUT: _bindgen_ty_5 = 1;
+pub const ALOOPER_EVENT_OUTPUT: _bindgen_ty_5 = 2;
+pub const ALOOPER_EVENT_ERROR: _bindgen_ty_5 = 4;
+pub const ALOOPER_EVENT_HANGUP: _bindgen_ty_5 = 8;
+pub const ALOOPER_EVENT_INVALID: _bindgen_ty_5 = 16;
 pub type _bindgen_ty_5 = ::std::os::raw::c_uint;
-pub const AKEY_STATE_UNKNOWN: ::std::os::raw::c_int = -1;
-pub const AKEY_STATE_UP: ::std::os::raw::c_int = 0;
-pub const AKEY_STATE_DOWN: ::std::os::raw::c_int = 1;
-pub const AKEY_STATE_VIRTUAL: ::std::os::raw::c_int = 2;
+pub type va_list = __builtin_va_list;
+pub type __gnuc_va_list = __builtin_va_list;
+#[repr(C)]
+pub struct JavaVMAttachArgs {
+    pub version: jint,
+    pub name: *const ::std::os::raw::c_char,
+    pub group: jobject,
+}
+#[test]
+fn bindgen_test_layout_JavaVMAttachArgs() {
+    const UNINIT: ::std::mem::MaybeUninit<JavaVMAttachArgs> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<JavaVMAttachArgs>(),
+        12usize,
+        concat!("Size of: ", stringify!(JavaVMAttachArgs))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<JavaVMAttachArgs>(),
+        4usize,
+        concat!("Alignment of ", stringify!(JavaVMAttachArgs))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMAttachArgs),
+            "::",
+            stringify!(version)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).name) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMAttachArgs),
+            "::",
+            stringify!(name)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).group) as usize - ptr as usize },
+        8usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMAttachArgs),
+            "::",
+            stringify!(group)
+        )
+    );
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct JavaVMOption {
+    pub optionString: *const ::std::os::raw::c_char,
+    pub extraInfo: *mut ::std::os::raw::c_void,
+}
+#[test]
+fn bindgen_test_layout_JavaVMOption() {
+    const UNINIT: ::std::mem::MaybeUninit<JavaVMOption> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<JavaVMOption>(),
+        8usize,
+        concat!("Size of: ", stringify!(JavaVMOption))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<JavaVMOption>(),
+        4usize,
+        concat!("Alignment of ", stringify!(JavaVMOption))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).optionString) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMOption),
+            "::",
+            stringify!(optionString)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).extraInfo) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMOption),
+            "::",
+            stringify!(extraInfo)
+        )
+    );
+}
+#[repr(C)]
+pub struct JavaVMInitArgs {
+    pub version: jint,
+    pub nOptions: jint,
+    pub options: *mut JavaVMOption,
+    pub ignoreUnrecognized: jboolean,
+}
+#[test]
+fn bindgen_test_layout_JavaVMInitArgs() {
+    const UNINIT: ::std::mem::MaybeUninit<JavaVMInitArgs> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<JavaVMInitArgs>(),
+        16usize,
+        concat!("Size of: ", stringify!(JavaVMInitArgs))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<JavaVMInitArgs>(),
+        4usize,
+        concat!("Alignment of ", stringify!(JavaVMInitArgs))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(version)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).nOptions) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(nOptions)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).options) as usize - ptr as usize },
+        8usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(options)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).ignoreUnrecognized) as usize - ptr as usize },
+        12usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(ignoreUnrecognized)
+        )
+    );
+}
+pub const AKEY_STATE_UNKNOWN: _bindgen_ty_6 = -1;
+pub const AKEY_STATE_UP: _bindgen_ty_6 = 0;
+pub const AKEY_STATE_DOWN: _bindgen_ty_6 = 1;
+pub const AKEY_STATE_VIRTUAL: _bindgen_ty_6 = 2;
 pub type _bindgen_ty_6 = ::std::os::raw::c_int;
-pub const AMETA_NONE: ::std::os::raw::c_uint = 0;
-pub const AMETA_ALT_ON: ::std::os::raw::c_uint = 2;
-pub const AMETA_ALT_LEFT_ON: ::std::os::raw::c_uint = 16;
-pub const AMETA_ALT_RIGHT_ON: ::std::os::raw::c_uint = 32;
-pub const AMETA_SHIFT_ON: ::std::os::raw::c_uint = 1;
-pub const AMETA_SHIFT_LEFT_ON: ::std::os::raw::c_uint = 64;
-pub const AMETA_SHIFT_RIGHT_ON: ::std::os::raw::c_uint = 128;
-pub const AMETA_SYM_ON: ::std::os::raw::c_uint = 4;
-pub const AMETA_FUNCTION_ON: ::std::os::raw::c_uint = 8;
-pub const AMETA_CTRL_ON: ::std::os::raw::c_uint = 4096;
-pub const AMETA_CTRL_LEFT_ON: ::std::os::raw::c_uint = 8192;
-pub const AMETA_CTRL_RIGHT_ON: ::std::os::raw::c_uint = 16384;
-pub const AMETA_META_ON: ::std::os::raw::c_uint = 65536;
-pub const AMETA_META_LEFT_ON: ::std::os::raw::c_uint = 131072;
-pub const AMETA_META_RIGHT_ON: ::std::os::raw::c_uint = 262144;
-pub const AMETA_CAPS_LOCK_ON: ::std::os::raw::c_uint = 1048576;
-pub const AMETA_NUM_LOCK_ON: ::std::os::raw::c_uint = 2097152;
-pub const AMETA_SCROLL_LOCK_ON: ::std::os::raw::c_uint = 4194304;
+pub const AMETA_NONE: _bindgen_ty_7 = 0;
+pub const AMETA_ALT_ON: _bindgen_ty_7 = 2;
+pub const AMETA_ALT_LEFT_ON: _bindgen_ty_7 = 16;
+pub const AMETA_ALT_RIGHT_ON: _bindgen_ty_7 = 32;
+pub const AMETA_SHIFT_ON: _bindgen_ty_7 = 1;
+pub const AMETA_SHIFT_LEFT_ON: _bindgen_ty_7 = 64;
+pub const AMETA_SHIFT_RIGHT_ON: _bindgen_ty_7 = 128;
+pub const AMETA_SYM_ON: _bindgen_ty_7 = 4;
+pub const AMETA_FUNCTION_ON: _bindgen_ty_7 = 8;
+pub const AMETA_CTRL_ON: _bindgen_ty_7 = 4096;
+pub const AMETA_CTRL_LEFT_ON: _bindgen_ty_7 = 8192;
+pub const AMETA_CTRL_RIGHT_ON: _bindgen_ty_7 = 16384;
+pub const AMETA_META_ON: _bindgen_ty_7 = 65536;
+pub const AMETA_META_LEFT_ON: _bindgen_ty_7 = 131072;
+pub const AMETA_META_RIGHT_ON: _bindgen_ty_7 = 262144;
+pub const AMETA_CAPS_LOCK_ON: _bindgen_ty_7 = 1048576;
+pub const AMETA_NUM_LOCK_ON: _bindgen_ty_7 = 2097152;
+pub const AMETA_SCROLL_LOCK_ON: _bindgen_ty_7 = 4194304;
 pub type _bindgen_ty_7 = ::std::os::raw::c_uint;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct AInputEvent {
     _unused: [u8; 0],
 }
-pub const AINPUT_EVENT_TYPE_KEY: ::std::os::raw::c_uint = 1;
-pub const AINPUT_EVENT_TYPE_MOTION: ::std::os::raw::c_uint = 2;
+pub const AINPUT_EVENT_TYPE_KEY: _bindgen_ty_8 = 1;
+pub const AINPUT_EVENT_TYPE_MOTION: _bindgen_ty_8 = 2;
+pub const AINPUT_EVENT_TYPE_FOCUS: _bindgen_ty_8 = 3;
+pub const AINPUT_EVENT_TYPE_CAPTURE: _bindgen_ty_8 = 4;
+pub const AINPUT_EVENT_TYPE_DRAG: _bindgen_ty_8 = 5;
+pub const AINPUT_EVENT_TYPE_TOUCH_MODE: _bindgen_ty_8 = 6;
 pub type _bindgen_ty_8 = ::std::os::raw::c_uint;
-pub const AKEY_EVENT_ACTION_DOWN: ::std::os::raw::c_uint = 0;
-pub const AKEY_EVENT_ACTION_UP: ::std::os::raw::c_uint = 1;
-pub const AKEY_EVENT_ACTION_MULTIPLE: ::std::os::raw::c_uint = 2;
+pub const AKEY_EVENT_ACTION_DOWN: _bindgen_ty_9 = 0;
+pub const AKEY_EVENT_ACTION_UP: _bindgen_ty_9 = 1;
+pub const AKEY_EVENT_ACTION_MULTIPLE: _bindgen_ty_9 = 2;
 pub type _bindgen_ty_9 = ::std::os::raw::c_uint;
-pub const AKEY_EVENT_FLAG_WOKE_HERE: ::std::os::raw::c_uint = 1;
-pub const AKEY_EVENT_FLAG_SOFT_KEYBOARD: ::std::os::raw::c_uint = 2;
-pub const AKEY_EVENT_FLAG_KEEP_TOUCH_MODE: ::std::os::raw::c_uint = 4;
-pub const AKEY_EVENT_FLAG_FROM_SYSTEM: ::std::os::raw::c_uint = 8;
-pub const AKEY_EVENT_FLAG_EDITOR_ACTION: ::std::os::raw::c_uint = 16;
-pub const AKEY_EVENT_FLAG_CANCELED: ::std::os::raw::c_uint = 32;
-pub const AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY: ::std::os::raw::c_uint = 64;
-pub const AKEY_EVENT_FLAG_LONG_PRESS: ::std::os::raw::c_uint = 128;
-pub const AKEY_EVENT_FLAG_CANCELED_LONG_PRESS: ::std::os::raw::c_uint = 256;
-pub const AKEY_EVENT_FLAG_TRACKING: ::std::os::raw::c_uint = 512;
-pub const AKEY_EVENT_FLAG_FALLBACK: ::std::os::raw::c_uint = 1024;
+pub const AKEY_EVENT_FLAG_WOKE_HERE: _bindgen_ty_10 = 1;
+pub const AKEY_EVENT_FLAG_SOFT_KEYBOARD: _bindgen_ty_10 = 2;
+pub const AKEY_EVENT_FLAG_KEEP_TOUCH_MODE: _bindgen_ty_10 = 4;
+pub const AKEY_EVENT_FLAG_FROM_SYSTEM: _bindgen_ty_10 = 8;
+pub const AKEY_EVENT_FLAG_EDITOR_ACTION: _bindgen_ty_10 = 16;
+pub const AKEY_EVENT_FLAG_CANCELED: _bindgen_ty_10 = 32;
+pub const AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY: _bindgen_ty_10 = 64;
+pub const AKEY_EVENT_FLAG_LONG_PRESS: _bindgen_ty_10 = 128;
+pub const AKEY_EVENT_FLAG_CANCELED_LONG_PRESS: _bindgen_ty_10 = 256;
+pub const AKEY_EVENT_FLAG_TRACKING: _bindgen_ty_10 = 512;
+pub const AKEY_EVENT_FLAG_FALLBACK: _bindgen_ty_10 = 1024;
 pub type _bindgen_ty_10 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_ACTION_MASK: ::std::os::raw::c_uint = 255;
-pub const AMOTION_EVENT_ACTION_POINTER_INDEX_MASK: ::std::os::raw::c_uint = 65280;
-pub const AMOTION_EVENT_ACTION_DOWN: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_ACTION_UP: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_ACTION_MOVE: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_ACTION_CANCEL: ::std::os::raw::c_uint = 3;
-pub const AMOTION_EVENT_ACTION_OUTSIDE: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_ACTION_POINTER_DOWN: ::std::os::raw::c_uint = 5;
-pub const AMOTION_EVENT_ACTION_POINTER_UP: ::std::os::raw::c_uint = 6;
-pub const AMOTION_EVENT_ACTION_HOVER_MOVE: ::std::os::raw::c_uint = 7;
-pub const AMOTION_EVENT_ACTION_SCROLL: ::std::os::raw::c_uint = 8;
-pub const AMOTION_EVENT_ACTION_HOVER_ENTER: ::std::os::raw::c_uint = 9;
-pub const AMOTION_EVENT_ACTION_HOVER_EXIT: ::std::os::raw::c_uint = 10;
-pub const AMOTION_EVENT_ACTION_BUTTON_PRESS: ::std::os::raw::c_uint = 11;
-pub const AMOTION_EVENT_ACTION_BUTTON_RELEASE: ::std::os::raw::c_uint = 12;
+pub const AMOTION_EVENT_ACTION_MASK: _bindgen_ty_11 = 255;
+pub const AMOTION_EVENT_ACTION_POINTER_INDEX_MASK: _bindgen_ty_11 = 65280;
+pub const AMOTION_EVENT_ACTION_DOWN: _bindgen_ty_11 = 0;
+pub const AMOTION_EVENT_ACTION_UP: _bindgen_ty_11 = 1;
+pub const AMOTION_EVENT_ACTION_MOVE: _bindgen_ty_11 = 2;
+pub const AMOTION_EVENT_ACTION_CANCEL: _bindgen_ty_11 = 3;
+pub const AMOTION_EVENT_ACTION_OUTSIDE: _bindgen_ty_11 = 4;
+pub const AMOTION_EVENT_ACTION_POINTER_DOWN: _bindgen_ty_11 = 5;
+pub const AMOTION_EVENT_ACTION_POINTER_UP: _bindgen_ty_11 = 6;
+pub const AMOTION_EVENT_ACTION_HOVER_MOVE: _bindgen_ty_11 = 7;
+pub const AMOTION_EVENT_ACTION_SCROLL: _bindgen_ty_11 = 8;
+pub const AMOTION_EVENT_ACTION_HOVER_ENTER: _bindgen_ty_11 = 9;
+pub const AMOTION_EVENT_ACTION_HOVER_EXIT: _bindgen_ty_11 = 10;
+pub const AMOTION_EVENT_ACTION_BUTTON_PRESS: _bindgen_ty_11 = 11;
+pub const AMOTION_EVENT_ACTION_BUTTON_RELEASE: _bindgen_ty_11 = 12;
 pub type _bindgen_ty_11 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED: ::std::os::raw::c_uint = 1;
+pub const AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED: _bindgen_ty_12 = 1;
 pub type _bindgen_ty_12 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_EDGE_FLAG_NONE: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_EDGE_FLAG_TOP: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_EDGE_FLAG_BOTTOM: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_EDGE_FLAG_LEFT: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_EDGE_FLAG_RIGHT: ::std::os::raw::c_uint = 8;
+pub const AMOTION_EVENT_EDGE_FLAG_NONE: _bindgen_ty_13 = 0;
+pub const AMOTION_EVENT_EDGE_FLAG_TOP: _bindgen_ty_13 = 1;
+pub const AMOTION_EVENT_EDGE_FLAG_BOTTOM: _bindgen_ty_13 = 2;
+pub const AMOTION_EVENT_EDGE_FLAG_LEFT: _bindgen_ty_13 = 4;
+pub const AMOTION_EVENT_EDGE_FLAG_RIGHT: _bindgen_ty_13 = 8;
 pub type _bindgen_ty_13 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_AXIS_X: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_AXIS_Y: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_AXIS_PRESSURE: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_AXIS_SIZE: ::std::os::raw::c_uint = 3;
-pub const AMOTION_EVENT_AXIS_TOUCH_MAJOR: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_AXIS_TOUCH_MINOR: ::std::os::raw::c_uint = 5;
-pub const AMOTION_EVENT_AXIS_TOOL_MAJOR: ::std::os::raw::c_uint = 6;
-pub const AMOTION_EVENT_AXIS_TOOL_MINOR: ::std::os::raw::c_uint = 7;
-pub const AMOTION_EVENT_AXIS_ORIENTATION: ::std::os::raw::c_uint = 8;
-pub const AMOTION_EVENT_AXIS_VSCROLL: ::std::os::raw::c_uint = 9;
-pub const AMOTION_EVENT_AXIS_HSCROLL: ::std::os::raw::c_uint = 10;
-pub const AMOTION_EVENT_AXIS_Z: ::std::os::raw::c_uint = 11;
-pub const AMOTION_EVENT_AXIS_RX: ::std::os::raw::c_uint = 12;
-pub const AMOTION_EVENT_AXIS_RY: ::std::os::raw::c_uint = 13;
-pub const AMOTION_EVENT_AXIS_RZ: ::std::os::raw::c_uint = 14;
-pub const AMOTION_EVENT_AXIS_HAT_X: ::std::os::raw::c_uint = 15;
-pub const AMOTION_EVENT_AXIS_HAT_Y: ::std::os::raw::c_uint = 16;
-pub const AMOTION_EVENT_AXIS_LTRIGGER: ::std::os::raw::c_uint = 17;
-pub const AMOTION_EVENT_AXIS_RTRIGGER: ::std::os::raw::c_uint = 18;
-pub const AMOTION_EVENT_AXIS_THROTTLE: ::std::os::raw::c_uint = 19;
-pub const AMOTION_EVENT_AXIS_RUDDER: ::std::os::raw::c_uint = 20;
-pub const AMOTION_EVENT_AXIS_WHEEL: ::std::os::raw::c_uint = 21;
-pub const AMOTION_EVENT_AXIS_GAS: ::std::os::raw::c_uint = 22;
-pub const AMOTION_EVENT_AXIS_BRAKE: ::std::os::raw::c_uint = 23;
-pub const AMOTION_EVENT_AXIS_DISTANCE: ::std::os::raw::c_uint = 24;
-pub const AMOTION_EVENT_AXIS_TILT: ::std::os::raw::c_uint = 25;
-pub const AMOTION_EVENT_AXIS_SCROLL: ::std::os::raw::c_uint = 26;
-pub const AMOTION_EVENT_AXIS_RELATIVE_X: ::std::os::raw::c_uint = 27;
-pub const AMOTION_EVENT_AXIS_RELATIVE_Y: ::std::os::raw::c_uint = 28;
-pub const AMOTION_EVENT_AXIS_GENERIC_1: ::std::os::raw::c_uint = 32;
-pub const AMOTION_EVENT_AXIS_GENERIC_2: ::std::os::raw::c_uint = 33;
-pub const AMOTION_EVENT_AXIS_GENERIC_3: ::std::os::raw::c_uint = 34;
-pub const AMOTION_EVENT_AXIS_GENERIC_4: ::std::os::raw::c_uint = 35;
-pub const AMOTION_EVENT_AXIS_GENERIC_5: ::std::os::raw::c_uint = 36;
-pub const AMOTION_EVENT_AXIS_GENERIC_6: ::std::os::raw::c_uint = 37;
-pub const AMOTION_EVENT_AXIS_GENERIC_7: ::std::os::raw::c_uint = 38;
-pub const AMOTION_EVENT_AXIS_GENERIC_8: ::std::os::raw::c_uint = 39;
-pub const AMOTION_EVENT_AXIS_GENERIC_9: ::std::os::raw::c_uint = 40;
-pub const AMOTION_EVENT_AXIS_GENERIC_10: ::std::os::raw::c_uint = 41;
-pub const AMOTION_EVENT_AXIS_GENERIC_11: ::std::os::raw::c_uint = 42;
-pub const AMOTION_EVENT_AXIS_GENERIC_12: ::std::os::raw::c_uint = 43;
-pub const AMOTION_EVENT_AXIS_GENERIC_13: ::std::os::raw::c_uint = 44;
-pub const AMOTION_EVENT_AXIS_GENERIC_14: ::std::os::raw::c_uint = 45;
-pub const AMOTION_EVENT_AXIS_GENERIC_15: ::std::os::raw::c_uint = 46;
-pub const AMOTION_EVENT_AXIS_GENERIC_16: ::std::os::raw::c_uint = 47;
+pub const AMOTION_EVENT_AXIS_X: _bindgen_ty_14 = 0;
+pub const AMOTION_EVENT_AXIS_Y: _bindgen_ty_14 = 1;
+pub const AMOTION_EVENT_AXIS_PRESSURE: _bindgen_ty_14 = 2;
+pub const AMOTION_EVENT_AXIS_SIZE: _bindgen_ty_14 = 3;
+pub const AMOTION_EVENT_AXIS_TOUCH_MAJOR: _bindgen_ty_14 = 4;
+pub const AMOTION_EVENT_AXIS_TOUCH_MINOR: _bindgen_ty_14 = 5;
+pub const AMOTION_EVENT_AXIS_TOOL_MAJOR: _bindgen_ty_14 = 6;
+pub const AMOTION_EVENT_AXIS_TOOL_MINOR: _bindgen_ty_14 = 7;
+pub const AMOTION_EVENT_AXIS_ORIENTATION: _bindgen_ty_14 = 8;
+pub const AMOTION_EVENT_AXIS_VSCROLL: _bindgen_ty_14 = 9;
+pub const AMOTION_EVENT_AXIS_HSCROLL: _bindgen_ty_14 = 10;
+pub const AMOTION_EVENT_AXIS_Z: _bindgen_ty_14 = 11;
+pub const AMOTION_EVENT_AXIS_RX: _bindgen_ty_14 = 12;
+pub const AMOTION_EVENT_AXIS_RY: _bindgen_ty_14 = 13;
+pub const AMOTION_EVENT_AXIS_RZ: _bindgen_ty_14 = 14;
+pub const AMOTION_EVENT_AXIS_HAT_X: _bindgen_ty_14 = 15;
+pub const AMOTION_EVENT_AXIS_HAT_Y: _bindgen_ty_14 = 16;
+pub const AMOTION_EVENT_AXIS_LTRIGGER: _bindgen_ty_14 = 17;
+pub const AMOTION_EVENT_AXIS_RTRIGGER: _bindgen_ty_14 = 18;
+pub const AMOTION_EVENT_AXIS_THROTTLE: _bindgen_ty_14 = 19;
+pub const AMOTION_EVENT_AXIS_RUDDER: _bindgen_ty_14 = 20;
+pub const AMOTION_EVENT_AXIS_WHEEL: _bindgen_ty_14 = 21;
+pub const AMOTION_EVENT_AXIS_GAS: _bindgen_ty_14 = 22;
+pub const AMOTION_EVENT_AXIS_BRAKE: _bindgen_ty_14 = 23;
+pub const AMOTION_EVENT_AXIS_DISTANCE: _bindgen_ty_14 = 24;
+pub const AMOTION_EVENT_AXIS_TILT: _bindgen_ty_14 = 25;
+pub const AMOTION_EVENT_AXIS_SCROLL: _bindgen_ty_14 = 26;
+pub const AMOTION_EVENT_AXIS_RELATIVE_X: _bindgen_ty_14 = 27;
+pub const AMOTION_EVENT_AXIS_RELATIVE_Y: _bindgen_ty_14 = 28;
+pub const AMOTION_EVENT_AXIS_GENERIC_1: _bindgen_ty_14 = 32;
+pub const AMOTION_EVENT_AXIS_GENERIC_2: _bindgen_ty_14 = 33;
+pub const AMOTION_EVENT_AXIS_GENERIC_3: _bindgen_ty_14 = 34;
+pub const AMOTION_EVENT_AXIS_GENERIC_4: _bindgen_ty_14 = 35;
+pub const AMOTION_EVENT_AXIS_GENERIC_5: _bindgen_ty_14 = 36;
+pub const AMOTION_EVENT_AXIS_GENERIC_6: _bindgen_ty_14 = 37;
+pub const AMOTION_EVENT_AXIS_GENERIC_7: _bindgen_ty_14 = 38;
+pub const AMOTION_EVENT_AXIS_GENERIC_8: _bindgen_ty_14 = 39;
+pub const AMOTION_EVENT_AXIS_GENERIC_9: _bindgen_ty_14 = 40;
+pub const AMOTION_EVENT_AXIS_GENERIC_10: _bindgen_ty_14 = 41;
+pub const AMOTION_EVENT_AXIS_GENERIC_11: _bindgen_ty_14 = 42;
+pub const AMOTION_EVENT_AXIS_GENERIC_12: _bindgen_ty_14 = 43;
+pub const AMOTION_EVENT_AXIS_GENERIC_13: _bindgen_ty_14 = 44;
+pub const AMOTION_EVENT_AXIS_GENERIC_14: _bindgen_ty_14 = 45;
+pub const AMOTION_EVENT_AXIS_GENERIC_15: _bindgen_ty_14 = 46;
+pub const AMOTION_EVENT_AXIS_GENERIC_16: _bindgen_ty_14 = 47;
 pub type _bindgen_ty_14 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_BUTTON_PRIMARY: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_BUTTON_SECONDARY: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_BUTTON_TERTIARY: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_BUTTON_BACK: ::std::os::raw::c_uint = 8;
-pub const AMOTION_EVENT_BUTTON_FORWARD: ::std::os::raw::c_uint = 16;
-pub const AMOTION_EVENT_BUTTON_STYLUS_PRIMARY: ::std::os::raw::c_uint = 32;
-pub const AMOTION_EVENT_BUTTON_STYLUS_SECONDARY: ::std::os::raw::c_uint = 64;
+pub const AMOTION_EVENT_BUTTON_PRIMARY: _bindgen_ty_15 = 1;
+pub const AMOTION_EVENT_BUTTON_SECONDARY: _bindgen_ty_15 = 2;
+pub const AMOTION_EVENT_BUTTON_TERTIARY: _bindgen_ty_15 = 4;
+pub const AMOTION_EVENT_BUTTON_BACK: _bindgen_ty_15 = 8;
+pub const AMOTION_EVENT_BUTTON_FORWARD: _bindgen_ty_15 = 16;
+pub const AMOTION_EVENT_BUTTON_STYLUS_PRIMARY: _bindgen_ty_15 = 32;
+pub const AMOTION_EVENT_BUTTON_STYLUS_SECONDARY: _bindgen_ty_15 = 64;
 pub type _bindgen_ty_15 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_TOOL_TYPE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_TOOL_TYPE_FINGER: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_TOOL_TYPE_STYLUS: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_TOOL_TYPE_MOUSE: ::std::os::raw::c_uint = 3;
-pub const AMOTION_EVENT_TOOL_TYPE_ERASER: ::std::os::raw::c_uint = 4;
+pub const AMOTION_EVENT_TOOL_TYPE_UNKNOWN: _bindgen_ty_16 = 0;
+pub const AMOTION_EVENT_TOOL_TYPE_FINGER: _bindgen_ty_16 = 1;
+pub const AMOTION_EVENT_TOOL_TYPE_STYLUS: _bindgen_ty_16 = 2;
+pub const AMOTION_EVENT_TOOL_TYPE_MOUSE: _bindgen_ty_16 = 3;
+pub const AMOTION_EVENT_TOOL_TYPE_ERASER: _bindgen_ty_16 = 4;
+pub const AMOTION_EVENT_TOOL_TYPE_PALM: _bindgen_ty_16 = 5;
 pub type _bindgen_ty_16 = ::std::os::raw::c_uint;
-pub const AINPUT_SOURCE_CLASS_MASK: ::std::os::raw::c_uint = 255;
-pub const AINPUT_SOURCE_CLASS_NONE: ::std::os::raw::c_uint = 0;
-pub const AINPUT_SOURCE_CLASS_BUTTON: ::std::os::raw::c_uint = 1;
-pub const AINPUT_SOURCE_CLASS_POINTER: ::std::os::raw::c_uint = 2;
-pub const AINPUT_SOURCE_CLASS_NAVIGATION: ::std::os::raw::c_uint = 4;
-pub const AINPUT_SOURCE_CLASS_POSITION: ::std::os::raw::c_uint = 8;
-pub const AINPUT_SOURCE_CLASS_JOYSTICK: ::std::os::raw::c_uint = 16;
+pub const AMotionClassification_AMOTION_EVENT_CLASSIFICATION_NONE: AMotionClassification = 0;
+pub const AMotionClassification_AMOTION_EVENT_CLASSIFICATION_AMBIGUOUS_GESTURE:
+    AMotionClassification = 1;
+pub const AMotionClassification_AMOTION_EVENT_CLASSIFICATION_DEEP_PRESS: AMotionClassification = 2;
+pub type AMotionClassification = u32;
+pub const AINPUT_SOURCE_CLASS_MASK: _bindgen_ty_17 = 255;
+pub const AINPUT_SOURCE_CLASS_NONE: _bindgen_ty_17 = 0;
+pub const AINPUT_SOURCE_CLASS_BUTTON: _bindgen_ty_17 = 1;
+pub const AINPUT_SOURCE_CLASS_POINTER: _bindgen_ty_17 = 2;
+pub const AINPUT_SOURCE_CLASS_NAVIGATION: _bindgen_ty_17 = 4;
+pub const AINPUT_SOURCE_CLASS_POSITION: _bindgen_ty_17 = 8;
+pub const AINPUT_SOURCE_CLASS_JOYSTICK: _bindgen_ty_17 = 16;
 pub type _bindgen_ty_17 = ::std::os::raw::c_uint;
-pub const AINPUT_SOURCE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AINPUT_SOURCE_KEYBOARD: ::std::os::raw::c_uint = 257;
-pub const AINPUT_SOURCE_DPAD: ::std::os::raw::c_uint = 513;
-pub const AINPUT_SOURCE_GAMEPAD: ::std::os::raw::c_uint = 1025;
-pub const AINPUT_SOURCE_TOUCHSCREEN: ::std::os::raw::c_uint = 4098;
-pub const AINPUT_SOURCE_MOUSE: ::std::os::raw::c_uint = 8194;
-pub const AINPUT_SOURCE_STYLUS: ::std::os::raw::c_uint = 16386;
-pub const AINPUT_SOURCE_BLUETOOTH_STYLUS: ::std::os::raw::c_uint = 49154;
-pub const AINPUT_SOURCE_TRACKBALL: ::std::os::raw::c_uint = 65540;
-pub const AINPUT_SOURCE_MOUSE_RELATIVE: ::std::os::raw::c_uint = 131076;
-pub const AINPUT_SOURCE_TOUCHPAD: ::std::os::raw::c_uint = 1048584;
-pub const AINPUT_SOURCE_TOUCH_NAVIGATION: ::std::os::raw::c_uint = 2097152;
-pub const AINPUT_SOURCE_JOYSTICK: ::std::os::raw::c_uint = 16777232;
-pub const AINPUT_SOURCE_ROTARY_ENCODER: ::std::os::raw::c_uint = 4194304;
-pub const AINPUT_SOURCE_ANY: ::std::os::raw::c_uint = 4294967040;
+pub const AINPUT_SOURCE_UNKNOWN: _bindgen_ty_18 = 0;
+pub const AINPUT_SOURCE_KEYBOARD: _bindgen_ty_18 = 257;
+pub const AINPUT_SOURCE_DPAD: _bindgen_ty_18 = 513;
+pub const AINPUT_SOURCE_GAMEPAD: _bindgen_ty_18 = 1025;
+pub const AINPUT_SOURCE_TOUCHSCREEN: _bindgen_ty_18 = 4098;
+pub const AINPUT_SOURCE_MOUSE: _bindgen_ty_18 = 8194;
+pub const AINPUT_SOURCE_STYLUS: _bindgen_ty_18 = 16386;
+pub const AINPUT_SOURCE_BLUETOOTH_STYLUS: _bindgen_ty_18 = 49154;
+pub const AINPUT_SOURCE_TRACKBALL: _bindgen_ty_18 = 65540;
+pub const AINPUT_SOURCE_MOUSE_RELATIVE: _bindgen_ty_18 = 131076;
+pub const AINPUT_SOURCE_TOUCHPAD: _bindgen_ty_18 = 1048584;
+pub const AINPUT_SOURCE_TOUCH_NAVIGATION: _bindgen_ty_18 = 2097152;
+pub const AINPUT_SOURCE_JOYSTICK: _bindgen_ty_18 = 16777232;
+pub const AINPUT_SOURCE_HDMI: _bindgen_ty_18 = 33554433;
+pub const AINPUT_SOURCE_SENSOR: _bindgen_ty_18 = 67108864;
+pub const AINPUT_SOURCE_ROTARY_ENCODER: _bindgen_ty_18 = 4194304;
+pub const AINPUT_SOURCE_ANY: _bindgen_ty_18 = 4294967040;
 pub type _bindgen_ty_18 = ::std::os::raw::c_uint;
-pub const AINPUT_KEYBOARD_TYPE_NONE: ::std::os::raw::c_uint = 0;
-pub const AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC: ::std::os::raw::c_uint = 1;
-pub const AINPUT_KEYBOARD_TYPE_ALPHABETIC: ::std::os::raw::c_uint = 2;
+pub const AINPUT_KEYBOARD_TYPE_NONE: _bindgen_ty_19 = 0;
+pub const AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC: _bindgen_ty_19 = 1;
+pub const AINPUT_KEYBOARD_TYPE_ALPHABETIC: _bindgen_ty_19 = 2;
 pub type _bindgen_ty_19 = ::std::os::raw::c_uint;
-pub const AINPUT_MOTION_RANGE_X: ::std::os::raw::c_uint = 0;
-pub const AINPUT_MOTION_RANGE_Y: ::std::os::raw::c_uint = 1;
-pub const AINPUT_MOTION_RANGE_PRESSURE: ::std::os::raw::c_uint = 2;
-pub const AINPUT_MOTION_RANGE_SIZE: ::std::os::raw::c_uint = 3;
-pub const AINPUT_MOTION_RANGE_TOUCH_MAJOR: ::std::os::raw::c_uint = 4;
-pub const AINPUT_MOTION_RANGE_TOUCH_MINOR: ::std::os::raw::c_uint = 5;
-pub const AINPUT_MOTION_RANGE_TOOL_MAJOR: ::std::os::raw::c_uint = 6;
-pub const AINPUT_MOTION_RANGE_TOOL_MINOR: ::std::os::raw::c_uint = 7;
-pub const AINPUT_MOTION_RANGE_ORIENTATION: ::std::os::raw::c_uint = 8;
+pub const AINPUT_MOTION_RANGE_X: _bindgen_ty_20 = 0;
+pub const AINPUT_MOTION_RANGE_Y: _bindgen_ty_20 = 1;
+pub const AINPUT_MOTION_RANGE_PRESSURE: _bindgen_ty_20 = 2;
+pub const AINPUT_MOTION_RANGE_SIZE: _bindgen_ty_20 = 3;
+pub const AINPUT_MOTION_RANGE_TOUCH_MAJOR: _bindgen_ty_20 = 4;
+pub const AINPUT_MOTION_RANGE_TOUCH_MINOR: _bindgen_ty_20 = 5;
+pub const AINPUT_MOTION_RANGE_TOOL_MAJOR: _bindgen_ty_20 = 6;
+pub const AINPUT_MOTION_RANGE_TOOL_MINOR: _bindgen_ty_20 = 7;
+pub const AINPUT_MOTION_RANGE_ORIENTATION: _bindgen_ty_20 = 8;
 pub type _bindgen_ty_20 = ::std::os::raw::c_uint;
 extern "C" {
     pub fn AInputEvent_getType(event: *const AInputEvent) -> i32;
@@ -1328,6 +1516,9 @@ extern "C" {
 extern "C" {
     pub fn AInputEvent_getSource(event: *const AInputEvent) -> i32;
 }
+extern "C" {
+    pub fn AInputEvent_release(event: *const AInputEvent);
+}
 extern "C" {
     pub fn AKeyEvent_getAction(key_event: *const AInputEvent) -> i32;
 }
@@ -1352,6 +1543,9 @@ extern "C" {
 extern "C" {
     pub fn AKeyEvent_getEventTime(key_event: *const AInputEvent) -> i64;
 }
+extern "C" {
+    pub fn AKeyEvent_fromJava(env: *mut JNIEnv, keyEvent: jobject) -> *const AInputEvent;
+}
 extern "C" {
     pub fn AMotionEvent_getAction(motion_event: *const AInputEvent) -> i32;
 }
@@ -1386,168 +1580,169 @@ extern "C" {
     pub fn AMotionEvent_getYPrecision(motion_event: *const AInputEvent) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getPointerCount(motion_event: *const AInputEvent) -> size_t;
+    pub fn AMotionEvent_getPointerCount(motion_event: *const AInputEvent) -> usize;
 }
 extern "C" {
-    pub fn AMotionEvent_getPointerId(
-        motion_event: *const AInputEvent,
-        pointer_index: size_t,
-    ) -> i32;
+    pub fn AMotionEvent_getPointerId(motion_event: *const AInputEvent, pointer_index: usize)
+        -> i32;
 }
 extern "C" {
-    pub fn AMotionEvent_getToolType(motion_event: *const AInputEvent, pointer_index: size_t)
-        -> i32;
+    pub fn AMotionEvent_getToolType(motion_event: *const AInputEvent, pointer_index: usize) -> i32;
 }
 extern "C" {
-    pub fn AMotionEvent_getRawX(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getRawX(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getRawY(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getRawY(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getX(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getX(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getY(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getY(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getPressure(motion_event: *const AInputEvent, pointer_index: size_t)
-        -> f32;
+    pub fn AMotionEvent_getPressure(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getSize(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getSize(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getTouchMajor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getTouchMinor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getToolMajor(
-        motion_event: *const AInputEvent,
-        pointer_index: size_t,
-    ) -> f32;
+    pub fn AMotionEvent_getToolMajor(motion_event: *const AInputEvent, pointer_index: usize)
+        -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getToolMinor(
-        motion_event: *const AInputEvent,
-        pointer_index: size_t,
-    ) -> f32;
+    pub fn AMotionEvent_getToolMinor(motion_event: *const AInputEvent, pointer_index: usize)
+        -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getOrientation(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getAxisValue(
         motion_event: *const AInputEvent,
         axis: i32,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getHistorySize(motion_event: *const AInputEvent) -> size_t;
+    pub fn AMotionEvent_getHistorySize(motion_event: *const AInputEvent) -> usize;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalEventTime(
         motion_event: *const AInputEvent,
-        history_index: size_t,
+        history_index: usize,
     ) -> i64;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalRawX(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalRawY(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalX(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalY(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalPressure(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalSize(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalTouchMajor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalTouchMinor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalToolMajor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalToolMinor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalOrientation(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalAxisValue(
         motion_event: *const AInputEvent,
         axis: i32,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
+extern "C" {
+    pub fn AMotionEvent_getActionButton(motion_event: *const AInputEvent) -> i32;
+}
+extern "C" {
+    pub fn AMotionEvent_getClassification(motion_event: *const AInputEvent) -> i32;
+}
+extern "C" {
+    pub fn AMotionEvent_fromJava(env: *mut JNIEnv, motionEvent: jobject) -> *const AInputEvent;
+}
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct AInputQueue {
@@ -1581,6 +1776,9 @@ extern "C" {
         handled: ::std::os::raw::c_int,
     );
 }
+extern "C" {
+    pub fn AInputQueue_fromJava(env: *mut JNIEnv, inputQueue: jobject) -> *mut AInputQueue;
+}
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct imaxdiv_t {
@@ -1589,6 +1787,8 @@ pub struct imaxdiv_t {
 }
 #[test]
 fn bindgen_test_layout_imaxdiv_t() {
+    const UNINIT: ::std::mem::MaybeUninit<imaxdiv_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<imaxdiv_t>(),
         16usize,
@@ -1600,7 +1800,7 @@ fn bindgen_test_layout_imaxdiv_t() {
         concat!("Alignment of ", stringify!(imaxdiv_t))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<imaxdiv_t>())).quot as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).quot) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1610,7 +1810,7 @@ fn bindgen_test_layout_imaxdiv_t() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<imaxdiv_t>())).rem as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rem) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -1655,11 +1855,52 @@ extern "C" {
     ) -> uintmax_t;
 }
 pub const ADataSpace_ADATASPACE_UNKNOWN: ADataSpace = 0;
+pub const ADataSpace_STANDARD_MASK: ADataSpace = 4128768;
+pub const ADataSpace_STANDARD_UNSPECIFIED: ADataSpace = 0;
+pub const ADataSpace_STANDARD_BT709: ADataSpace = 65536;
+pub const ADataSpace_STANDARD_BT601_625: ADataSpace = 131072;
+pub const ADataSpace_STANDARD_BT601_625_UNADJUSTED: ADataSpace = 196608;
+pub const ADataSpace_STANDARD_BT601_525: ADataSpace = 262144;
+pub const ADataSpace_STANDARD_BT601_525_UNADJUSTED: ADataSpace = 327680;
+pub const ADataSpace_STANDARD_BT2020: ADataSpace = 393216;
+pub const ADataSpace_STANDARD_BT2020_CONSTANT_LUMINANCE: ADataSpace = 458752;
+pub const ADataSpace_STANDARD_BT470M: ADataSpace = 524288;
+pub const ADataSpace_STANDARD_FILM: ADataSpace = 589824;
+pub const ADataSpace_STANDARD_DCI_P3: ADataSpace = 655360;
+pub const ADataSpace_STANDARD_ADOBE_RGB: ADataSpace = 720896;
+pub const ADataSpace_TRANSFER_MASK: ADataSpace = 130023424;
+pub const ADataSpace_TRANSFER_UNSPECIFIED: ADataSpace = 0;
+pub const ADataSpace_TRANSFER_LINEAR: ADataSpace = 4194304;
+pub const ADataSpace_TRANSFER_SRGB: ADataSpace = 8388608;
+pub const ADataSpace_TRANSFER_SMPTE_170M: ADataSpace = 12582912;
+pub const ADataSpace_TRANSFER_GAMMA2_2: ADataSpace = 16777216;
+pub const ADataSpace_TRANSFER_GAMMA2_6: ADataSpace = 20971520;
+pub const ADataSpace_TRANSFER_GAMMA2_8: ADataSpace = 25165824;
+pub const ADataSpace_TRANSFER_ST2084: ADataSpace = 29360128;
+pub const ADataSpace_TRANSFER_HLG: ADataSpace = 33554432;
+pub const ADataSpace_RANGE_MASK: ADataSpace = 939524096;
+pub const ADataSpace_RANGE_UNSPECIFIED: ADataSpace = 0;
+pub const ADataSpace_RANGE_FULL: ADataSpace = 134217728;
+pub const ADataSpace_RANGE_LIMITED: ADataSpace = 268435456;
+pub const ADataSpace_RANGE_EXTENDED: ADataSpace = 402653184;
 pub const ADataSpace_ADATASPACE_SCRGB_LINEAR: ADataSpace = 406913024;
 pub const ADataSpace_ADATASPACE_SRGB: ADataSpace = 142671872;
 pub const ADataSpace_ADATASPACE_SCRGB: ADataSpace = 411107328;
 pub const ADataSpace_ADATASPACE_DISPLAY_P3: ADataSpace = 143261696;
 pub const ADataSpace_ADATASPACE_BT2020_PQ: ADataSpace = 163971072;
+pub const ADataSpace_ADATASPACE_BT2020_ITU_PQ: ADataSpace = 298188800;
+pub const ADataSpace_ADATASPACE_ADOBE_RGB: ADataSpace = 151715840;
+pub const ADataSpace_ADATASPACE_JFIF: ADataSpace = 146931712;
+pub const ADataSpace_ADATASPACE_BT601_625: ADataSpace = 281149440;
+pub const ADataSpace_ADATASPACE_BT601_525: ADataSpace = 281280512;
+pub const ADataSpace_ADATASPACE_BT2020: ADataSpace = 147193856;
+pub const ADataSpace_ADATASPACE_BT709: ADataSpace = 281083904;
+pub const ADataSpace_ADATASPACE_DCI_P3: ADataSpace = 155844608;
+pub const ADataSpace_ADATASPACE_SRGB_LINEAR: ADataSpace = 138477568;
+pub const ADataSpace_ADATASPACE_BT2020_HLG: ADataSpace = 168165376;
+pub const ADataSpace_ADATASPACE_BT2020_ITU_HLG: ADataSpace = 302383104;
+pub const ADataSpace_DEPTH: ADataSpace = 4096;
+pub const ADataSpace_DYNAMIC_DEPTH: ADataSpace = 4098;
 pub type ADataSpace = ::std::os::raw::c_uint;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM: AHardwareBuffer_Format = 1;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM: AHardwareBuffer_Format = 2;
@@ -1679,6 +1920,8 @@ pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT: AHard
     52;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer_Format = 53;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = 35;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_YCbCr_P010: AHardwareBuffer_Format = 54;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8_UNORM: AHardwareBuffer_Format = 56;
 pub type AHardwareBuffer_Format = ::std::os::raw::c_uint;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_NEVER:
     AHardwareBuffer_UsageFlags = 0;
@@ -1771,6 +2014,8 @@ pub struct AHardwareBuffer_Desc {
 }
 #[test]
 fn bindgen_test_layout_AHardwareBuffer_Desc() {
+    const UNINIT: ::std::mem::MaybeUninit<AHardwareBuffer_Desc> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Desc>(),
         40usize,
@@ -1782,7 +2027,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         concat!("Alignment of ", stringify!(AHardwareBuffer_Desc))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).width as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).width) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1792,7 +2037,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).height as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).height) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -1802,7 +2047,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).layers as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).layers) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -1812,7 +2057,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).format as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).format) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -1822,7 +2067,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).usage as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).usage) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -1832,7 +2077,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).stride as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).stride) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -1842,7 +2087,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).rfu0 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rfu0) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -1852,7 +2097,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).rfu1 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rfu1) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -1871,6 +2116,9 @@ pub struct AHardwareBuffer_Plane {
 }
 #[test]
 fn bindgen_test_layout_AHardwareBuffer_Plane() {
+    const UNINIT: ::std::mem::MaybeUninit<AHardwareBuffer_Plane> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Plane>(),
         12usize,
@@ -1882,7 +2130,7 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
         concat!("Alignment of ", stringify!(AHardwareBuffer_Plane))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Plane>())).data as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1892,9 +2140,7 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<AHardwareBuffer_Plane>())).pixelStride as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).pixelStride) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -1904,7 +2150,7 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Plane>())).rowStride as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rowStride) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -1922,6 +2168,9 @@ pub struct AHardwareBuffer_Planes {
 }
 #[test]
 fn bindgen_test_layout_AHardwareBuffer_Planes() {
+    const UNINIT: ::std::mem::MaybeUninit<AHardwareBuffer_Planes> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Planes>(),
         52usize,
@@ -1933,9 +2182,7 @@ fn bindgen_test_layout_AHardwareBuffer_Planes() {
         concat!("Alignment of ", stringify!(AHardwareBuffer_Planes))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<AHardwareBuffer_Planes>())).planeCount as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).planeCount) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1945,7 +2192,7 @@ fn bindgen_test_layout_AHardwareBuffer_Planes() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Planes>())).planes as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).planes) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -1987,15 +2234,6 @@ extern "C" {
         outVirtualAddress: *mut *mut ::std::os::raw::c_void,
     ) -> ::std::os::raw::c_int;
 }
-extern "C" {
-    pub fn AHardwareBuffer_lockPlanes(
-        buffer: *mut AHardwareBuffer,
-        usage: u64,
-        fence: i32,
-        rect: *const ARect,
-        outPlanes: *mut AHardwareBuffer_Planes,
-    ) -> ::std::os::raw::c_int;
-}
 extern "C" {
     pub fn AHardwareBuffer_unlock(
         buffer: *mut AHardwareBuffer,
@@ -2014,6 +2252,15 @@ extern "C" {
         outBuffer: *mut *mut AHardwareBuffer,
     ) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn AHardwareBuffer_lockPlanes(
+        buffer: *mut AHardwareBuffer,
+        usage: u64,
+        fence: i32,
+        rect: *const ARect,
+        outPlanes: *mut AHardwareBuffer_Planes,
+    ) -> ::std::os::raw::c_int;
+}
 extern "C" {
     pub fn AHardwareBuffer_isSupported(desc: *const AHardwareBuffer_Desc) -> ::std::os::raw::c_int;
 }
@@ -2028,808 +2275,357 @@ extern "C" {
         outBytesPerStride: *mut i32,
     ) -> ::std::os::raw::c_int;
 }
-pub type va_list = __builtin_va_list;
-pub type __gnuc_va_list = __builtin_va_list;
+extern "C" {
+    pub fn AHardwareBuffer_getId(
+        buffer: *const AHardwareBuffer,
+        outId: *mut u64,
+    ) -> ::std::os::raw::c_int;
+}
+#[doc = " \\brief Describe information about a pointer, found in a\n GameActivityMotionEvent.\n\n You can read values directly from this structure, or use helper functions\n (`GameActivityPointerAxes_getX`, `GameActivityPointerAxes_getY` and\n `GameActivityPointerAxes_getAxisValue`).\n\n The X axis and Y axis are enabled by default but any other axis that you want\n to read **must** be enabled first, using\n `GameActivityPointerAxes_enableAxis`.\n\n \\see GameActivityMotionEvent"]
 #[repr(C)]
-pub struct JavaVMAttachArgs {
-    pub version: jint,
-    pub name: *const ::std::os::raw::c_char,
-    pub group: jobject,
+#[derive(Debug, Copy, Clone)]
+pub struct GameActivityPointerAxes {
+    pub id: i32,
+    pub toolType: i32,
+    pub axisValues: [f32; 48usize],
+    pub rawX: f32,
+    pub rawY: f32,
 }
 #[test]
-fn bindgen_test_layout_JavaVMAttachArgs() {
+fn bindgen_test_layout_GameActivityPointerAxes() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityPointerAxes> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<JavaVMAttachArgs>(),
-        12usize,
-        concat!("Size of: ", stringify!(JavaVMAttachArgs))
+        ::std::mem::size_of::<GameActivityPointerAxes>(),
+        208usize,
+        concat!("Size of: ", stringify!(GameActivityPointerAxes))
     );
     assert_eq!(
-        ::std::mem::align_of::<JavaVMAttachArgs>(),
+        ::std::mem::align_of::<GameActivityPointerAxes>(),
         4usize,
-        concat!("Alignment of ", stringify!(JavaVMAttachArgs))
+        concat!("Alignment of ", stringify!(GameActivityPointerAxes))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMAttachArgs>())).version as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(version)
+            stringify!(id)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMAttachArgs>())).name as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).toolType) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(name)
+            stringify!(toolType)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMAttachArgs>())).group as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).axisValues) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(group)
+            stringify!(axisValues)
         )
     );
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct JavaVMOption {
-    pub optionString: *const ::std::os::raw::c_char,
-    pub extraInfo: *mut ::std::os::raw::c_void,
-}
-#[test]
-fn bindgen_test_layout_JavaVMOption() {
-    assert_eq!(
-        ::std::mem::size_of::<JavaVMOption>(),
-        8usize,
-        concat!("Size of: ", stringify!(JavaVMOption))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<JavaVMOption>(),
-        4usize,
-        concat!("Alignment of ", stringify!(JavaVMOption))
-    );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMOption>())).optionString as *const _ as usize },
-        0usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).rawX) as usize - ptr as usize },
+        200usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMOption),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(optionString)
+            stringify!(rawX)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMOption>())).extraInfo as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMOption),
-            "::",
-            stringify!(extraInfo)
-        )
-    );
-}
-#[repr(C)]
-pub struct JavaVMInitArgs {
-    pub version: jint,
-    pub nOptions: jint,
-    pub options: *mut JavaVMOption,
-    pub ignoreUnrecognized: jboolean,
-}
-#[test]
-fn bindgen_test_layout_JavaVMInitArgs() {
-    assert_eq!(
-        ::std::mem::size_of::<JavaVMInitArgs>(),
-        16usize,
-        concat!("Size of: ", stringify!(JavaVMInitArgs))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<JavaVMInitArgs>(),
-        4usize,
-        concat!("Alignment of ", stringify!(JavaVMInitArgs))
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMInitArgs>())).version as *const _ as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(version)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMInitArgs>())).nOptions as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(nOptions)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMInitArgs>())).options as *const _ as usize },
-        8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(options)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<JavaVMInitArgs>())).ignoreUnrecognized as *const _ as usize
-        },
-        12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(ignoreUnrecognized)
-        )
-    );
-}
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
-    GameCommonInsetsType = 3;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
-#[doc = " The type of a component for which to retrieve insets. See"]
-#[doc = " https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
-pub type GameCommonInsetsType = ::std::os::raw::c_uint;
-#[doc = " This struct holds a span within a region of text from start (inclusive) to"]
-#[doc = " end (exclusive). An empty span or cursor position is specified with"]
-#[doc = " start==end. An undefined span is specified with start = end = SPAN_UNDEFINED."]
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameTextInputSpan {
-    #[doc = " The start of the region (inclusive)."]
-    pub start: i32,
-    #[doc = " The end of the region (exclusive)."]
-    pub end: i32,
-}
-#[test]
-fn bindgen_test_layout_GameTextInputSpan() {
-    assert_eq!(
-        ::std::mem::size_of::<GameTextInputSpan>(),
-        8usize,
-        concat!("Size of: ", stringify!(GameTextInputSpan))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<GameTextInputSpan>(),
-        4usize,
-        concat!("Alignment of ", stringify!(GameTextInputSpan))
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputSpan>())).start as *const _ as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputSpan),
-            "::",
-            stringify!(start)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputSpan>())).end as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputSpan),
-            "::",
-            stringify!(end)
-        )
-    );
-}
-pub const GameTextInputSpanFlag_SPAN_UNDEFINED: GameTextInputSpanFlag = -1;
-#[doc = " Values with special meaning in a GameTextInputSpan."]
-pub type GameTextInputSpanFlag = ::std::os::raw::c_int;
-#[doc = " This struct holds the state of an editable section of text."]
-#[doc = " The text can have a selection and a composing region defined on it."]
-#[doc = " A composing region is used by IMEs that allow input using multiple steps to"]
-#[doc = " compose a glyph or word. Use functions GameTextInput_getState and"]
-#[doc = " GameTextInput_setState to read and modify the state that an IME is editing."]
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameTextInputState {
-    #[doc = " Text owned by the state, as a modified UTF-8 string. Null-terminated."]
-    #[doc = " https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8"]
-    pub text_UTF8: *const ::std::os::raw::c_char,
-    #[doc = " Length in bytes of text_UTF8, *not* including the null at end."]
-    pub text_length: i32,
-    #[doc = " A selection defined on the text."]
-    pub selection: GameTextInputSpan,
-    #[doc = " A composing region defined on the text."]
-    pub composingRegion: GameTextInputSpan,
-}
-#[test]
-fn bindgen_test_layout_GameTextInputState() {
-    assert_eq!(
-        ::std::mem::size_of::<GameTextInputState>(),
-        24usize,
-        concat!("Size of: ", stringify!(GameTextInputState))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<GameTextInputState>(),
-        4usize,
-        concat!("Alignment of ", stringify!(GameTextInputState))
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputState>())).text_UTF8 as *const _ as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(text_UTF8)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputState>())).text_length as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(text_length)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputState>())).selection as *const _ as usize },
-        8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(selection)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameTextInputState>())).composingRegion as *const _ as usize
-        },
-        16usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).rawY) as usize - ptr as usize },
+        204usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputState),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(composingRegion)
+            stringify!(rawY)
         )
     );
 }
-#[doc = " A callback called by GameTextInput_getState."]
-#[doc = " @param context User-defined context."]
-#[doc = " @param state State, owned by the library, that will be valid for the duration"]
-#[doc = " of the callback."]
-pub type GameTextInputGetStateCallback = ::std::option::Option<
-    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, state: *const GameTextInputState),
->;
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameTextInput {
-    _unused: [u8; 0],
-}
-extern "C" {
-    #[doc = " Initialize the GameTextInput library."]
-    #[doc = " If called twice without GameTextInput_destroy being called, the same pointer"]
-    #[doc = " will be returned and a warning will be issued."]
-    #[doc = " @param env A JNI env valid on the calling thread."]
-    #[doc = " @param max_string_size The maximum length of a string that can be edited. If"]
-    #[doc = " zero, the maximum defaults to 65536 bytes. A buffer of this size is allocated"]
-    #[doc = " at initialization."]
-    #[doc = " @return A handle to the library."]
-    pub fn GameTextInput_init(env: *mut JNIEnv, max_string_size: u32) -> *mut GameTextInput;
-}
-extern "C" {
-    #[doc = " When using GameTextInput, you need to create a gametextinput.InputConnection"]
-    #[doc = " on the Java side and pass it using this function to the library, unless using"]
-    #[doc = " GameActivity in which case this will be done for you. See the GameActivity"]
-    #[doc = " source code or GameTextInput samples for examples of usage."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param inputConnection A gametextinput.InputConnection object."]
-    pub fn GameTextInput_setInputConnection(input: *mut GameTextInput, inputConnection: jobject);
-}
-extern "C" {
-    #[doc = " Unless using GameActivity, it is required to call this function from your"]
-    #[doc = " Java gametextinput.Listener.stateChanged method to convert eventState and"]
-    #[doc = " trigger any event callbacks. When using GameActivity, this does not need to"]
-    #[doc = " be called as event processing is handled by the Activity."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param eventState A Java gametextinput.State object."]
-    pub fn GameTextInput_processEvent(input: *mut GameTextInput, eventState: jobject);
-}
-extern "C" {
-    #[doc = " Free any resources owned by the GameTextInput library."]
-    #[doc = " Any subsequent calls to the library will fail until GameTextInput_init is"]
-    #[doc = " called again."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    pub fn GameTextInput_destroy(input: *mut GameTextInput);
-}
-pub const ShowImeFlags_SHOW_IME_UNDEFINED: ShowImeFlags = 0;
-pub const ShowImeFlags_SHOW_IMPLICIT: ShowImeFlags = 1;
-pub const ShowImeFlags_SHOW_FORCED: ShowImeFlags = 2;
-#[doc = " Flags to be passed to GameTextInput_showIme."]
-pub type ShowImeFlags = ::std::os::raw::c_uint;
-extern "C" {
-    #[doc = " Show the IME. Calls InputMethodManager.showSoftInput()."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param flags Defined in ShowImeFlags above. For more information see:"]
-    #[doc = " https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
-    pub fn GameTextInput_showIme(input: *mut GameTextInput, flags: u32);
-}
-pub const HideImeFlags_HIDE_IME_UNDEFINED: HideImeFlags = 0;
-pub const HideImeFlags_HIDE_IMPLICIT_ONLY: HideImeFlags = 1;
-pub const HideImeFlags_HIDE_NOT_ALWAYS: HideImeFlags = 2;
-#[doc = " Flags to be passed to GameTextInput_hideIme."]
-pub type HideImeFlags = ::std::os::raw::c_uint;
-extern "C" {
-    #[doc = " Show the IME. Calls InputMethodManager.hideSoftInputFromWindow()."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param flags Defined in HideImeFlags above. For more information see:"]
-    #[doc = " https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
-    pub fn GameTextInput_hideIme(input: *mut GameTextInput, flags: u32);
-}
-extern "C" {
-    #[doc = " Call a callback with the current GameTextInput state, which may have been"]
-    #[doc = " modified by changes in the IME and calls to GameTextInput_setState. We use a"]
-    #[doc = " callback rather than returning the state in order to simplify ownership of"]
-    #[doc = " text_UTF8 strings. These strings are only valid during the calling of the"]
-    #[doc = " callback."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param callback A function that will be called with valid state."]
-    #[doc = " @param context Context used by the callback."]
-    pub fn GameTextInput_getState(
-        input: *mut GameTextInput,
-        callback: GameTextInputGetStateCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
-}
-extern "C" {
-    #[doc = " Set the current GameTextInput state. This state is reflected to any active"]
-    #[doc = " IME."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param state The state to set. Ownership is maintained by the caller and must"]
-    #[doc = " remain valid for the duration of the call."]
-    pub fn GameTextInput_setState(input: *mut GameTextInput, state: *const GameTextInputState);
-}
-#[doc = " Type of the callback needed by GameTextInput_setEventCallback that will be"]
-#[doc = " called every time the IME state changes."]
-#[doc = " @param context User-defined context set in GameTextInput_setEventCallback."]
-#[doc = " @param current_state Current IME state, owned by the library and valid during"]
-#[doc = " the callback."]
-pub type GameTextInputEventCallback = ::std::option::Option<
-    unsafe extern "C" fn(
-        context: *mut ::std::os::raw::c_void,
-        current_state: *const GameTextInputState,
-    ),
->;
 extern "C" {
-    #[doc = " Optionally set a callback to be called whenever the IME state changes."]
-    #[doc = " Not necessary if you are using GameActivity, which handles these callbacks"]
-    #[doc = " for you."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param callback Called by the library when the IME state changes."]
-    #[doc = " @param context Context passed as first argument to the callback."]
-    pub fn GameTextInput_setEventCallback(
-        input: *mut GameTextInput,
-        callback: GameTextInputEventCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
-}
-#[doc = " Type of the callback needed by GameTextInput_setImeInsetsCallback that will"]
-#[doc = " be called every time the IME window insets change."]
-#[doc = " @param context User-defined context set in"]
-#[doc = " GameTextInput_setImeWIndowInsetsCallback."]
-#[doc = " @param current_insets Current IME insets, owned by the library and valid"]
-#[doc = " during the callback."]
-pub type GameTextInputImeInsetsCallback = ::std::option::Option<
-    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, current_insets: *const ARect),
->;
-extern "C" {
-    #[doc = " Optionally set a callback to be called whenever the IME insets change."]
-    #[doc = " Not necessary if you are using GameActivity, which handles these callbacks"]
-    #[doc = " for you."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param callback Called by the library when the IME insets change."]
-    #[doc = " @param context Context passed as first argument to the callback."]
-    pub fn GameTextInput_setImeInsetsCallback(
-        input: *mut GameTextInput,
-        callback: GameTextInputImeInsetsCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
-}
-extern "C" {
-    #[doc = " Get the current window insets for the IME."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param insets Filled with the current insets by this function."]
-    pub fn GameTextInput_getImeInsets(input: *const GameTextInput, insets: *mut ARect);
-}
-extern "C" {
-    #[doc = " Unless using GameActivity, it is required to call this function from your"]
-    #[doc = " Java gametextinput.Listener.onImeInsetsChanged method to"]
-    #[doc = " trigger any event callbacks. When using GameActivity, this does not need to"]
-    #[doc = " be called as insets processing is handled by the Activity."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param eventState A Java gametextinput.State object."]
-    pub fn GameTextInput_processImeInsets(input: *mut GameTextInput, insets: *const ARect);
+    #[doc = " \\brief Enable the specified axis, so that its value is reported in the\n GameActivityPointerAxes structures stored in a motion event.\n\n You must enable any axis that you want to read, apart from\n `AMOTION_EVENT_AXIS_X` and `AMOTION_EVENT_AXIS_Y` that are enabled by\n default.\n\n If the axis index is out of range, nothing is done."]
+    pub fn GameActivityPointerAxes_enableAxis(axis: i32);
 }
 extern "C" {
-    #[doc = " Convert a GameTextInputState struct to a Java gametextinput.State object."]
-    #[doc = " Don't forget to delete the returned Java local ref when you're done."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param state Input state to convert."]
-    #[doc = " @return A Java object of class gametextinput.State. The caller is required to"]
-    #[doc = " delete this local reference."]
-    pub fn GameTextInputState_toJava(
-        input: *const GameTextInput,
-        state: *const GameTextInputState,
-    ) -> jobject;
+    #[doc = " \\brief Disable the specified axis. Its value won't be reported in the\n GameActivityPointerAxes structures stored in a motion event anymore.\n\n Apart from X and Y, any axis that you want to read **must** be enabled first,\n using `GameActivityPointerAxes_enableAxis`.\n\n If the axis index is out of range, nothing is done."]
+    pub fn GameActivityPointerAxes_disableAxis(axis: i32);
 }
 extern "C" {
-    #[doc = " Convert from a Java gametextinput.State object into a C GameTextInputState"]
-    #[doc = " struct."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param state A Java gametextinput.State object."]
-    #[doc = " @param callback A function called with the C struct, valid for the duration"]
-    #[doc = " of the call."]
-    #[doc = " @param context Context passed to the callback."]
-    pub fn GameTextInputState_fromJava(
-        input: *const GameTextInput,
-        state: jobject,
-        callback: GameTextInputGetStateCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
+    #[doc = " \\brief Get the value of the requested axis.\n\n Apart from X and Y, any axis that you want to read **must** be enabled first,\n using `GameActivityPointerAxes_enableAxis`.\n\n Find the valid enums for the axis (`AMOTION_EVENT_AXIS_X`,\n `AMOTION_EVENT_AXIS_Y`, `AMOTION_EVENT_AXIS_PRESSURE`...)\n in https://developer.android.com/ndk/reference/group/input.\n\n @param pointerInfo The structure containing information about the pointer,\n obtained from GameActivityMotionEvent.\n @param axis The axis to get the value from\n @return The value of the axis, or 0 if the axis is invalid or was not\n enabled."]
+    pub fn GameActivityPointerAxes_getAxisValue(
+        pointerInfo: *const GameActivityPointerAxes,
+        axis: i32,
+    ) -> f32;
 }
-#[doc = " This structure defines the native side of an android.app.GameActivity."]
-#[doc = " It is created by the framework, and handed to the application's native"]
-#[doc = " code as it is being launched."]
+#[doc = " \\brief Describe a motion event that happened on the GameActivity SurfaceView.\n\n This is 1:1 mapping to the information contained in a Java `MotionEvent`\n (see https://developer.android.com/reference/android/view/MotionEvent)."]
 #[repr(C)]
-pub struct GameActivity {
-    #[doc = " Pointer to the callback function table of the native application."]
-    #[doc = " You can set the functions here to your own callbacks.  The callbacks"]
-    #[doc = " pointer itself here should not be changed; it is allocated and managed"]
-    #[doc = " for you by the framework."]
-    pub callbacks: *mut GameActivityCallbacks,
-    #[doc = " The global handle on the process's Java VM."]
-    pub vm: *mut JavaVM,
-    #[doc = " JNI context for the main thread of the app.  Note that this field"]
-    #[doc = " can ONLY be used from the main thread of the process; that is, the"]
-    #[doc = " thread that calls into the GameActivityCallbacks."]
-    pub env: *mut JNIEnv,
-    #[doc = " The GameActivity object handle."]
-    pub javaGameActivity: jobject,
-    #[doc = " Path to this application's internal data directory."]
-    pub internalDataPath: *const ::std::os::raw::c_char,
-    #[doc = " Path to this application's external (removable/mountable) data directory."]
-    pub externalDataPath: *const ::std::os::raw::c_char,
-    #[doc = " The platform's SDK version code."]
-    pub sdkVersion: i32,
-    #[doc = " This is the native instance of the application.  It is not used by"]
-    #[doc = " the framework, but can be set by the application to its own instance"]
-    #[doc = " state."]
-    pub instance: *mut ::std::os::raw::c_void,
-    #[doc = " Pointer to the Asset Manager instance for the application.  The"]
-    #[doc = " application uses this to access binary assets bundled inside its own .apk"]
-    #[doc = " file."]
-    pub assetManager: *mut AAssetManager,
-    #[doc = " Available starting with Honeycomb: path to the directory containing"]
-    #[doc = " the application's OBB files (if any).  If the app doesn't have any"]
-    #[doc = " OBB files, this directory may not exist."]
-    pub obbPath: *const ::std::os::raw::c_char,
+#[derive(Debug, Copy, Clone)]
+pub struct GameActivityMotionEvent {
+    pub deviceId: i32,
+    pub source: i32,
+    pub action: i32,
+    pub eventTime: i64,
+    pub downTime: i64,
+    pub flags: i32,
+    pub metaState: i32,
+    pub actionButton: i32,
+    pub buttonState: i32,
+    pub classification: i32,
+    pub edgeFlags: i32,
+    pub pointerCount: u32,
+    pub pointers: [GameActivityPointerAxes; 8usize],
+    pub historySize: ::std::os::raw::c_int,
+    pub historicalEventTimesMillis: *mut i64,
+    pub historicalEventTimesNanos: *mut i64,
+    pub historicalAxisValues: *mut f32,
+    pub precisionX: f32,
+    pub precisionY: f32,
 }
 #[test]
-fn bindgen_test_layout_GameActivity() {
+fn bindgen_test_layout_GameActivityMotionEvent() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityMotionEvent> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<GameActivity>(),
-        40usize,
-        concat!("Size of: ", stringify!(GameActivity))
+        ::std::mem::size_of::<GameActivityMotionEvent>(),
+        1744usize,
+        concat!("Size of: ", stringify!(GameActivityMotionEvent))
     );
     assert_eq!(
-        ::std::mem::align_of::<GameActivity>(),
+        ::std::mem::align_of::<GameActivityMotionEvent>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameActivity))
+        concat!("Alignment of ", stringify!(GameActivityMotionEvent))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).callbacks as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(callbacks)
+            stringify!(deviceId)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).vm as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(vm)
+            stringify!(source)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).env as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(env)
+            stringify!(action)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).javaGameActivity as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(javaGameActivity)
+            stringify!(eventTime)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).internalDataPath as *const _ as usize },
-        16usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
+        20usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(internalDataPath)
+            stringify!(downTime)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).externalDataPath as *const _ as usize },
-        20usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
+        28usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(externalDataPath)
+            stringify!(flags)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).sdkVersion as *const _ as usize },
-        24usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
+        32usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(sdkVersion)
+            stringify!(metaState)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).instance as *const _ as usize },
-        28usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).actionButton) as usize - ptr as usize },
+        36usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(instance)
+            stringify!(actionButton)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).assetManager as *const _ as usize },
-        32usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).buttonState) as usize - ptr as usize },
+        40usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(assetManager)
+            stringify!(buttonState)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).obbPath as *const _ as usize },
-        36usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).classification) as usize - ptr as usize },
+        44usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(obbPath)
+            stringify!(classification)
         )
     );
-}
-#[doc = " \\brief Describe information about a pointer, found in a"]
-#[doc = " GameActivityMotionEvent."]
-#[doc = ""]
-#[doc = " You can read values directly from this structure, or use helper functions"]
-#[doc = " (`GameActivityPointerAxes_getX`, `GameActivityPointerAxes_getY` and"]
-#[doc = " `GameActivityPointerAxes_getAxisValue`)."]
-#[doc = ""]
-#[doc = " The X axis and Y axis are enabled by default but any other axis that you want"]
-#[doc = " to read **must** be enabled first, using"]
-#[doc = " `GameActivityPointerAxes_enableAxis`."]
-#[doc = ""]
-#[doc = " \\see GameActivityMotionEvent"]
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameActivityPointerAxes {
-    pub id: i32,
-    pub toolType: i32,
-    pub axisValues: [f32; 48usize],
-    pub rawX: f32,
-    pub rawY: f32,
-}
-#[test]
-fn bindgen_test_layout_GameActivityPointerAxes() {
-    assert_eq!(
-        ::std::mem::size_of::<GameActivityPointerAxes>(),
-        208usize,
-        concat!("Size of: ", stringify!(GameActivityPointerAxes))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<GameActivityPointerAxes>(),
-        4usize,
-        concat!("Alignment of ", stringify!(GameActivityPointerAxes))
-    );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityPointerAxes>())).id as *const _ as usize },
-        0usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).edgeFlags) as usize - ptr as usize },
+        48usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(id)
+            stringify!(edgeFlags)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityPointerAxes>())).toolType as *const _ as usize
-        },
-        4usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pointerCount) as usize - ptr as usize },
+        52usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(toolType)
+            stringify!(pointerCount)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityPointerAxes>())).axisValues as *const _ as usize
-        },
-        8usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pointers) as usize - ptr as usize },
+        56usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(axisValues)
+            stringify!(pointers)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityPointerAxes>())).rawX as *const _ as usize },
-        200usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).historySize) as usize - ptr as usize },
+        1720usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(rawX)
+            stringify!(historySize)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityPointerAxes>())).rawY as *const _ as usize },
-        204usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesMillis) as usize - ptr as usize },
+        1724usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(rawY)
+            stringify!(historicalEventTimesMillis)
         )
     );
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameActivityHistoricalPointerAxes {
-    pub eventTime: i64,
-    pub axisValues: [f32; 48usize],
-}
-#[test]
-fn bindgen_test_layout_GameActivityHistoricalPointerAxes() {
     assert_eq!(
-        ::std::mem::size_of::<GameActivityHistoricalPointerAxes>(),
-        200usize,
-        concat!("Size of: ", stringify!(GameActivityHistoricalPointerAxes))
+        unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesNanos) as usize - ptr as usize },
+        1728usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(historicalEventTimesNanos)
+        )
     );
     assert_eq!(
-        ::std::mem::align_of::<GameActivityHistoricalPointerAxes>(),
-        4usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).historicalAxisValues) as usize - ptr as usize },
+        1732usize,
         concat!(
-            "Alignment of ",
-            stringify!(GameActivityHistoricalPointerAxes)
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(historicalAxisValues)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityHistoricalPointerAxes>())).eventTime as *const _
-                as usize
-        },
-        0usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).precisionX) as usize - ptr as usize },
+        1736usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityHistoricalPointerAxes),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(eventTime)
+            stringify!(precisionX)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityHistoricalPointerAxes>())).axisValues as *const _
-                as usize
-        },
-        8usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).precisionY) as usize - ptr as usize },
+        1740usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityHistoricalPointerAxes),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(axisValues)
+            stringify!(precisionY)
         )
     );
 }
 extern "C" {
-    #[doc = " \\brief Enable the specified axis, so that its value is reported in the"]
-    #[doc = " GameActivityPointerAxes structures stored in a motion event."]
-    #[doc = ""]
-    #[doc = " You must enable any axis that you want to read, apart from"]
-    #[doc = " `AMOTION_EVENT_AXIS_X` and `AMOTION_EVENT_AXIS_Y` that are enabled by"]
-    #[doc = " default."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityPointerAxes_enableAxis(axis: i32);
-}
-extern "C" {
-    #[doc = " \\brief Disable the specified axis. Its value won't be reported in the"]
-    #[doc = " GameActivityPointerAxes structures stored in a motion event anymore."]
-    #[doc = ""]
-    #[doc = " Apart from X and Y, any axis that you want to read **must** be enabled first,"]
-    #[doc = " using `GameActivityPointerAxes_enableAxis`."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityPointerAxes_disableAxis(axis: i32);
+    pub fn GameActivityMotionEvent_getHistoricalAxisValue(
+        event: *const GameActivityMotionEvent,
+        axis: ::std::os::raw::c_int,
+        pointerIndex: ::std::os::raw::c_int,
+        historyPos: ::std::os::raw::c_int,
+    ) -> f32;
 }
 extern "C" {
-    #[doc = " \\brief Enable the specified axis, so that its value is reported in the"]
-    #[doc = " GameActivityHistoricalPointerAxes structures associated with a motion event."]
-    #[doc = ""]
-    #[doc = " You must enable any axis that you want to read (no axes are enabled by"]
-    #[doc = " default)."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityHistoricalPointerAxes_enableAxis(axis: i32);
+    #[doc = " \\brief Handle the freeing of the GameActivityMotionEvent struct."]
+    pub fn GameActivityMotionEvent_destroy(c_event: *mut GameActivityMotionEvent);
 }
 extern "C" {
-    #[doc = " \\brief Disable the specified axis. Its value won't be reported in the"]
-    #[doc = " GameActivityHistoricalPointerAxes structures associated with motion events"]
-    #[doc = " anymore."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityHistoricalPointerAxes_disableAxis(axis: i32);
+    #[doc = " \\brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`.\n\n This is done automatically by the GameActivity: see `onTouchEvent` to set\n a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
+    pub fn GameActivityMotionEvent_fromJava(
+        env: *mut JNIEnv,
+        motionEvent: jobject,
+        out_event: *mut GameActivityMotionEvent,
+    );
 }
-#[doc = " \\brief Describe a motion event that happened on the GameActivity SurfaceView."]
-#[doc = ""]
-#[doc = " This is 1:1 mapping to the information contained in a Java `MotionEvent`"]
-#[doc = " (see https://developer.android.com/reference/android/view/MotionEvent)."]
+#[doc = " \\brief Describe a key event that happened on the GameActivity SurfaceView.\n\n This is 1:1 mapping to the information contained in a Java `KeyEvent`\n (see https://developer.android.com/reference/android/view/KeyEvent).\n The only exception is the event times, which are reported as\n nanoseconds in this struct."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct GameActivityMotionEvent {
+pub struct GameActivityKeyEvent {
     pub deviceId: i32,
     pub source: i32,
     pub action: i32,
@@ -2837,374 +2633,534 @@ pub struct GameActivityMotionEvent {
     pub downTime: i64,
     pub flags: i32,
     pub metaState: i32,
-    pub actionButton: i32,
-    pub buttonState: i32,
-    pub classification: i32,
-    pub edgeFlags: i32,
-    pub pointerCount: u32,
-    pub pointers: [GameActivityPointerAxes; 8usize],
-    pub precisionX: f32,
-    pub precisionY: f32,
-    pub historicalStart: i16,
-    pub historicalCount: i16,
+    pub modifiers: i32,
+    pub repeatCount: i32,
+    pub keyCode: i32,
+    pub scanCode: i32,
+    pub unicodeChar: i32,
 }
 #[test]
-fn bindgen_test_layout_GameActivityMotionEvent() {
+fn bindgen_test_layout_GameActivityKeyEvent() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityKeyEvent> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<GameActivityMotionEvent>(),
-        1732usize,
-        concat!("Size of: ", stringify!(GameActivityMotionEvent))
+        ::std::mem::size_of::<GameActivityKeyEvent>(),
+        56usize,
+        concat!("Size of: ", stringify!(GameActivityKeyEvent))
     );
     assert_eq!(
-        ::std::mem::align_of::<GameActivityMotionEvent>(),
+        ::std::mem::align_of::<GameActivityKeyEvent>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameActivityMotionEvent))
+        concat!("Alignment of ", stringify!(GameActivityKeyEvent))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).deviceId as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
             stringify!(deviceId)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityMotionEvent>())).source as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
             stringify!(source)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityMotionEvent>())).action as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
             stringify!(action)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).eventTime as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
             stringify!(eventTime)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).downTime as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
             stringify!(downTime)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityMotionEvent>())).flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
             stringify!(flags)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).metaState as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
             stringify!(metaState)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).actionButton as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).modifiers) as usize - ptr as usize },
         36usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(actionButton)
+            stringify!(modifiers)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).repeatCount) as usize - ptr as usize },
+        40usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityKeyEvent),
+            "::",
+            stringify!(repeatCount)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).keyCode) as usize - ptr as usize },
+        44usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityKeyEvent),
+            "::",
+            stringify!(keyCode)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).scanCode) as usize - ptr as usize },
+        48usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityKeyEvent),
+            "::",
+            stringify!(scanCode)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).unicodeChar) as usize - ptr as usize },
+        52usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityKeyEvent),
+            "::",
+            stringify!(unicodeChar)
         )
     );
+}
+extern "C" {
+    #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.\n\n This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`\n to set a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
+    pub fn GameActivityKeyEvent_fromJava(
+        env: *mut JNIEnv,
+        motionEvent: jobject,
+        out_event: *mut GameActivityKeyEvent,
+    );
+}
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
+    GameCommonInsetsType = 3;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
+#[doc = " The type of a component for which to retrieve insets. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
+pub type GameCommonInsetsType = ::std::os::raw::c_uint;
+#[doc = " This struct holds a span within a region of text from start (inclusive) to\n end (exclusive). An empty span or cursor position is specified with\n start==end. An undefined span is specified with start = end = SPAN_UNDEFINED."]
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct GameTextInputSpan {
+    #[doc = " The start of the region (inclusive)."]
+    pub start: i32,
+    #[doc = " The end of the region (exclusive)."]
+    pub end: i32,
+}
+#[test]
+fn bindgen_test_layout_GameTextInputSpan() {
+    const UNINIT: ::std::mem::MaybeUninit<GameTextInputSpan> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<GameTextInputSpan>(),
+        8usize,
+        concat!("Size of: ", stringify!(GameTextInputSpan))
+    );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).buttonState as *const _ as usize
-        },
-        40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(buttonState)
-        )
+        ::std::mem::align_of::<GameTextInputSpan>(),
+        4usize,
+        concat!("Alignment of ", stringify!(GameTextInputSpan))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).classification as *const _ as usize
-        },
-        44usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).start) as usize - ptr as usize },
+        0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameTextInputSpan),
             "::",
-            stringify!(classification)
+            stringify!(start)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).edgeFlags as *const _ as usize
-        },
-        48usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).end) as usize - ptr as usize },
+        4usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameTextInputSpan),
             "::",
-            stringify!(edgeFlags)
+            stringify!(end)
         )
     );
+}
+pub const GameTextInputSpanFlag_SPAN_UNDEFINED: GameTextInputSpanFlag = -1;
+#[doc = " Values with special meaning in a GameTextInputSpan."]
+pub type GameTextInputSpanFlag = ::std::os::raw::c_int;
+#[doc = " This struct holds the state of an editable section of text.\n The text can have a selection and a composing region defined on it.\n A composing region is used by IMEs that allow input using multiple steps to\n compose a glyph or word. Use functions GameTextInput_getState and\n GameTextInput_setState to read and modify the state that an IME is editing."]
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct GameTextInputState {
+    #[doc = " Text owned by the state, as a modified UTF-8 string. Null-terminated.\n https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8"]
+    pub text_UTF8: *const ::std::os::raw::c_char,
+    #[doc = " Length in bytes of text_UTF8, *not* including the null at end."]
+    pub text_length: i32,
+    #[doc = " A selection defined on the text."]
+    pub selection: GameTextInputSpan,
+    #[doc = " A composing region defined on the text."]
+    pub composingRegion: GameTextInputSpan,
+}
+#[test]
+fn bindgen_test_layout_GameTextInputState() {
+    const UNINIT: ::std::mem::MaybeUninit<GameTextInputState> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).pointerCount as *const _ as usize
-        },
-        52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(pointerCount)
-        )
+        ::std::mem::size_of::<GameTextInputState>(),
+        24usize,
+        concat!("Size of: ", stringify!(GameTextInputState))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).pointers as *const _ as usize
-        },
-        56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(pointers)
-        )
+        ::std::mem::align_of::<GameTextInputState>(),
+        4usize,
+        concat!("Alignment of ", stringify!(GameTextInputState))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).precisionX as *const _ as usize
-        },
-        1720usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).text_UTF8) as usize - ptr as usize },
+        0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(precisionX)
+            stringify!(text_UTF8)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).precisionY as *const _ as usize
-        },
-        1724usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).text_length) as usize - ptr as usize },
+        4usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(precisionY)
+            stringify!(text_length)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).historicalStart as *const _ as usize
-        },
-        1728usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).selection) as usize - ptr as usize },
+        8usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(historicalStart)
+            stringify!(selection)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).historicalCount as *const _ as usize
-        },
-        1730usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).composingRegion) as usize - ptr as usize },
+        16usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(historicalCount)
+            stringify!(composingRegion)
         )
     );
 }
-#[doc = " \\brief Describe a key event that happened on the GameActivity SurfaceView."]
-#[doc = ""]
-#[doc = " This is 1:1 mapping to the information contained in a Java `KeyEvent`"]
-#[doc = " (see https://developer.android.com/reference/android/view/KeyEvent)."]
+#[doc = " A callback called by GameTextInput_getState.\n @param context User-defined context.\n @param state State, owned by the library, that will be valid for the duration\n of the callback."]
+pub type GameTextInputGetStateCallback = ::std::option::Option<
+    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, state: *const GameTextInputState),
+>;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct GameActivityKeyEvent {
-    pub deviceId: i32,
-    pub source: i32,
-    pub action: i32,
-    pub eventTime: i64,
-    pub downTime: i64,
-    pub flags: i32,
-    pub metaState: i32,
-    pub modifiers: i32,
-    pub repeatCount: i32,
-    pub keyCode: i32,
-    pub scanCode: i32,
+pub struct GameTextInput {
+    _unused: [u8; 0],
+}
+extern "C" {
+    #[doc = " Initialize the GameTextInput library.\n If called twice without GameTextInput_destroy being called, the same pointer\n will be returned and a warning will be issued.\n @param env A JNI env valid on the calling thread.\n @param max_string_size The maximum length of a string that can be edited. If\n zero, the maximum defaults to 65536 bytes. A buffer of this size is allocated\n at initialization.\n @return A handle to the library."]
+    pub fn GameTextInput_init(env: *mut JNIEnv, max_string_size: u32) -> *mut GameTextInput;
+}
+extern "C" {
+    #[doc = " When using GameTextInput, you need to create a gametextinput.InputConnection\n on the Java side and pass it using this function to the library, unless using\n GameActivity in which case this will be done for you. See the GameActivity\n source code or GameTextInput samples for examples of usage.\n @param input A valid GameTextInput library handle.\n @param inputConnection A gametextinput.InputConnection object."]
+    pub fn GameTextInput_setInputConnection(input: *mut GameTextInput, inputConnection: jobject);
+}
+extern "C" {
+    #[doc = " Unless using GameActivity, it is required to call this function from your\n Java gametextinput.Listener.stateChanged method to convert eventState and\n trigger any event callbacks. When using GameActivity, this does not need to\n be called as event processing is handled by the Activity.\n @param input A valid GameTextInput library handle.\n @param eventState A Java gametextinput.State object."]
+    pub fn GameTextInput_processEvent(input: *mut GameTextInput, eventState: jobject);
+}
+extern "C" {
+    #[doc = " Free any resources owned by the GameTextInput library.\n Any subsequent calls to the library will fail until GameTextInput_init is\n called again.\n @param input A valid GameTextInput library handle."]
+    pub fn GameTextInput_destroy(input: *mut GameTextInput);
+}
+pub const ShowImeFlags_SHOW_IME_UNDEFINED: ShowImeFlags = 0;
+pub const ShowImeFlags_SHOW_IMPLICIT: ShowImeFlags = 1;
+pub const ShowImeFlags_SHOW_FORCED: ShowImeFlags = 2;
+#[doc = " Flags to be passed to GameTextInput_showIme."]
+pub type ShowImeFlags = ::std::os::raw::c_uint;
+extern "C" {
+    #[doc = " Show the IME. Calls InputMethodManager.showSoftInput().\n @param input A valid GameTextInput library handle.\n @param flags Defined in ShowImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
+    pub fn GameTextInput_showIme(input: *mut GameTextInput, flags: u32);
+}
+pub const HideImeFlags_HIDE_IME_UNDEFINED: HideImeFlags = 0;
+pub const HideImeFlags_HIDE_IMPLICIT_ONLY: HideImeFlags = 1;
+pub const HideImeFlags_HIDE_NOT_ALWAYS: HideImeFlags = 2;
+#[doc = " Flags to be passed to GameTextInput_hideIme."]
+pub type HideImeFlags = ::std::os::raw::c_uint;
+extern "C" {
+    #[doc = " Show the IME. Calls InputMethodManager.hideSoftInputFromWindow().\n @param input A valid GameTextInput library handle.\n @param flags Defined in HideImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
+    pub fn GameTextInput_hideIme(input: *mut GameTextInput, flags: u32);
+}
+extern "C" {
+    #[doc = " Restarts the input method. Calls InputMethodManager.restartInput().\n @param input A valid GameTextInput library handle."]
+    pub fn GameTextInput_restartInput(input: *mut GameTextInput);
+}
+extern "C" {
+    #[doc = " Call a callback with the current GameTextInput state, which may have been\n modified by changes in the IME and calls to GameTextInput_setState. We use a\n callback rather than returning the state in order to simplify ownership of\n text_UTF8 strings. These strings are only valid during the calling of the\n callback.\n @param input A valid GameTextInput library handle.\n @param callback A function that will be called with valid state.\n @param context Context used by the callback."]
+    pub fn GameTextInput_getState(
+        input: *mut GameTextInput,
+        callback: GameTextInputGetStateCallback,
+        context: *mut ::std::os::raw::c_void,
+    );
+}
+extern "C" {
+    #[doc = " Set the current GameTextInput state. This state is reflected to any active\n IME.\n @param input A valid GameTextInput library handle.\n @param state The state to set. Ownership is maintained by the caller and must\n remain valid for the duration of the call."]
+    pub fn GameTextInput_setState(input: *mut GameTextInput, state: *const GameTextInputState);
+}
+#[doc = " Type of the callback needed by GameTextInput_setEventCallback that will be\n called every time the IME state changes.\n @param context User-defined context set in GameTextInput_setEventCallback.\n @param current_state Current IME state, owned by the library and valid during\n the callback."]
+pub type GameTextInputEventCallback = ::std::option::Option<
+    unsafe extern "C" fn(
+        context: *mut ::std::os::raw::c_void,
+        current_state: *const GameTextInputState,
+    ),
+>;
+extern "C" {
+    #[doc = " Optionally set a callback to be called whenever the IME state changes.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME state changes.\n @param context Context passed as first argument to the callback."]
+    pub fn GameTextInput_setEventCallback(
+        input: *mut GameTextInput,
+        callback: GameTextInputEventCallback,
+        context: *mut ::std::os::raw::c_void,
+    );
+}
+#[doc = " Type of the callback needed by GameTextInput_setImeInsetsCallback that will\n be called every time the IME window insets change.\n @param context User-defined context set in\n GameTextInput_setImeWIndowInsetsCallback.\n @param current_insets Current IME insets, owned by the library and valid\n during the callback."]
+pub type GameTextInputImeInsetsCallback = ::std::option::Option<
+    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, current_insets: *const ARect),
+>;
+extern "C" {
+    #[doc = " Optionally set a callback to be called whenever the IME insets change.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME insets change.\n @param context Context passed as first argument to the callback."]
+    pub fn GameTextInput_setImeInsetsCallback(
+        input: *mut GameTextInput,
+        callback: GameTextInputImeInsetsCallback,
+        context: *mut ::std::os::raw::c_void,
+    );
+}
+extern "C" {
+    #[doc = " Get the current window insets for the IME.\n @param input A valid GameTextInput library handle.\n @param insets Filled with the current insets by this function."]
+    pub fn GameTextInput_getImeInsets(input: *const GameTextInput, insets: *mut ARect);
+}
+extern "C" {
+    #[doc = " Unless using GameActivity, it is required to call this function from your\n Java gametextinput.Listener.onImeInsetsChanged method to\n trigger any event callbacks. When using GameActivity, this does not need to\n be called as insets processing is handled by the Activity.\n @param input A valid GameTextInput library handle.\n @param eventState A Java gametextinput.State object."]
+    pub fn GameTextInput_processImeInsets(input: *mut GameTextInput, insets: *const ARect);
+}
+extern "C" {
+    #[doc = " Convert a GameTextInputState struct to a Java gametextinput.State object.\n Don't forget to delete the returned Java local ref when you're done.\n @param input A valid GameTextInput library handle.\n @param state Input state to convert.\n @return A Java object of class gametextinput.State. The caller is required to\n delete this local reference."]
+    pub fn GameTextInputState_toJava(
+        input: *const GameTextInput,
+        state: *const GameTextInputState,
+    ) -> jobject;
+}
+extern "C" {
+    #[doc = " Convert from a Java gametextinput.State object into a C GameTextInputState\n struct.\n @param input A valid GameTextInput library handle.\n @param state A Java gametextinput.State object.\n @param callback A function called with the C struct, valid for the duration\n of the call.\n @param context Context passed to the callback."]
+    pub fn GameTextInputState_fromJava(
+        input: *const GameTextInput,
+        state: jobject,
+        callback: GameTextInputGetStateCallback,
+        context: *mut ::std::os::raw::c_void,
+    );
+}
+#[doc = " This structure defines the native side of an android.app.GameActivity.\n It is created by the framework, and handed to the application's native\n code as it is being launched."]
+#[repr(C)]
+pub struct GameActivity {
+    #[doc = " Pointer to the callback function table of the native application.\n You can set the functions here to your own callbacks.  The callbacks\n pointer itself here should not be changed; it is allocated and managed\n for you by the framework."]
+    pub callbacks: *mut GameActivityCallbacks,
+    #[doc = " The global handle on the process's Java VM."]
+    pub vm: *mut JavaVM,
+    #[doc = " JNI context for the main thread of the app.  Note that this field\n can ONLY be used from the main thread of the process; that is, the\n thread that calls into the GameActivityCallbacks."]
+    pub env: *mut JNIEnv,
+    #[doc = " The GameActivity object handle."]
+    pub javaGameActivity: jobject,
+    #[doc = " Path to this application's internal data directory."]
+    pub internalDataPath: *const ::std::os::raw::c_char,
+    #[doc = " Path to this application's external (removable/mountable) data directory."]
+    pub externalDataPath: *const ::std::os::raw::c_char,
+    #[doc = " The platform's SDK version code."]
+    pub sdkVersion: i32,
+    #[doc = " This is the native instance of the application.  It is not used by\n the framework, but can be set by the application to its own instance\n state."]
+    pub instance: *mut ::std::os::raw::c_void,
+    #[doc = " Pointer to the Asset Manager instance for the application.  The\n application uses this to access binary assets bundled inside its own .apk\n file."]
+    pub assetManager: *mut AAssetManager,
+    #[doc = " Available starting with Honeycomb: path to the directory containing\n the application's OBB files (if any).  If the app doesn't have any\n OBB files, this directory may not exist."]
+    pub obbPath: *const ::std::os::raw::c_char,
 }
 #[test]
-fn bindgen_test_layout_GameActivityKeyEvent() {
+fn bindgen_test_layout_GameActivity() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivity> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<GameActivityKeyEvent>(),
-        52usize,
-        concat!("Size of: ", stringify!(GameActivityKeyEvent))
+        ::std::mem::size_of::<GameActivity>(),
+        40usize,
+        concat!("Size of: ", stringify!(GameActivity))
     );
     assert_eq!(
-        ::std::mem::align_of::<GameActivityKeyEvent>(),
+        ::std::mem::align_of::<GameActivity>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameActivityKeyEvent))
+        concat!("Alignment of ", stringify!(GameActivity))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).deviceId as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).callbacks) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(deviceId)
+            stringify!(callbacks)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).source as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).vm) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(source)
+            stringify!(vm)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).action as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).env) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(action)
+            stringify!(env)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).eventTime as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).javaGameActivity) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(eventTime)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).downTime as *const _ as usize },
-        20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(downTime)
+            stringify!(javaGameActivity)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).flags as *const _ as usize },
-        28usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).internalDataPath) as usize - ptr as usize },
+        16usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(flags)
+            stringify!(internalDataPath)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).metaState as *const _ as usize },
-        32usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).externalDataPath) as usize - ptr as usize },
+        20usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(metaState)
+            stringify!(externalDataPath)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).modifiers as *const _ as usize },
-        36usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).sdkVersion) as usize - ptr as usize },
+        24usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(modifiers)
+            stringify!(sdkVersion)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityKeyEvent>())).repeatCount as *const _ as usize
-        },
-        40usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).instance) as usize - ptr as usize },
+        28usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(repeatCount)
+            stringify!(instance)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).keyCode as *const _ as usize },
-        44usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).assetManager) as usize - ptr as usize },
+        32usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(keyCode)
+            stringify!(assetManager)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).scanCode as *const _ as usize },
-        48usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).obbPath) as usize - ptr as usize },
+        36usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(scanCode)
+            stringify!(obbPath)
         )
     );
 }
-#[doc = " A function the user should call from their callback with the data, its length"]
-#[doc = " and the library- supplied context."]
+#[doc = " A function the user should call from their callback with the data, its length\n and the library- supplied context."]
 pub type SaveInstanceStateRecallback = ::std::option::Option<
     unsafe extern "C" fn(
         bytes: *const ::std::os::raw::c_char,
@@ -3216,18 +3172,11 @@ pub type SaveInstanceStateRecallback = ::std::option::Option<
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct GameActivityCallbacks {
-    #[doc = " GameActivity has started.  See Java documentation for Activity.onStart()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has started.  See Java documentation for Activity.onStart()\n for more information."]
     pub onStart: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " GameActivity has resumed.  See Java documentation for Activity.onResume()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has resumed.  See Java documentation for Activity.onResume()\n for more information."]
     pub onResume: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " The framework is asking GameActivity to save its current instance state."]
-    #[doc = " See the Java documentation for Activity.onSaveInstanceState() for more"]
-    #[doc = " information. The user should call the recallback with their data, its"]
-    #[doc = " length and the provided context; they retain ownership of the data. Note"]
-    #[doc = " that the saved state will be persisted, so it can not contain any active"]
-    #[doc = " entities (pointers to memory, file descriptors, etc)."]
+    #[doc = " The framework is asking GameActivity to save its current instance state.\n See the Java documentation for Activity.onSaveInstanceState() for more\n information. The user should call the recallback with their data, its\n length and the provided context; they retain ownership of the data. Note\n that the saved state will be persisted, so it can not contain any active\n entities (pointers to memory, file descriptors, etc)."]
     pub onSaveInstanceState: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
@@ -3235,27 +3184,20 @@ pub struct GameActivityCallbacks {
             context: *mut ::std::os::raw::c_void,
         ),
     >,
-    #[doc = " GameActivity has paused.  See Java documentation for Activity.onPause()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has paused.  See Java documentation for Activity.onPause()\n for more information."]
     pub onPause: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " GameActivity has stopped.  See Java documentation for Activity.onStop()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has stopped.  See Java documentation for Activity.onStop()\n for more information."]
     pub onStop: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " GameActivity is being destroyed.  See Java documentation for"]
-    #[doc = " Activity.onDestroy() for more information."]
+    #[doc = " GameActivity is being destroyed.  See Java documentation for\n Activity.onDestroy() for more information."]
     pub onDestroy: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " Focus has changed in this GameActivity's window.  This is often used,"]
-    #[doc = " for example, to pause a game when it loses input focus."]
+    #[doc = " Focus has changed in this GameActivity's window.  This is often used,\n for example, to pause a game when it loses input focus."]
     pub onWindowFocusChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity, hasFocus: bool)>,
-    #[doc = " The drawing window for this native activity has been created.  You"]
-    #[doc = " can use the given native window object to start drawing."]
+    #[doc = " The drawing window for this native activity has been created.  You\n can use the given native window object to start drawing."]
     pub onNativeWindowCreated: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The drawing window for this native activity has been resized.  You should"]
-    #[doc = " retrieve the new size from the window and ensure that your rendering in"]
-    #[doc = " it now matches."]
+    #[doc = " The drawing window for this native activity has been resized.  You should\n retrieve the new size from the window and ensure that your rendering in\n it now matches."]
     pub onNativeWindowResized: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
@@ -3264,77 +3206,62 @@ pub struct GameActivityCallbacks {
             newHeight: i32,
         ),
     >,
-    #[doc = " The drawing window for this native activity needs to be redrawn.  To"]
-    #[doc = " avoid transient artifacts during screen changes (such resizing after"]
-    #[doc = " rotation), applications should not return from this function until they"]
-    #[doc = " have finished drawing their window in its current state."]
+    #[doc = " The drawing window for this native activity needs to be redrawn.  To\n avoid transient artifacts during screen changes (such resizing after\n rotation), applications should not return from this function until they\n have finished drawing their window in its current state."]
     pub onNativeWindowRedrawNeeded: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The drawing window for this native activity is going to be destroyed."]
-    #[doc = " You MUST ensure that you do not touch the window object after returning"]
-    #[doc = " from this function: in the common case of drawing to the window from"]
-    #[doc = " another thread, that means the implementation of this callback must"]
-    #[doc = " properly synchronize with the other thread to stop its drawing before"]
-    #[doc = " returning from here."]
+    #[doc = " The drawing window for this native activity is going to be destroyed.\n You MUST ensure that you do not touch the window object after returning\n from this function: in the common case of drawing to the window from\n another thread, that means the implementation of this callback must\n properly synchronize with the other thread to stop its drawing before\n returning from here."]
     pub onNativeWindowDestroyed: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The current device AConfiguration has changed.  The new configuration can"]
-    #[doc = " be retrieved from assetManager."]
+    #[doc = " The current device AConfiguration has changed.  The new configuration can\n be retrieved from assetManager."]
     pub onConfigurationChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " The system is running low on memory.  Use this callback to release"]
-    #[doc = " resources you do not need, to help the system avoid killing more"]
-    #[doc = " important processes."]
+    #[doc = " The system is running low on memory.  Use this callback to release\n resources you do not need, to help the system avoid killing more\n important processes."]
     pub onTrimMemory: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, level: ::std::os::raw::c_int),
     >,
-    #[doc = " Callback called for every MotionEvent done on the GameActivity"]
-    #[doc = " SurfaceView. Ownership of `event` is maintained by the library and it is"]
-    #[doc = " only valid during the callback."]
+    #[doc = " Callback called for every MotionEvent done on the GameActivity\n SurfaceView. Ownership of `event` is maintained by the library and it is\n only valid during the callback."]
     pub onTouchEvent: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
             event: *const GameActivityMotionEvent,
-            historical: *const GameActivityHistoricalPointerAxes,
-            historicalLen: ::std::os::raw::c_int,
         ) -> bool,
     >,
-    #[doc = " Callback called for every key down event on the GameActivity SurfaceView."]
-    #[doc = " Ownership of `event` is maintained by the library and it is only valid"]
-    #[doc = " during the callback."]
+    #[doc = " Callback called for every key down event on the GameActivity SurfaceView.\n Ownership of `event` is maintained by the library and it is only valid\n during the callback."]
     pub onKeyDown: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
             event: *const GameActivityKeyEvent,
         ) -> bool,
     >,
-    #[doc = " Callback called for every key up event on the GameActivity SurfaceView."]
-    #[doc = " Ownership of `event` is maintained by the library and it is only valid"]
-    #[doc = " during the callback."]
+    #[doc = " Callback called for every key up event on the GameActivity SurfaceView.\n Ownership of `event` is maintained by the library and it is only valid\n during the callback."]
     pub onKeyUp: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
             event: *const GameActivityKeyEvent,
         ) -> bool,
     >,
-    #[doc = " Callback called for every soft-keyboard text input event."]
-    #[doc = " Ownership of `state` is maintained by the library and it is only valid"]
-    #[doc = " during the callback."]
+    #[doc = " Callback called for every soft-keyboard text input event.\n Ownership of `state` is maintained by the library and it is only valid\n during the callback."]
     pub onTextInputEvent: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, state: *const GameTextInputState),
     >,
-    #[doc = " Callback called when WindowInsets of the main app window have changed."]
-    #[doc = " Call GameActivity_getWindowInsets to retrieve the insets themselves."]
+    #[doc = " Callback called when WindowInsets of the main app window have changed.\n Call GameActivity_getWindowInsets to retrieve the insets themselves."]
     pub onWindowInsetsChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
+    #[doc = " Callback called when the rectangle in the window where the content\n should be placed has changed."]
+    pub onContentRectChanged: ::std::option::Option<
+        unsafe extern "C" fn(activity: *mut GameActivity, rect: *const ARect),
+    >,
 }
 #[test]
 fn bindgen_test_layout_GameActivityCallbacks() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityCallbacks> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<GameActivityCallbacks>(),
-        72usize,
+        76usize,
         concat!("Size of: ", stringify!(GameActivityCallbacks))
     );
     assert_eq!(
@@ -3343,7 +3270,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         concat!("Alignment of ", stringify!(GameActivityCallbacks))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onStart as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onStart) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -3353,7 +3280,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onResume as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onResume) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -3363,10 +3290,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onSaveInstanceState as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onSaveInstanceState) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -3376,7 +3300,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onPause as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onPause) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -3386,7 +3310,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onStop as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onStop) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -3396,7 +3320,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onDestroy as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onDestroy) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -3406,10 +3330,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onWindowFocusChanged as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onWindowFocusChanged) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -3419,10 +3340,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowCreated as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowCreated) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -3432,10 +3350,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowResized as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowResized) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -3445,10 +3360,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowRedrawNeeded as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowRedrawNeeded) as usize - ptr as usize },
         36usize,
         concat!(
             "Offset of field: ",
@@ -3458,10 +3370,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowDestroyed as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowDestroyed) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -3471,10 +3380,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onConfigurationChanged as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onConfigurationChanged) as usize - ptr as usize },
         44usize,
         concat!(
             "Offset of field: ",
@@ -3484,9 +3390,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onTrimMemory as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onTrimMemory) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -3496,9 +3400,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onTouchEvent as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onTouchEvent) as usize - ptr as usize },
         52usize,
         concat!(
             "Offset of field: ",
@@ -3508,7 +3410,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onKeyDown as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onKeyDown) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -3518,7 +3420,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onKeyUp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onKeyUp) as usize - ptr as usize },
         60usize,
         concat!(
             "Offset of field: ",
@@ -3528,9 +3430,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onTextInputEvent as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onTextInputEvent) as usize - ptr as usize },
         64usize,
         concat!(
             "Offset of field: ",
@@ -3540,10 +3440,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onWindowInsetsChanged as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onWindowInsetsChanged) as usize - ptr as usize },
         68usize,
         concat!(
             "Offset of field: ",
@@ -3552,269 +3449,124 @@ fn bindgen_test_layout_GameActivityCallbacks() {
             stringify!(onWindowInsetsChanged)
         )
     );
-}
-extern "C" {
-    #[doc = " \\brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`."]
-    #[doc = ""]
-    #[doc = " This is done automatically by the GameActivity: see `onTouchEvent` to set"]
-    #[doc = " a callback to consume the received events."]
-    #[doc = " This function can be used if you re-implement events handling in your own"]
-    #[doc = " activity. On return, the out_event->historicalStart will be zero, and should"]
-    #[doc = " be updated to index into whatever buffer out_historical is copied."]
-    #[doc = " On return the length of out_historical is"]
-    #[doc = " (out_event->pointerCount x out_event->historicalCount) and is in a"]
-    #[doc = " pointer-major order (i.e. all axis for a pointer are contiguous)"]
-    #[doc = " Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityMotionEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityMotionEvent,
-        out_historical: *mut GameActivityHistoricalPointerAxes,
-    ) -> ::std::os::raw::c_int;
-}
-extern "C" {
-    #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`."]
-    #[doc = ""]
-    #[doc = " This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`"]
-    #[doc = " to set a callback to consume the received events."]
-    #[doc = " This function can be used if you re-implement events handling in your own"]
-    #[doc = " activity."]
-    #[doc = " Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityKeyEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityKeyEvent,
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).onContentRectChanged) as usize - ptr as usize },
+        72usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityCallbacks),
+            "::",
+            stringify!(onContentRectChanged)
+        )
     );
 }
-#[doc = " This is the function that must be in the native code to instantiate the"]
-#[doc = " application's native activity.  It is called with the activity instance (see"]
-#[doc = " above); if the code is being instantiated from a previously saved instance,"]
-#[doc = " the savedState will be non-NULL and point to the saved data.  You must make"]
-#[doc = " any copy of this data you need -- it will be released after you return from"]
-#[doc = " this function."]
+#[doc = " This is the function that must be in the native code to instantiate the\n application's native activity.  It is called with the activity instance (see\n above); if the code is being instantiated from a previously saved instance,\n the savedState will be non-NULL and point to the saved data.  You must make\n any copy of this data you need -- it will be released after you return from\n this function."]
 pub type GameActivity_createFunc = ::std::option::Option<
     unsafe extern "C" fn(
         activity: *mut GameActivity,
         savedState: *mut ::std::os::raw::c_void,
-        savedStateSize: size_t,
+        savedStateSize: usize,
     ),
 >;
 extern "C" {
-    #[doc = " Finish the given activity.  Its finish() method will be called, causing it"]
-    #[doc = " to be stopped and destroyed.  Note that this method can be called from"]
-    #[doc = " *any* thread; it will send a message to the main thread of the process"]
-    #[doc = " where the Java finish call will take place."]
+    #[doc = " Finish the given activity.  Its finish() method will be called, causing it\n to be stopped and destroyed.  Note that this method can be called from\n *any* thread; it will send a message to the main thread of the process\n where the Java finish call will take place."]
     pub fn GameActivity_finish(activity: *mut GameActivity);
 }
-#[doc = " As long as this window is visible to the user, allow the lock"]
-#[doc = " screen to activate while the screen is on.  This can be used"]
-#[doc = " independently, or in combination with {@link"]
-#[doc = " GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} and/or {@link"]
-#[doc = " GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}"]
+#[doc = " As long as this window is visible to the user, allow the lock\n screen to activate while the screen is on.  This can be used\n independently, or in combination with {@link\n GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} and/or {@link\n GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}"]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_ALLOW_LOCK_WHILE_SCREEN_ON:
     GameActivitySetWindowFlags = 1;
 #[doc = " Everything behind this window will be dimmed."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DIM_BEHIND: GameActivitySetWindowFlags = 2;
-#[doc = " Blur everything behind this window."]
-#[doc = " @deprecated Blurring is no longer supported."]
+#[doc = " Blur everything behind this window.\n @deprecated Blurring is no longer supported."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_BLUR_BEHIND: GameActivitySetWindowFlags = 4;
-#[doc = " This window won't ever get key input focus, so the"]
-#[doc = " user can not send key or other button events to it.  Those will"]
-#[doc = " instead go to whatever focusable window is behind it.  This flag"]
-#[doc = " will also enable {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL} whether or not"]
-#[doc = " that is explicitly set."]
-#[doc = ""]
-#[doc = " Setting this flag also implies that the window will not need to"]
-#[doc = " interact with"]
-#[doc = " a soft input method, so it will be Z-ordered and positioned"]
-#[doc = " independently of any active input method (typically this means it"]
-#[doc = " gets Z-ordered on top of the input method, so it can use the full"]
-#[doc = " screen for its content and cover the input method if needed.  You"]
-#[doc = " can use {@link GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM} to modify this"]
-#[doc = " behavior."]
+#[doc = " This window won't ever get key input focus, so the\n user can not send key or other button events to it.  Those will\n instead go to whatever focusable window is behind it.  This flag\n will also enable {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL} whether or not\n that is explicitly set.\n\n Setting this flag also implies that the window will not need to\n interact with\n a soft input method, so it will be Z-ordered and positioned\n independently of any active input method (typically this means it\n gets Z-ordered on top of the input method, so it can use the full\n screen for its content and cover the input method if needed.  You\n can use {@link GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM} to modify this\n behavior."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_NOT_FOCUSABLE: GameActivitySetWindowFlags =
     8;
 #[doc = " This window can never receive touch events."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_NOT_TOUCHABLE: GameActivitySetWindowFlags =
     16;
-#[doc = " Even when this window is focusable (its"]
-#[doc = " {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set), allow any pointer"]
-#[doc = " events outside of the window to be sent to the windows behind it."]
-#[doc = " Otherwise it will consume all pointer events itself, regardless of"]
-#[doc = " whether they are inside of the window."]
+#[doc = " Even when this window is focusable (its\n {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set), allow any pointer\n events outside of the window to be sent to the windows behind it.\n Otherwise it will consume all pointer events itself, regardless of\n whether they are inside of the window."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL: GameActivitySetWindowFlags =
     32;
-#[doc = " When set, if the device is asleep when the touch"]
-#[doc = " screen is pressed, you will receive this first touch event.  Usually"]
-#[doc = " the first touch event is consumed by the system since the user can"]
-#[doc = " not see what they are pressing on."]
-#[doc = ""]
-#[doc = " @deprecated This flag has no effect."]
+#[doc = " When set, if the device is asleep when the touch\n screen is pressed, you will receive this first touch event.  Usually\n the first touch event is consumed by the system since the user can\n not see what they are pressing on.\n\n @deprecated This flag has no effect."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_TOUCHABLE_WHEN_WAKING:
     GameActivitySetWindowFlags = 64;
-#[doc = " As long as this window is visible to the user, keep"]
-#[doc = " the device's screen turned on and bright."]
+#[doc = " As long as this window is visible to the user, keep\n the device's screen turned on and bright."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_KEEP_SCREEN_ON: GameActivitySetWindowFlags =
     128;
-#[doc = " Place the window within the entire screen, ignoring"]
-#[doc = " decorations around the border (such as the status bar).  The"]
-#[doc = " window must correctly position its contents to take the screen"]
-#[doc = " decoration into account."]
+#[doc = " Place the window within the entire screen, ignoring\n decorations around the border (such as the status bar).  The\n window must correctly position its contents to take the screen\n decoration into account."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN:
     GameActivitySetWindowFlags = 256;
 #[doc = " Allows the window to extend outside of the screen."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_LAYOUT_NO_LIMITS:
     GameActivitySetWindowFlags = 512;
-#[doc = " Hide all screen decorations (such as the status"]
-#[doc = " bar) while this window is displayed.  This allows the window to"]
-#[doc = " use the entire display space for itself -- the status bar will"]
-#[doc = " be hidden when an app window with this flag set is on the top"]
-#[doc = " layer. A fullscreen window will ignore a value of {@link"]
-#[doc = " GAMEACTIVITY_SOFT_INPUT_ADJUST_RESIZE}; the window will stay"]
-#[doc = " fullscreen and will not resize."]
+#[doc = " Hide all screen decorations (such as the status\n bar) while this window is displayed.  This allows the window to\n use the entire display space for itself -- the status bar will\n be hidden when an app window with this flag set is on the top\n layer. A fullscreen window will ignore a value of {@link\n GAMEACTIVITY_SOFT_INPUT_ADJUST_RESIZE}; the window will stay\n fullscreen and will not resize."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_FULLSCREEN: GameActivitySetWindowFlags =
     1024;
-#[doc = " Override {@link GAMEACTIVITY_FLAG_FULLSCREEN} and force the"]
-#[doc = " screen decorations (such as the status bar) to be shown."]
+#[doc = " Override {@link GAMEACTIVITY_FLAG_FULLSCREEN} and force the\n screen decorations (such as the status bar) to be shown."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_FORCE_NOT_FULLSCREEN:
     GameActivitySetWindowFlags = 2048;
-#[doc = " Turn on dithering when compositing this window to"]
-#[doc = " the screen."]
-#[doc = " @deprecated This flag is no longer used."]
+#[doc = " Turn on dithering when compositing this window to\n the screen.\n @deprecated This flag is no longer used."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DITHER: GameActivitySetWindowFlags = 4096;
-#[doc = " Treat the content of the window as secure, preventing"]
-#[doc = " it from appearing in screenshots or from being viewed on non-secure"]
-#[doc = " displays."]
+#[doc = " Treat the content of the window as secure, preventing\n it from appearing in screenshots or from being viewed on non-secure\n displays."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SECURE: GameActivitySetWindowFlags = 8192;
-#[doc = " A special mode where the layout parameters are used"]
-#[doc = " to perform scaling of the surface when it is composited to the"]
-#[doc = " screen."]
+#[doc = " A special mode where the layout parameters are used\n to perform scaling of the surface when it is composited to the\n screen."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SCALED: GameActivitySetWindowFlags = 16384;
-#[doc = " Intended for windows that will often be used when the user is"]
-#[doc = " holding the screen against their face, it will aggressively"]
-#[doc = " filter the event stream to prevent unintended presses in this"]
-#[doc = " situation that may not be desired for a particular window, when"]
-#[doc = " such an event stream is detected, the application will receive"]
-#[doc = " a {@link AMOTION_EVENT_ACTION_CANCEL} to indicate this so"]
-#[doc = " applications can handle this accordingly by taking no action on"]
-#[doc = " the event until the finger is released."]
+#[doc = " Intended for windows that will often be used when the user is\n holding the screen against their face, it will aggressively\n filter the event stream to prevent unintended presses in this\n situation that may not be desired for a particular window, when\n such an event stream is detected, the application will receive\n a {@link AMOTION_EVENT_ACTION_CANCEL} to indicate this so\n applications can handle this accordingly by taking no action on\n the event until the finger is released."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_IGNORE_CHEEK_PRESSES:
     GameActivitySetWindowFlags = 32768;
-#[doc = " A special option only for use in combination with"]
-#[doc = " {@link GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN}.  When requesting layout in"]
-#[doc = " the screen your window may appear on top of or behind screen decorations"]
-#[doc = " such as the status bar.  By also including this flag, the window"]
-#[doc = " manager will report the inset rectangle needed to ensure your"]
-#[doc = " content is not covered by screen decorations."]
+#[doc = " A special option only for use in combination with\n {@link GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN}.  When requesting layout in\n the screen your window may appear on top of or behind screen decorations\n such as the status bar.  By also including this flag, the window\n manager will report the inset rectangle needed to ensure your\n content is not covered by screen decorations."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_LAYOUT_INSET_DECOR:
     GameActivitySetWindowFlags = 65536;
-#[doc = " Invert the state of {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} with"]
-#[doc = " respect to how this window interacts with the current method."]
-#[doc = " That is, if FLAG_NOT_FOCUSABLE is set and this flag is set,"]
-#[doc = " then the window will behave as if it needs to interact with the"]
-#[doc = " input method and thus be placed behind/away from it; if {@link"]
-#[doc = " GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set and this flag is set,"]
-#[doc = " then the window will behave as if it doesn't need to interact"]
-#[doc = " with the input method and can be placed to use more space and"]
-#[doc = " cover the input method."]
+#[doc = " Invert the state of {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} with\n respect to how this window interacts with the current method.\n That is, if FLAG_NOT_FOCUSABLE is set and this flag is set,\n then the window will behave as if it needs to interact with the\n input method and thus be placed behind/away from it; if {@link\n GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set and this flag is set,\n then the window will behave as if it doesn't need to interact\n with the input method and can be placed to use more space and\n cover the input method."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM:
     GameActivitySetWindowFlags = 131072;
-#[doc = " If you have set {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL}, you"]
-#[doc = " can set this flag to receive a single special MotionEvent with"]
-#[doc = " the action"]
-#[doc = " {@link AMOTION_EVENT_ACTION_OUTSIDE} for"]
-#[doc = " touches that occur outside of your window.  Note that you will not"]
-#[doc = " receive the full down/move/up gesture, only the location of the"]
-#[doc = " first down as an {@link AMOTION_EVENT_ACTION_OUTSIDE}."]
+#[doc = " If you have set {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL}, you\n can set this flag to receive a single special MotionEvent with\n the action\n {@link AMOTION_EVENT_ACTION_OUTSIDE} for\n touches that occur outside of your window.  Note that you will not\n receive the full down/move/up gesture, only the location of the\n first down as an {@link AMOTION_EVENT_ACTION_OUTSIDE}."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_WATCH_OUTSIDE_TOUCH:
     GameActivitySetWindowFlags = 262144;
-#[doc = " Special flag to let windows be shown when the screen"]
-#[doc = " is locked. This will let application windows take precedence over"]
-#[doc = " key guard or any other lock screens. Can be used with"]
-#[doc = " {@link GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} to turn screen on and display"]
-#[doc = " windows directly before showing the key guard window.  Can be used with"]
-#[doc = " {@link GAMEACTIVITY_FLAG_DISMISS_KEYGUARD} to automatically fully"]
-#[doc = " dismisss non-secure keyguards.  This flag only applies to the top-most"]
-#[doc = " full-screen window."]
+#[doc = " Special flag to let windows be shown when the screen\n is locked. This will let application windows take precedence over\n key guard or any other lock screens. Can be used with\n {@link GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} to turn screen on and display\n windows directly before showing the key guard window.  Can be used with\n {@link GAMEACTIVITY_FLAG_DISMISS_KEYGUARD} to automatically fully\n dismisss non-secure keyguards.  This flag only applies to the top-most\n full-screen window."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED:
     GameActivitySetWindowFlags = 524288;
-#[doc = " Ask that the system wallpaper be shown behind"]
-#[doc = " your window.  The window surface must be translucent to be able"]
-#[doc = " to actually see the wallpaper behind it; this flag just ensures"]
-#[doc = " that the wallpaper surface will be there if this window actually"]
-#[doc = " has translucent regions."]
+#[doc = " Ask that the system wallpaper be shown behind\n your window.  The window surface must be translucent to be able\n to actually see the wallpaper behind it; this flag just ensures\n that the wallpaper surface will be there if this window actually\n has translucent regions."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SHOW_WALLPAPER: GameActivitySetWindowFlags =
     1048576;
-#[doc = " When set as a window is being added or made"]
-#[doc = " visible, once the window has been shown then the system will"]
-#[doc = " poke the power manager's user activity (as if the user had woken"]
-#[doc = " up the device) to turn the screen on."]
+#[doc = " When set as a window is being added or made\n visible, once the window has been shown then the system will\n poke the power manager's user activity (as if the user had woken\n up the device) to turn the screen on."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_TURN_SCREEN_ON: GameActivitySetWindowFlags =
     2097152;
-#[doc = " When set the window will cause the keyguard to"]
-#[doc = " be dismissed, only if it is not a secure lock keyguard.  Because such"]
-#[doc = " a keyguard is not needed for security, it will never re-appear if"]
-#[doc = " the user navigates to another window (in contrast to"]
-#[doc = " {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}, which will only temporarily"]
-#[doc = " hide both secure and non-secure keyguards but ensure they reappear"]
-#[doc = " when the user moves to another UI that doesn't hide them)."]
-#[doc = " If the keyguard is currently active and is secure (requires an"]
-#[doc = " unlock pattern) than the user will still need to confirm it before"]
-#[doc = " seeing this window, unless {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED} has"]
-#[doc = " also been set."]
+#[doc = " When set the window will cause the keyguard to\n be dismissed, only if it is not a secure lock keyguard.  Because such\n a keyguard is not needed for security, it will never re-appear if\n the user navigates to another window (in contrast to\n {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}, which will only temporarily\n hide both secure and non-secure keyguards but ensure they reappear\n when the user moves to another UI that doesn't hide them).\n If the keyguard is currently active and is secure (requires an\n unlock pattern) than the user will still need to confirm it before\n seeing this window, unless {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED} has\n also been set."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DISMISS_KEYGUARD:
     GameActivitySetWindowFlags = 4194304;
-#[doc = " Flags for GameActivity_setWindowFlags,"]
-#[doc = " as per the Java API at android.view.WindowManager.LayoutParams."]
+#[doc = " Flags for GameActivity_setWindowFlags,\n as per the Java API at android.view.WindowManager.LayoutParams."]
 pub type GameActivitySetWindowFlags = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Change the window flags of the given activity.  Calls getWindow().setFlags()"]
-    #[doc = " of the given activity."]
-    #[doc = " Note that some flags must be set before the window decoration is created,"]
-    #[doc = " see"]
-    #[doc = " https://developer.android.com/reference/android/view/Window#setFlags(int,%20int)."]
-    #[doc = " Note also that this method can be called from"]
-    #[doc = " *any* thread; it will send a message to the main thread of the process"]
-    #[doc = " where the Java finish call will take place."]
+    #[doc = " Change the window flags of the given activity.  Calls getWindow().setFlags()\n of the given activity.\n Note that some flags must be set before the window decoration is created,\n see\n https://developer.android.com/reference/android/view/Window#setFlags(int,%20int).\n Note also that this method can be called from\n *any* thread; it will send a message to the main thread of the process\n where the Java finish call will take place."]
     pub fn GameActivity_setWindowFlags(
         activity: *mut GameActivity,
         addFlags: u32,
         removeFlags: u32,
     );
 }
-#[doc = " Implicit request to show the input window, not as the result"]
-#[doc = " of a direct request by the user."]
+#[doc = " Implicit request to show the input window, not as the result\n of a direct request by the user."]
 pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT:
     GameActivityShowSoftInputFlags = 1;
-#[doc = " The user has forced the input method open (such as by"]
-#[doc = " long-pressing menu) so it should not be closed until they"]
-#[doc = " explicitly do so."]
+#[doc = " The user has forced the input method open (such as by\n long-pressing menu) so it should not be closed until they\n explicitly do so."]
 pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED:
     GameActivityShowSoftInputFlags = 2;
-#[doc = " Flags for GameActivity_showSoftInput; see the Java InputMethodManager"]
-#[doc = " API for documentation."]
+#[doc = " Flags for GameActivity_showSoftInput; see the Java InputMethodManager\n API for documentation."]
 pub type GameActivityShowSoftInputFlags = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Show the IME while in the given activity.  Calls"]
-    #[doc = " InputMethodManager.showSoftInput() for the given activity.  Note that this"]
-    #[doc = " method can be called from *any* thread; it will send a message to the main"]
-    #[doc = " thread of the process where the Java call will take place."]
+    #[doc = " Show the IME while in the given activity.  Calls\n InputMethodManager.showSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java call will take place."]
     pub fn GameActivity_showSoftInput(activity: *mut GameActivity, flags: u32);
 }
 extern "C" {
-    #[doc = " Set the text entry state (see documentation of the GameTextInputState struct"]
-    #[doc = " in the Game Text Input library reference)."]
-    #[doc = ""]
-    #[doc = " Ownership of the state is maintained by the caller."]
+    #[doc = " Set the text entry state (see documentation of the GameTextInputState struct\n in the Game Text Input library reference).\n\n Ownership of the state is maintained by the caller."]
     pub fn GameActivity_setTextInputState(
         activity: *mut GameActivity,
         state: *const GameTextInputState,
     );
 }
 extern "C" {
-    #[doc = " Get the last-received text entry state (see documentation of the"]
-    #[doc = " GameTextInputState struct in the Game Text Input library reference)."]
-    #[doc = ""]
+    #[doc = " Get the last-received text entry state (see documentation of the\n GameTextInputState struct in the Game Text Input library reference).\n"]
     pub fn GameActivity_getTextInputState(
         activity: *mut GameActivity,
         callback: GameTextInputGetStateCallback,
@@ -3825,29 +3577,20 @@ extern "C" {
     #[doc = " Get a pointer to the GameTextInput library instance."]
     pub fn GameActivity_getTextInput(activity: *const GameActivity) -> *mut GameTextInput;
 }
-#[doc = " The soft input window should only be hidden if it was not"]
-#[doc = " explicitly shown by the user."]
+#[doc = " The soft input window should only be hidden if it was not\n explicitly shown by the user."]
 pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_ONLY:
     GameActivityHideSoftInputFlags = 1;
-#[doc = " The soft input window should normally be hidden, unless it was"]
-#[doc = " originally shown with {@link GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED}."]
+#[doc = " The soft input window should normally be hidden, unless it was\n originally shown with {@link GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED}."]
 pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS:
     GameActivityHideSoftInputFlags = 2;
-#[doc = " Flags for GameActivity_hideSoftInput; see the Java InputMethodManager"]
-#[doc = " API for documentation."]
+#[doc = " Flags for GameActivity_hideSoftInput; see the Java InputMethodManager\n API for documentation."]
 pub type GameActivityHideSoftInputFlags = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Hide the IME while in the given activity.  Calls"]
-    #[doc = " InputMethodManager.hideSoftInput() for the given activity.  Note that this"]
-    #[doc = " method can be called from *any* thread; it will send a message to the main"]
-    #[doc = " thread of the process where the Java finish call will take place."]
+    #[doc = " Hide the IME while in the given activity.  Calls\n InputMethodManager.hideSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java finish call will take place."]
     pub fn GameActivity_hideSoftInput(activity: *mut GameActivity, flags: u32);
 }
 extern "C" {
-    #[doc = " Get the current window insets of the particular component. See"]
-    #[doc = " https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
-    #[doc = " for more details."]
-    #[doc = " You can use these insets to influence what you show on the screen."]
+    #[doc = " Get the current window insets of the particular component. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type\n for more details.\n You can use these insets to influence what you show on the screen."]
     pub fn GameActivity_getWindowInsets(
         activity: *mut GameActivity,
         type_: GameCommonInsetsType,
@@ -3855,14 +3598,7 @@ extern "C" {
     );
 }
 extern "C" {
-    #[doc = " Set options on how the IME behaves when it is requested for text input."]
-    #[doc = " See"]
-    #[doc = " https://developer.android.com/reference/android/view/inputmethod/EditorInfo"]
-    #[doc = " for the meaning of inputType, actionId and imeOptions."]
-    #[doc = ""]
-    #[doc = " Note that this function will attach the current thread to the JVM if it is"]
-    #[doc = " not already attached, so the caller must detach the thread from the JVM"]
-    #[doc = " before the thread is destroyed using DetachCurrentThread."]
+    #[doc = " Set options on how the IME behaves when it is requested for text input.\n See\n https://developer.android.com/reference/android/view/inputmethod/EditorInfo\n for the meaning of inputType, actionId and imeOptions.\n\n Note that this function will attach the current thread to the JVM if it is\n not already attached, so the caller must detach the thread from the JVM\n before the thread is destroyed using DetachCurrentThread."]
     pub fn GameActivity_setImeEditorInfo(
         activity: *mut GameActivity,
         inputType: ::std::os::raw::c_int,
@@ -3870,92 +3606,152 @@ extern "C" {
         imeOptions: ::std::os::raw::c_int,
     );
 }
-pub const ACONFIGURATION_ORIENTATION_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_ORIENTATION_PORT: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_ORIENTATION_LAND: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_ORIENTATION_SQUARE: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_TOUCHSCREEN_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_TOUCHSCREEN_NOTOUCH: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_TOUCHSCREEN_STYLUS: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_TOUCHSCREEN_FINGER: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_DENSITY_DEFAULT: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_DENSITY_LOW: ::std::os::raw::c_uint = 120;
-pub const ACONFIGURATION_DENSITY_MEDIUM: ::std::os::raw::c_uint = 160;
-pub const ACONFIGURATION_DENSITY_TV: ::std::os::raw::c_uint = 213;
-pub const ACONFIGURATION_DENSITY_HIGH: ::std::os::raw::c_uint = 240;
-pub const ACONFIGURATION_DENSITY_XHIGH: ::std::os::raw::c_uint = 320;
-pub const ACONFIGURATION_DENSITY_XXHIGH: ::std::os::raw::c_uint = 480;
-pub const ACONFIGURATION_DENSITY_XXXHIGH: ::std::os::raw::c_uint = 640;
-pub const ACONFIGURATION_DENSITY_ANY: ::std::os::raw::c_uint = 65534;
-pub const ACONFIGURATION_DENSITY_NONE: ::std::os::raw::c_uint = 65535;
-pub const ACONFIGURATION_KEYBOARD_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_KEYBOARD_NOKEYS: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_KEYBOARD_QWERTY: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_KEYBOARD_12KEY: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_NAVIGATION_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_NAVIGATION_NONAV: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_NAVIGATION_DPAD: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_NAVIGATION_TRACKBALL: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_NAVIGATION_WHEEL: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_KEYSHIDDEN_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_KEYSHIDDEN_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_KEYSHIDDEN_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_KEYSHIDDEN_SOFT: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_NAVHIDDEN_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_NAVHIDDEN_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_NAVHIDDEN_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREENSIZE_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREENSIZE_SMALL: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_SCREENSIZE_NORMAL: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREENSIZE_LARGE: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_SCREENSIZE_XLARGE: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_SCREENLONG_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREENLONG_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_SCREENLONG_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREENROUND_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREENROUND_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_SCREENROUND_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_WIDE_COLOR_GAMUT_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_WIDE_COLOR_GAMUT_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_WIDE_COLOR_GAMUT_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_HDR_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_HDR_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_HDR_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_UI_MODE_TYPE_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_UI_MODE_TYPE_NORMAL: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_UI_MODE_TYPE_DESK: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_UI_MODE_TYPE_CAR: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_UI_MODE_TYPE_TELEVISION: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_UI_MODE_TYPE_APPLIANCE: ::std::os::raw::c_uint = 5;
-pub const ACONFIGURATION_UI_MODE_TYPE_WATCH: ::std::os::raw::c_uint = 6;
-pub const ACONFIGURATION_UI_MODE_TYPE_VR_HEADSET: ::std::os::raw::c_uint = 7;
-pub const ACONFIGURATION_UI_MODE_NIGHT_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_UI_MODE_NIGHT_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_UI_MODE_NIGHT_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREEN_WIDTH_DP_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREEN_HEIGHT_DP_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_LAYOUTDIR_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_LAYOUTDIR_LTR: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_LAYOUTDIR_RTL: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_MCC: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_MNC: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_LOCALE: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_TOUCHSCREEN: ::std::os::raw::c_uint = 8;
-pub const ACONFIGURATION_KEYBOARD: ::std::os::raw::c_uint = 16;
-pub const ACONFIGURATION_KEYBOARD_HIDDEN: ::std::os::raw::c_uint = 32;
-pub const ACONFIGURATION_NAVIGATION: ::std::os::raw::c_uint = 64;
-pub const ACONFIGURATION_ORIENTATION: ::std::os::raw::c_uint = 128;
-pub const ACONFIGURATION_DENSITY: ::std::os::raw::c_uint = 256;
-pub const ACONFIGURATION_SCREEN_SIZE: ::std::os::raw::c_uint = 512;
-pub const ACONFIGURATION_VERSION: ::std::os::raw::c_uint = 1024;
-pub const ACONFIGURATION_SCREEN_LAYOUT: ::std::os::raw::c_uint = 2048;
-pub const ACONFIGURATION_UI_MODE: ::std::os::raw::c_uint = 4096;
-pub const ACONFIGURATION_SMALLEST_SCREEN_SIZE: ::std::os::raw::c_uint = 8192;
-pub const ACONFIGURATION_LAYOUTDIR: ::std::os::raw::c_uint = 16384;
-pub const ACONFIGURATION_SCREEN_ROUND: ::std::os::raw::c_uint = 32768;
-pub const ACONFIGURATION_COLOR_MODE: ::std::os::raw::c_uint = 65536;
-pub const ACONFIGURATION_MNC_ZERO: ::std::os::raw::c_uint = 65535;
+extern "C" {
+    #[doc = " These are getters for Configuration class members. They may be called from\n any thread."]
+    pub fn GameActivity_getOrientation(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getColorMode(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getDensityDpi(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getFontScale(activity: *mut GameActivity) -> f32;
+}
+extern "C" {
+    pub fn GameActivity_getFontWeightAdjustment(
+        activity: *mut GameActivity,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getHardKeyboardHidden(activity: *mut GameActivity)
+        -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getKeyboard(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getKeyboardHidden(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getMcc(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getMnc(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getNavigation(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getNavigationHidden(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getScreenHeightDp(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getScreenLayout(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getScreenWidthDp(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getSmallestScreenWidthDp(
+        activity: *mut GameActivity,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getTouchscreen(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getUIMode(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+pub const ACONFIGURATION_ORIENTATION_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_ORIENTATION_PORT: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_ORIENTATION_LAND: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_ORIENTATION_SQUARE: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_TOUCHSCREEN_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_TOUCHSCREEN_NOTOUCH: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_TOUCHSCREEN_STYLUS: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_TOUCHSCREEN_FINGER: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_DENSITY_DEFAULT: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_DENSITY_LOW: _bindgen_ty_21 = 120;
+pub const ACONFIGURATION_DENSITY_MEDIUM: _bindgen_ty_21 = 160;
+pub const ACONFIGURATION_DENSITY_TV: _bindgen_ty_21 = 213;
+pub const ACONFIGURATION_DENSITY_HIGH: _bindgen_ty_21 = 240;
+pub const ACONFIGURATION_DENSITY_XHIGH: _bindgen_ty_21 = 320;
+pub const ACONFIGURATION_DENSITY_XXHIGH: _bindgen_ty_21 = 480;
+pub const ACONFIGURATION_DENSITY_XXXHIGH: _bindgen_ty_21 = 640;
+pub const ACONFIGURATION_DENSITY_ANY: _bindgen_ty_21 = 65534;
+pub const ACONFIGURATION_DENSITY_NONE: _bindgen_ty_21 = 65535;
+pub const ACONFIGURATION_KEYBOARD_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_KEYBOARD_NOKEYS: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_KEYBOARD_QWERTY: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_KEYBOARD_12KEY: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_NAVIGATION_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_NAVIGATION_NONAV: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_NAVIGATION_DPAD: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_NAVIGATION_TRACKBALL: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_NAVIGATION_WHEEL: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_KEYSHIDDEN_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_KEYSHIDDEN_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_KEYSHIDDEN_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_KEYSHIDDEN_SOFT: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_NAVHIDDEN_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_NAVHIDDEN_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_NAVHIDDEN_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREENSIZE_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREENSIZE_SMALL: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_SCREENSIZE_NORMAL: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREENSIZE_LARGE: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_SCREENSIZE_XLARGE: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_SCREENLONG_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREENLONG_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_SCREENLONG_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREENROUND_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREENROUND_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_SCREENROUND_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_WIDE_COLOR_GAMUT_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_WIDE_COLOR_GAMUT_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_WIDE_COLOR_GAMUT_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_HDR_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_HDR_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_HDR_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_UI_MODE_TYPE_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_UI_MODE_TYPE_NORMAL: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_UI_MODE_TYPE_DESK: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_UI_MODE_TYPE_CAR: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_UI_MODE_TYPE_TELEVISION: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_UI_MODE_TYPE_APPLIANCE: _bindgen_ty_21 = 5;
+pub const ACONFIGURATION_UI_MODE_TYPE_WATCH: _bindgen_ty_21 = 6;
+pub const ACONFIGURATION_UI_MODE_TYPE_VR_HEADSET: _bindgen_ty_21 = 7;
+pub const ACONFIGURATION_UI_MODE_NIGHT_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_UI_MODE_NIGHT_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_UI_MODE_NIGHT_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREEN_WIDTH_DP_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREEN_HEIGHT_DP_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_LAYOUTDIR_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_LAYOUTDIR_LTR: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_LAYOUTDIR_RTL: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_MCC: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_MNC: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_LOCALE: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_TOUCHSCREEN: _bindgen_ty_21 = 8;
+pub const ACONFIGURATION_KEYBOARD: _bindgen_ty_21 = 16;
+pub const ACONFIGURATION_KEYBOARD_HIDDEN: _bindgen_ty_21 = 32;
+pub const ACONFIGURATION_NAVIGATION: _bindgen_ty_21 = 64;
+pub const ACONFIGURATION_ORIENTATION: _bindgen_ty_21 = 128;
+pub const ACONFIGURATION_DENSITY: _bindgen_ty_21 = 256;
+pub const ACONFIGURATION_SCREEN_SIZE: _bindgen_ty_21 = 512;
+pub const ACONFIGURATION_VERSION: _bindgen_ty_21 = 1024;
+pub const ACONFIGURATION_SCREEN_LAYOUT: _bindgen_ty_21 = 2048;
+pub const ACONFIGURATION_UI_MODE: _bindgen_ty_21 = 4096;
+pub const ACONFIGURATION_SMALLEST_SCREEN_SIZE: _bindgen_ty_21 = 8192;
+pub const ACONFIGURATION_LAYOUTDIR: _bindgen_ty_21 = 16384;
+pub const ACONFIGURATION_SCREEN_ROUND: _bindgen_ty_21 = 32768;
+pub const ACONFIGURATION_COLOR_MODE: _bindgen_ty_21 = 65536;
+pub const ACONFIGURATION_MNC_ZERO: _bindgen_ty_21 = 65535;
 pub type _bindgen_ty_21 = ::std::os::raw::c_uint;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -3966,6 +3762,8 @@ pub struct pollfd {
 }
 #[test]
 fn bindgen_test_layout_pollfd() {
+    const UNINIT: ::std::mem::MaybeUninit<pollfd> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<pollfd>(),
         8usize,
@@ -3977,7 +3775,7 @@ fn bindgen_test_layout_pollfd() {
         concat!("Alignment of ", stringify!(pollfd))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<pollfd>())).fd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -3987,7 +3785,7 @@ fn bindgen_test_layout_pollfd() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<pollfd>())).events as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).events) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -3997,7 +3795,7 @@ fn bindgen_test_layout_pollfd() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<pollfd>())).revents as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).revents) as usize - ptr as usize },
         6usize,
         concat!(
             "Offset of field: ",
@@ -4018,6 +3816,8 @@ pub struct _fpx_sw_bytes {
 }
 #[test]
 fn bindgen_test_layout__fpx_sw_bytes() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpx_sw_bytes> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpx_sw_bytes>(),
         48usize,
@@ -4029,7 +3829,7 @@ fn bindgen_test_layout__fpx_sw_bytes() {
         concat!("Alignment of ", stringify!(_fpx_sw_bytes))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpx_sw_bytes>())).magic1 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).magic1) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4039,7 +3839,7 @@ fn bindgen_test_layout__fpx_sw_bytes() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpx_sw_bytes>())).extended_size as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).extended_size) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4049,7 +3849,7 @@ fn bindgen_test_layout__fpx_sw_bytes() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpx_sw_bytes>())).xfeatures as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xfeatures) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4059,7 +3859,7 @@ fn bindgen_test_layout__fpx_sw_bytes() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpx_sw_bytes>())).xstate_size as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xstate_size) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4069,7 +3869,7 @@ fn bindgen_test_layout__fpx_sw_bytes() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpx_sw_bytes>())).padding as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -4087,6 +3887,8 @@ pub struct _fpreg {
 }
 #[test]
 fn bindgen_test_layout__fpreg() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpreg> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpreg>(),
         10usize,
@@ -4098,7 +3900,7 @@ fn bindgen_test_layout__fpreg() {
         concat!("Alignment of ", stringify!(_fpreg))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpreg>())).significand as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).significand) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4108,7 +3910,7 @@ fn bindgen_test_layout__fpreg() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpreg>())).exponent as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).exponent) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4127,6 +3929,8 @@ pub struct _fpxreg {
 }
 #[test]
 fn bindgen_test_layout__fpxreg() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpxreg> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpxreg>(),
         16usize,
@@ -4138,7 +3942,7 @@ fn bindgen_test_layout__fpxreg() {
         concat!("Alignment of ", stringify!(_fpxreg))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpxreg>())).significand as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).significand) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4148,7 +3952,7 @@ fn bindgen_test_layout__fpxreg() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpxreg>())).exponent as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).exponent) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4158,7 +3962,7 @@ fn bindgen_test_layout__fpxreg() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpxreg>())).padding as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         10usize,
         concat!(
             "Offset of field: ",
@@ -4175,6 +3979,8 @@ pub struct _xmmreg {
 }
 #[test]
 fn bindgen_test_layout__xmmreg() {
+    const UNINIT: ::std::mem::MaybeUninit<_xmmreg> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_xmmreg>(),
         16usize,
@@ -4186,7 +3992,7 @@ fn bindgen_test_layout__xmmreg() {
         concat!("Alignment of ", stringify!(_xmmreg))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_xmmreg>())).element as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).element) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4225,6 +4031,9 @@ pub union _fpstate_32__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout__fpstate_32__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpstate_32__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpstate_32__bindgen_ty_1>(),
         176usize,
@@ -4236,9 +4045,7 @@ fn bindgen_test_layout__fpstate_32__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(_fpstate_32__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<_fpstate_32__bindgen_ty_1>())).padding1 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).padding1) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4248,9 +4055,7 @@ fn bindgen_test_layout__fpstate_32__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<_fpstate_32__bindgen_ty_1>())).padding as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4268,6 +4073,9 @@ pub union _fpstate_32__bindgen_ty_2 {
 }
 #[test]
 fn bindgen_test_layout__fpstate_32__bindgen_ty_2() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpstate_32__bindgen_ty_2> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpstate_32__bindgen_ty_2>(),
         48usize,
@@ -4279,9 +4087,7 @@ fn bindgen_test_layout__fpstate_32__bindgen_ty_2() {
         concat!("Alignment of ", stringify!(_fpstate_32__bindgen_ty_2))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<_fpstate_32__bindgen_ty_2>())).padding2 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).padding2) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4291,9 +4097,7 @@ fn bindgen_test_layout__fpstate_32__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<_fpstate_32__bindgen_ty_2>())).sw_reserved as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sw_reserved) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4305,6 +4109,8 @@ fn bindgen_test_layout__fpstate_32__bindgen_ty_2() {
 }
 #[test]
 fn bindgen_test_layout__fpstate_32() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpstate_32> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpstate_32>(),
         624usize,
@@ -4316,7 +4122,7 @@ fn bindgen_test_layout__fpstate_32() {
         concat!("Alignment of ", stringify!(_fpstate_32))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).cw as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cw) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4326,7 +4132,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).sw as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sw) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4336,7 +4142,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).tag as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tag) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4346,7 +4152,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).ipoff as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ipoff) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -4356,7 +4162,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).cssel as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cssel) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4366,7 +4172,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).dataoff as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).dataoff) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -4376,7 +4182,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).datasel as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).datasel) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -4386,7 +4192,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>()))._st as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._st) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -4396,7 +4202,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).status as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).status) as usize - ptr as usize },
         108usize,
         concat!(
             "Offset of field: ",
@@ -4406,7 +4212,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).magic as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).magic) as usize - ptr as usize },
         110usize,
         concat!(
             "Offset of field: ",
@@ -4416,7 +4222,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>()))._fxsr_env as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._fxsr_env) as usize - ptr as usize },
         112usize,
         concat!(
             "Offset of field: ",
@@ -4426,7 +4232,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).mxcsr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).mxcsr) as usize - ptr as usize },
         136usize,
         concat!(
             "Offset of field: ",
@@ -4436,7 +4242,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).reserved as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved) as usize - ptr as usize },
         140usize,
         concat!(
             "Offset of field: ",
@@ -4446,7 +4252,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>()))._fxsr_st as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._fxsr_st) as usize - ptr as usize },
         144usize,
         concat!(
             "Offset of field: ",
@@ -4456,7 +4262,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>()))._xmm as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._xmm) as usize - ptr as usize },
         272usize,
         concat!(
             "Offset of field: ",
@@ -4490,6 +4296,9 @@ pub union _fpstate_64__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout__fpstate_64__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpstate_64__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpstate_64__bindgen_ty_1>(),
         48usize,
@@ -4501,9 +4310,7 @@ fn bindgen_test_layout__fpstate_64__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(_fpstate_64__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<_fpstate_64__bindgen_ty_1>())).reserved3 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved3) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4513,9 +4320,7 @@ fn bindgen_test_layout__fpstate_64__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<_fpstate_64__bindgen_ty_1>())).sw_reserved as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sw_reserved) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4527,6 +4332,8 @@ fn bindgen_test_layout__fpstate_64__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout__fpstate_64() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpstate_64> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpstate_64>(),
         512usize,
@@ -4538,7 +4345,7 @@ fn bindgen_test_layout__fpstate_64() {
         concat!("Alignment of ", stringify!(_fpstate_64))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).cwd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cwd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4548,7 +4355,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).swd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).swd) as usize - ptr as usize },
         2usize,
         concat!(
             "Offset of field: ",
@@ -4558,7 +4365,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).twd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).twd) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4568,7 +4375,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).fop as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fop) as usize - ptr as usize },
         6usize,
         concat!(
             "Offset of field: ",
@@ -4578,7 +4385,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).rip as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rip) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4588,7 +4395,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).rdp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rdp) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4598,7 +4405,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).mxcsr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).mxcsr) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -4608,7 +4415,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).mxcsr_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).mxcsr_mask) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -4618,7 +4425,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).st_space as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).st_space) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -4628,7 +4435,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).xmm_space as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xmm_space) as usize - ptr as usize },
         160usize,
         concat!(
             "Offset of field: ",
@@ -4638,7 +4445,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).reserved2 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved2) as usize - ptr as usize },
         416usize,
         concat!(
             "Offset of field: ",
@@ -4657,6 +4464,8 @@ pub struct _header {
 }
 #[test]
 fn bindgen_test_layout__header() {
+    const UNINIT: ::std::mem::MaybeUninit<_header> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_header>(),
         64usize,
@@ -4668,7 +4477,7 @@ fn bindgen_test_layout__header() {
         concat!("Alignment of ", stringify!(_header))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_header>())).xfeatures as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xfeatures) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4678,7 +4487,7 @@ fn bindgen_test_layout__header() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_header>())).reserved1 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved1) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4688,7 +4497,7 @@ fn bindgen_test_layout__header() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_header>())).reserved2 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved2) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -4705,6 +4514,8 @@ pub struct _ymmh_state {
 }
 #[test]
 fn bindgen_test_layout__ymmh_state() {
+    const UNINIT: ::std::mem::MaybeUninit<_ymmh_state> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_ymmh_state>(),
         256usize,
@@ -4716,7 +4527,7 @@ fn bindgen_test_layout__ymmh_state() {
         concat!("Alignment of ", stringify!(_ymmh_state))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_ymmh_state>())).ymmh_space as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ymmh_space) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4735,6 +4546,8 @@ pub struct _xstate {
 }
 #[test]
 fn bindgen_test_layout__xstate() {
+    const UNINIT: ::std::mem::MaybeUninit<_xstate> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_xstate>(),
         944usize,
@@ -4746,7 +4559,7 @@ fn bindgen_test_layout__xstate() {
         concat!("Alignment of ", stringify!(_xstate))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_xstate>())).fpstate as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4756,7 +4569,7 @@ fn bindgen_test_layout__xstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_xstate>())).xstate_hdr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xstate_hdr) as usize - ptr as usize },
         624usize,
         concat!(
             "Offset of field: ",
@@ -4766,7 +4579,7 @@ fn bindgen_test_layout__xstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_xstate>())).ymmh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ymmh) as usize - ptr as usize },
         688usize,
         concat!(
             "Offset of field: ",
@@ -4810,6 +4623,8 @@ pub struct sigcontext_32 {
 }
 #[test]
 fn bindgen_test_layout_sigcontext_32() {
+    const UNINIT: ::std::mem::MaybeUninit<sigcontext_32> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigcontext_32>(),
         88usize,
@@ -4821,7 +4636,7 @@ fn bindgen_test_layout_sigcontext_32() {
         concat!("Alignment of ", stringify!(sigcontext_32))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).gs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).gs) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4831,7 +4646,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).__gsh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__gsh) as usize - ptr as usize },
         2usize,
         concat!(
             "Offset of field: ",
@@ -4841,7 +4656,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).fs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fs) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4851,7 +4666,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).__fsh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__fsh) as usize - ptr as usize },
         6usize,
         concat!(
             "Offset of field: ",
@@ -4861,7 +4676,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).es as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).es) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4871,7 +4686,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).__esh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__esh) as usize - ptr as usize },
         10usize,
         concat!(
             "Offset of field: ",
@@ -4881,7 +4696,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).ds as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ds) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -4891,7 +4706,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).__dsh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__dsh) as usize - ptr as usize },
         14usize,
         concat!(
             "Offset of field: ",
@@ -4901,7 +4716,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).di as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).di) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4911,7 +4726,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).si as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).si) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -4921,7 +4736,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).bp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).bp) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -4931,7 +4746,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).sp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sp) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -4941,7 +4756,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).bx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).bx) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -4951,7 +4766,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).dx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).dx) as usize - ptr as usize },
         36usize,
         concat!(
             "Offset of field: ",
@@ -4961,7 +4776,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).cx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cx) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -4971,7 +4786,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).ax as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ax) as usize - ptr as usize },
         44usize,
         concat!(
             "Offset of field: ",
@@ -4981,7 +4796,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).trapno as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).trapno) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -4991,7 +4806,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).err as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).err) as usize - ptr as usize },
         52usize,
         concat!(
             "Offset of field: ",
@@ -5001,7 +4816,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).ip as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ip) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -5011,7 +4826,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).cs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cs) as usize - ptr as usize },
         60usize,
         concat!(
             "Offset of field: ",
@@ -5021,7 +4836,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).__csh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__csh) as usize - ptr as usize },
         62usize,
         concat!(
             "Offset of field: ",
@@ -5031,7 +4846,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         64usize,
         concat!(
             "Offset of field: ",
@@ -5041,7 +4856,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).sp_at_signal as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sp_at_signal) as usize - ptr as usize },
         68usize,
         concat!(
             "Offset of field: ",
@@ -5051,7 +4866,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).ss as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss) as usize - ptr as usize },
         72usize,
         concat!(
             "Offset of field: ",
@@ -5061,7 +4876,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).__ssh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__ssh) as usize - ptr as usize },
         74usize,
         concat!(
             "Offset of field: ",
@@ -5071,7 +4886,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).fpstate as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         76usize,
         concat!(
             "Offset of field: ",
@@ -5081,7 +4896,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).oldmask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         80usize,
         concat!(
             "Offset of field: ",
@@ -5091,7 +4906,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).cr2 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cr2) as usize - ptr as usize },
         84usize,
         concat!(
             "Offset of field: ",
@@ -5135,6 +4950,8 @@ pub struct sigcontext_64 {
 }
 #[test]
 fn bindgen_test_layout_sigcontext_64() {
+    const UNINIT: ::std::mem::MaybeUninit<sigcontext_64> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigcontext_64>(),
         256usize,
@@ -5146,7 +4963,7 @@ fn bindgen_test_layout_sigcontext_64() {
         concat!("Alignment of ", stringify!(sigcontext_64))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r8 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r8) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5156,7 +4973,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r9 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r9) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5166,7 +4983,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r10 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r10) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -5176,7 +4993,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r11 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r11) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -5186,7 +5003,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r12 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r12) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -5196,7 +5013,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r13 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r13) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -5206,7 +5023,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r14 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r14) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -5216,7 +5033,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r15 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r15) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -5226,7 +5043,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).di as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).di) as usize - ptr as usize },
         64usize,
         concat!(
             "Offset of field: ",
@@ -5236,7 +5053,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).si as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).si) as usize - ptr as usize },
         72usize,
         concat!(
             "Offset of field: ",
@@ -5246,7 +5063,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).bp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).bp) as usize - ptr as usize },
         80usize,
         concat!(
             "Offset of field: ",
@@ -5256,7 +5073,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).bx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).bx) as usize - ptr as usize },
         88usize,
         concat!(
             "Offset of field: ",
@@ -5266,7 +5083,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).dx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).dx) as usize - ptr as usize },
         96usize,
         concat!(
             "Offset of field: ",
@@ -5276,7 +5093,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).ax as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ax) as usize - ptr as usize },
         104usize,
         concat!(
             "Offset of field: ",
@@ -5286,7 +5103,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).cx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cx) as usize - ptr as usize },
         112usize,
         concat!(
             "Offset of field: ",
@@ -5296,7 +5113,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).sp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sp) as usize - ptr as usize },
         120usize,
         concat!(
             "Offset of field: ",
@@ -5306,7 +5123,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).ip as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ip) as usize - ptr as usize },
         128usize,
         concat!(
             "Offset of field: ",
@@ -5316,7 +5133,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         136usize,
         concat!(
             "Offset of field: ",
@@ -5326,7 +5143,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).cs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cs) as usize - ptr as usize },
         144usize,
         concat!(
             "Offset of field: ",
@@ -5336,7 +5153,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).gs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).gs) as usize - ptr as usize },
         146usize,
         concat!(
             "Offset of field: ",
@@ -5346,7 +5163,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).fs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fs) as usize - ptr as usize },
         148usize,
         concat!(
             "Offset of field: ",
@@ -5356,7 +5173,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).ss as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss) as usize - ptr as usize },
         150usize,
         concat!(
             "Offset of field: ",
@@ -5366,7 +5183,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).err as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).err) as usize - ptr as usize },
         152usize,
         concat!(
             "Offset of field: ",
@@ -5376,7 +5193,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).trapno as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).trapno) as usize - ptr as usize },
         160usize,
         concat!(
             "Offset of field: ",
@@ -5386,7 +5203,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).oldmask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         168usize,
         concat!(
             "Offset of field: ",
@@ -5396,7 +5213,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).cr2 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cr2) as usize - ptr as usize },
         176usize,
         concat!(
             "Offset of field: ",
@@ -5406,7 +5223,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).fpstate as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         184usize,
         concat!(
             "Offset of field: ",
@@ -5416,7 +5233,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).reserved1 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved1) as usize - ptr as usize },
         192usize,
         concat!(
             "Offset of field: ",
@@ -5460,6 +5277,8 @@ pub struct sigcontext {
 }
 #[test]
 fn bindgen_test_layout_sigcontext() {
+    const UNINIT: ::std::mem::MaybeUninit<sigcontext> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigcontext>(),
         88usize,
@@ -5471,7 +5290,7 @@ fn bindgen_test_layout_sigcontext() {
         concat!("Alignment of ", stringify!(sigcontext))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).gs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).gs) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5481,7 +5300,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).__gsh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__gsh) as usize - ptr as usize },
         2usize,
         concat!(
             "Offset of field: ",
@@ -5491,7 +5310,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).fs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fs) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -5501,7 +5320,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).__fsh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__fsh) as usize - ptr as usize },
         6usize,
         concat!(
             "Offset of field: ",
@@ -5511,7 +5330,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).es as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).es) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5521,7 +5340,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).__esh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__esh) as usize - ptr as usize },
         10usize,
         concat!(
             "Offset of field: ",
@@ -5531,7 +5350,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).ds as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ds) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -5541,7 +5360,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).__dsh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__dsh) as usize - ptr as usize },
         14usize,
         concat!(
             "Offset of field: ",
@@ -5551,7 +5370,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).edi as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).edi) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -5561,7 +5380,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).esi as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).esi) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -5571,7 +5390,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).ebp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ebp) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -5581,7 +5400,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).esp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).esp) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -5591,7 +5410,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).ebx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ebx) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -5601,7 +5420,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).edx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).edx) as usize - ptr as usize },
         36usize,
         concat!(
             "Offset of field: ",
@@ -5611,7 +5430,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).ecx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ecx) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -5621,7 +5440,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).eax as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).eax) as usize - ptr as usize },
         44usize,
         concat!(
             "Offset of field: ",
@@ -5631,7 +5450,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).trapno as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).trapno) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -5641,7 +5460,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).err as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).err) as usize - ptr as usize },
         52usize,
         concat!(
             "Offset of field: ",
@@ -5651,7 +5470,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).eip as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).eip) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -5661,7 +5480,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).cs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cs) as usize - ptr as usize },
         60usize,
         concat!(
             "Offset of field: ",
@@ -5671,7 +5490,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).__csh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__csh) as usize - ptr as usize },
         62usize,
         concat!(
             "Offset of field: ",
@@ -5681,7 +5500,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).eflags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).eflags) as usize - ptr as usize },
         64usize,
         concat!(
             "Offset of field: ",
@@ -5691,7 +5510,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).esp_at_signal as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).esp_at_signal) as usize - ptr as usize },
         68usize,
         concat!(
             "Offset of field: ",
@@ -5701,7 +5520,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).ss as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss) as usize - ptr as usize },
         72usize,
         concat!(
             "Offset of field: ",
@@ -5711,7 +5530,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).__ssh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__ssh) as usize - ptr as usize },
         74usize,
         concat!(
             "Offset of field: ",
@@ -5721,7 +5540,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).fpstate as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         76usize,
         concat!(
             "Offset of field: ",
@@ -5731,7 +5550,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).oldmask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         80usize,
         concat!(
             "Offset of field: ",
@@ -5741,7 +5560,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).cr2 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cr2) as usize - ptr as usize },
         84usize,
         concat!(
             "Offset of field: ",
@@ -5759,6 +5578,8 @@ pub struct __kernel_timespec {
 }
 #[test]
 fn bindgen_test_layout___kernel_timespec() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_timespec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_timespec>(),
         16usize,
@@ -5770,7 +5591,7 @@ fn bindgen_test_layout___kernel_timespec() {
         concat!("Alignment of ", stringify!(__kernel_timespec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_timespec>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5780,7 +5601,7 @@ fn bindgen_test_layout___kernel_timespec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_timespec>())).tv_nsec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5798,6 +5619,8 @@ pub struct __kernel_itimerspec {
 }
 #[test]
 fn bindgen_test_layout___kernel_itimerspec() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_itimerspec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_itimerspec>(),
         32usize,
@@ -5809,7 +5632,7 @@ fn bindgen_test_layout___kernel_itimerspec() {
         concat!("Alignment of ", stringify!(__kernel_itimerspec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_itimerspec>())).it_interval as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5819,7 +5642,7 @@ fn bindgen_test_layout___kernel_itimerspec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_itimerspec>())).it_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -5831,40 +5654,43 @@ fn bindgen_test_layout___kernel_itimerspec() {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct __kernel_old_timeval {
-    pub tv_sec: __kernel_long_t,
-    pub tv_usec: __kernel_long_t,
+pub struct __kernel_old_timespec {
+    pub tv_sec: __kernel_old_time_t,
+    pub tv_nsec: ::std::os::raw::c_long,
 }
 #[test]
-fn bindgen_test_layout___kernel_old_timeval() {
+fn bindgen_test_layout___kernel_old_timespec() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_old_timespec> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<__kernel_old_timeval>(),
+        ::std::mem::size_of::<__kernel_old_timespec>(),
         8usize,
-        concat!("Size of: ", stringify!(__kernel_old_timeval))
+        concat!("Size of: ", stringify!(__kernel_old_timespec))
     );
     assert_eq!(
-        ::std::mem::align_of::<__kernel_old_timeval>(),
+        ::std::mem::align_of::<__kernel_old_timespec>(),
         4usize,
-        concat!("Alignment of ", stringify!(__kernel_old_timeval))
+        concat!("Alignment of ", stringify!(__kernel_old_timespec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_old_timeval>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(__kernel_old_timeval),
+            stringify!(__kernel_old_timespec),
             "::",
             stringify!(tv_sec)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_old_timeval>())).tv_usec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
-            stringify!(__kernel_old_timeval),
+            stringify!(__kernel_old_timespec),
             "::",
-            stringify!(tv_usec)
+            stringify!(tv_nsec)
         )
     );
 }
@@ -5876,6 +5702,9 @@ pub struct __kernel_sock_timeval {
 }
 #[test]
 fn bindgen_test_layout___kernel_sock_timeval() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_sock_timeval> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_sock_timeval>(),
         16usize,
@@ -5887,7 +5716,7 @@ fn bindgen_test_layout___kernel_sock_timeval() {
         concat!("Alignment of ", stringify!(__kernel_sock_timeval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sock_timeval>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5897,7 +5726,7 @@ fn bindgen_test_layout___kernel_sock_timeval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sock_timeval>())).tv_usec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5910,11 +5739,13 @@ fn bindgen_test_layout___kernel_sock_timeval() {
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct timespec {
-    pub tv_sec: __kernel_time_t,
+    pub tv_sec: __kernel_old_time_t,
     pub tv_nsec: ::std::os::raw::c_long,
 }
 #[test]
 fn bindgen_test_layout_timespec() {
+    const UNINIT: ::std::mem::MaybeUninit<timespec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<timespec>(),
         8usize,
@@ -5926,7 +5757,7 @@ fn bindgen_test_layout_timespec() {
         concat!("Alignment of ", stringify!(timespec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timespec>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5936,7 +5767,7 @@ fn bindgen_test_layout_timespec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timespec>())).tv_nsec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -5949,11 +5780,13 @@ fn bindgen_test_layout_timespec() {
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct timeval {
-    pub tv_sec: __kernel_time_t,
+    pub tv_sec: __kernel_old_time_t,
     pub tv_usec: __kernel_suseconds_t,
 }
 #[test]
 fn bindgen_test_layout_timeval() {
+    const UNINIT: ::std::mem::MaybeUninit<timeval> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<timeval>(),
         8usize,
@@ -5965,7 +5798,7 @@ fn bindgen_test_layout_timeval() {
         concat!("Alignment of ", stringify!(timeval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timeval>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5975,7 +5808,7 @@ fn bindgen_test_layout_timeval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timeval>())).tv_usec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -5987,51 +5820,14 @@ fn bindgen_test_layout_timeval() {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct timezone {
-    pub tz_minuteswest: ::std::os::raw::c_int,
-    pub tz_dsttime: ::std::os::raw::c_int,
-}
-#[test]
-fn bindgen_test_layout_timezone() {
-    assert_eq!(
-        ::std::mem::size_of::<timezone>(),
-        8usize,
-        concat!("Size of: ", stringify!(timezone))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<timezone>(),
-        4usize,
-        concat!("Alignment of ", stringify!(timezone))
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timezone>())).tz_minuteswest as *const _ as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_minuteswest)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timezone>())).tz_dsttime as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_dsttime)
-        )
-    );
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
 pub struct itimerspec {
     pub it_interval: timespec,
     pub it_value: timespec,
 }
 #[test]
 fn bindgen_test_layout_itimerspec() {
+    const UNINIT: ::std::mem::MaybeUninit<itimerspec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<itimerspec>(),
         16usize,
@@ -6043,7 +5839,7 @@ fn bindgen_test_layout_itimerspec() {
         concat!("Alignment of ", stringify!(itimerspec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerspec>())).it_interval as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6053,7 +5849,7 @@ fn bindgen_test_layout_itimerspec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerspec>())).it_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6071,6 +5867,8 @@ pub struct itimerval {
 }
 #[test]
 fn bindgen_test_layout_itimerval() {
+    const UNINIT: ::std::mem::MaybeUninit<itimerval> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<itimerval>(),
         16usize,
@@ -6082,7 +5880,7 @@ fn bindgen_test_layout_itimerval() {
         concat!("Alignment of ", stringify!(itimerval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerval>())).it_interval as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6092,7 +5890,7 @@ fn bindgen_test_layout_itimerval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerval>())).it_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6102,6 +5900,47 @@ fn bindgen_test_layout_itimerval() {
         )
     );
 }
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct timezone {
+    pub tz_minuteswest: ::std::os::raw::c_int,
+    pub tz_dsttime: ::std::os::raw::c_int,
+}
+#[test]
+fn bindgen_test_layout_timezone() {
+    const UNINIT: ::std::mem::MaybeUninit<timezone> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<timezone>(),
+        8usize,
+        concat!("Size of: ", stringify!(timezone))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<timezone>(),
+        4usize,
+        concat!("Alignment of ", stringify!(timezone))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).tz_minuteswest) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(timezone),
+            "::",
+            stringify!(tz_minuteswest)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).tz_dsttime) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(timezone),
+            "::",
+            stringify!(tz_dsttime)
+        )
+    );
+}
 pub type sigset_t = ::std::os::raw::c_ulong;
 pub type __signalfn_t = ::std::option::Option<unsafe extern "C" fn(arg1: ::std::os::raw::c_int)>;
 pub type __sighandler_t = __signalfn_t;
@@ -6129,6 +5968,9 @@ pub union __kernel_sigaction__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout___kernel_sigaction__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_sigaction__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_sigaction__bindgen_ty_1>(),
         4usize,
@@ -6143,10 +5985,7 @@ fn bindgen_test_layout___kernel_sigaction__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__kernel_sigaction__bindgen_ty_1>()))._sa_handler as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sa_handler) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6156,10 +5995,7 @@ fn bindgen_test_layout___kernel_sigaction__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__kernel_sigaction__bindgen_ty_1>()))._sa_sigaction as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sa_sigaction) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6171,6 +6007,8 @@ fn bindgen_test_layout___kernel_sigaction__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout___kernel_sigaction() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_sigaction> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_sigaction>(),
         16usize,
@@ -6182,7 +6020,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         concat!("Alignment of ", stringify!(__kernel_sigaction))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>()))._u as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._u) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6192,7 +6030,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>())).sa_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6202,7 +6040,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>())).sa_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6212,7 +6050,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>())).sa_restorer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -6223,13 +6061,16 @@ fn bindgen_test_layout___kernel_sigaction() {
     );
 }
 #[repr(C)]
+#[derive(Debug, Copy, Clone)]
 pub struct sigaltstack {
     pub ss_sp: *mut ::std::os::raw::c_void,
     pub ss_flags: ::std::os::raw::c_int,
-    pub ss_size: size_t,
+    pub ss_size: __kernel_size_t,
 }
 #[test]
 fn bindgen_test_layout_sigaltstack() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaltstack> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaltstack>(),
         12usize,
@@ -6241,7 +6082,7 @@ fn bindgen_test_layout_sigaltstack() {
         concat!("Alignment of ", stringify!(sigaltstack))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaltstack>())).ss_sp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss_sp) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6251,7 +6092,7 @@ fn bindgen_test_layout_sigaltstack() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaltstack>())).ss_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss_flags) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6261,7 +6102,7 @@ fn bindgen_test_layout_sigaltstack() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaltstack>())).ss_size as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss_size) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6280,6 +6121,8 @@ pub union sigval {
 }
 #[test]
 fn bindgen_test_layout_sigval() {
+    const UNINIT: ::std::mem::MaybeUninit<sigval> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigval>(),
         4usize,
@@ -6291,7 +6134,7 @@ fn bindgen_test_layout_sigval() {
         concat!("Alignment of ", stringify!(sigval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigval>())).sival_int as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sival_int) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6301,7 +6144,7 @@ fn bindgen_test_layout_sigval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigval>())).sival_ptr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sival_ptr) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6331,6 +6174,9 @@ pub struct __sifields__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_1>(),
         8usize,
@@ -6342,7 +6188,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_1>()))._pid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6352,7 +6198,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_1>()))._uid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6372,6 +6218,9 @@ pub struct __sifields__bindgen_ty_2 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_2() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_2> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_2>(),
         16usize,
@@ -6383,7 +6232,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_2))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6393,9 +6242,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._overrun as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._overrun) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6405,9 +6252,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._sigval as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6417,9 +6262,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._sys_private as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sys_private) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -6438,6 +6281,9 @@ pub struct __sifields__bindgen_ty_3 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_3() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_3> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_3>(),
         12usize,
@@ -6449,7 +6295,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_3))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_3>()))._pid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6459,7 +6305,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_3>()))._uid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6469,9 +6315,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_3>()))._sigval as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6492,6 +6336,9 @@ pub struct __sifields__bindgen_ty_4 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_4() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_4> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_4>(),
         20usize,
@@ -6503,7 +6350,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_4))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._pid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6513,7 +6360,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._uid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6523,9 +6370,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._status as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._status) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6535,7 +6380,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._utime as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._utime) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -6545,7 +6390,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._stime as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._stime) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -6564,9 +6409,11 @@ pub struct __sifields__bindgen_ty_5 {
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub union __sifields__bindgen_ty_5__bindgen_ty_1 {
+    pub _trapno: ::std::os::raw::c_int,
     pub _addr_lsb: ::std::os::raw::c_short,
     pub _addr_bnd: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1,
     pub _addr_pkey: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2,
+    pub _perf: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -6577,6 +6424,9 @@ pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>(),
         12usize,
@@ -6594,10 +6444,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>()))
-                ._dummy_bnd as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._dummy_bnd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6607,10 +6454,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>()))._lower
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._lower) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6620,10 +6464,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>()))._upper
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._upper) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6641,6 +6482,9 @@ pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>(),
         8usize,
@@ -6658,10 +6502,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>()))
-                ._dummy_pkey as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._dummy_pkey) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6671,10 +6512,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>()))._pkey
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pkey) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6684,8 +6522,59 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
         )
     );
 }
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3 {
+    pub _data: ::std::os::raw::c_ulong,
+    pub _type: __u32,
+}
+#[test]
+fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
+        8usize,
+        concat!(
+            "Size of: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
+        )
+    );
+    assert_eq!(
+        ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
+        4usize,
+        concat!(
+            "Alignment of ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._data) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
+            "::",
+            stringify!(_data)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._type) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
+            "::",
+            stringify!(_type)
+        )
+    );
+}
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1>(),
         12usize,
@@ -6703,10 +6592,17 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1>()))._addr_lsb as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._trapno) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
+            "::",
+            stringify!(_trapno)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr_lsb) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6716,10 +6612,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1>()))._addr_bnd as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr_bnd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6729,10 +6622,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1>()))._addr_pkey
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr_pkey) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6741,9 +6631,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
             stringify!(_addr_pkey)
         )
     );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._perf) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
+            "::",
+            stringify!(_perf)
+        )
+    );
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5>(),
         16usize,
@@ -6755,7 +6658,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_5))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_5>()))._addr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6773,6 +6676,9 @@ pub struct __sifields__bindgen_ty_6 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_6() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_6> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_6>(),
         8usize,
@@ -6784,7 +6690,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_6() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_6))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_6>()))._band as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._band) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6794,7 +6700,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_6() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_6>()))._fd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._fd) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6813,6 +6719,9 @@ pub struct __sifields__bindgen_ty_7 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_7() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_7> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_7>(),
         12usize,
@@ -6824,9 +6733,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_7))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_7>()))._call_addr as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._call_addr) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6836,9 +6743,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_7>()))._syscall as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._syscall) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6848,7 +6753,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_7>()))._arch as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._arch) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6860,6 +6765,8 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
 }
 #[test]
 fn bindgen_test_layout___sifields() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields>(),
         20usize,
@@ -6871,7 +6778,7 @@ fn bindgen_test_layout___sifields() {
         concat!("Alignment of ", stringify!(__sifields))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._kill as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._kill) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6881,7 +6788,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._timer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._timer) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6891,7 +6798,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._rt as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._rt) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6901,7 +6808,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigchld as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigchld) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6911,7 +6818,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigfault as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigfault) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6921,7 +6828,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigpoll as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigpoll) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6931,7 +6838,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigsys as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigsys) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6962,6 +6869,9 @@ pub struct siginfo__bindgen_ty_1__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<siginfo__bindgen_ty_1__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1__bindgen_ty_1>(),
         32usize,
@@ -6976,10 +6886,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>())).si_signo as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).si_signo) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6989,10 +6896,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>())).si_errno as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).si_errno) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -7002,10 +6906,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>())).si_code as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).si_code) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7015,10 +6916,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>()))._sifields as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sifields) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -7030,6 +6928,9 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_siginfo__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<siginfo__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1>(),
         128usize,
@@ -7041,7 +6942,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(siginfo__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<siginfo__bindgen_ty_1>()))._si_pad as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._si_pad) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7088,6 +6989,9 @@ pub struct sigevent__bindgen_ty_1__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigevent__bindgen_ty_1__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1__bindgen_ty_1>(),
         8usize,
@@ -7105,10 +7009,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigevent__bindgen_ty_1__bindgen_ty_1>()))._function as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._function) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7118,10 +7019,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigevent__bindgen_ty_1__bindgen_ty_1>()))._attribute as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._attribute) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -7133,6 +7031,9 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigevent__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigevent__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1>(),
         52usize,
@@ -7144,7 +7045,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(sigevent__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent__bindgen_ty_1>()))._pad as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pad) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7154,7 +7055,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent__bindgen_ty_1>()))._tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7164,9 +7065,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigevent__bindgen_ty_1>()))._sigev_thread as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigev_thread) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7178,6 +7077,8 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigevent() {
+    const UNINIT: ::std::mem::MaybeUninit<sigevent> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigevent>(),
         64usize,
@@ -7189,7 +7090,7 @@ fn bindgen_test_layout_sigevent() {
         concat!("Alignment of ", stringify!(sigevent))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>())).sigev_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sigev_value) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7199,7 +7100,7 @@ fn bindgen_test_layout_sigevent() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>())).sigev_signo as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sigev_signo) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -7209,7 +7110,7 @@ fn bindgen_test_layout_sigevent() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>())).sigev_notify as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sigev_notify) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7219,7 +7120,7 @@ fn bindgen_test_layout_sigevent() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>()))._sigev_un as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigev_un) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -7240,6 +7141,8 @@ pub struct sigset64_t {
 }
 #[test]
 fn bindgen_test_layout_sigset64_t() {
+    const UNINIT: ::std::mem::MaybeUninit<sigset64_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigset64_t>(),
         8usize,
@@ -7251,7 +7154,7 @@ fn bindgen_test_layout_sigset64_t() {
         concat!("Alignment of ", stringify!(sigset64_t))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigset64_t>())).__bits as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__bits) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7283,6 +7186,9 @@ pub union sigaction__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_sigaction__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction__bindgen_ty_1>(),
         4usize,
@@ -7294,9 +7200,7 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(sigaction__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction__bindgen_ty_1>())).sa_handler as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7306,9 +7210,7 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction__bindgen_ty_1>())).sa_sigaction as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7320,6 +7222,8 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigaction() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction>(),
         16usize,
@@ -7331,7 +7235,7 @@ fn bindgen_test_layout_sigaction() {
         concat!("Alignment of ", stringify!(sigaction))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction>())).sa_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -7341,7 +7245,7 @@ fn bindgen_test_layout_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction>())).sa_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7351,7 +7255,7 @@ fn bindgen_test_layout_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction>())).sa_restorer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -7383,6 +7287,9 @@ pub union sigaction64__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction64__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction64__bindgen_ty_1>(),
         4usize,
@@ -7394,9 +7301,7 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(sigaction64__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction64__bindgen_ty_1>())).sa_handler as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7406,9 +7311,7 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction64__bindgen_ty_1>())).sa_sigaction as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7420,6 +7323,8 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigaction64() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction64> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction64>(),
         20usize,
@@ -7431,7 +7336,7 @@ fn bindgen_test_layout_sigaction64() {
         concat!("Alignment of ", stringify!(sigaction64))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction64>())).sa_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -7441,7 +7346,7 @@ fn bindgen_test_layout_sigaction64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction64>())).sa_restorer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7451,7 +7356,7 @@ fn bindgen_test_layout_sigaction64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction64>())).sa_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -7475,6 +7380,8 @@ pub struct user_fpregs_struct {
 }
 #[test]
 fn bindgen_test_layout_user_fpregs_struct() {
+    const UNINIT: ::std::mem::MaybeUninit<user_fpregs_struct> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<user_fpregs_struct>(),
         108usize,
@@ -7486,7 +7393,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         concat!("Alignment of ", stringify!(user_fpregs_struct))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).cwd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cwd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7496,7 +7403,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).swd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).swd) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -7506,7 +7413,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).twd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).twd) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7516,7 +7423,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).fip as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fip) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -7526,7 +7433,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).fcs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fcs) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -7536,7 +7443,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).foo as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -7546,7 +7453,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).fos as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fos) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -7556,7 +7463,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).st_space as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).st_space) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -7585,6 +7492,8 @@ pub struct user_fpxregs_struct {
 }
 #[test]
 fn bindgen_test_layout_user_fpxregs_struct() {
+    const UNINIT: ::std::mem::MaybeUninit<user_fpxregs_struct> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<user_fpxregs_struct>(),
         512usize,
@@ -7596,7 +7505,7 @@ fn bindgen_test_layout_user_fpxregs_struct() {
         concat!("Alignment of ", stringify!(user_fpxregs_struct))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpxregs_struct>())).cwd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cwd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7606,7 +7515,7 @@ fn bindgen_test_layout_user_fpxregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpxregs_struct>())).swd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).swd) as usize - ptr as usize },
         2usize,
         concat!(
             "Offset of field: ",
@@ -7616,7 +7525,7 @@ fn bindgen_test_layout_user_fpxregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpxregs_struct>())).twd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).twd) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -7626,7 +7535,7 @@ fn bindgen_test_layout_user_fpxregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpxregs_struct>())).fop as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fop) as usize - ptr as usize },
         6usize,
         concat!(
             "Offset of field: ",
@@ -7636,7 +7545,7 @@ fn bindgen_test_layout_user_fpxregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpxregs_struct>())).fip as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fip) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7646,7 +7555,7 @@ fn bindgen_test_layout_user_fpxregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpxregs_struct>())).fcs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fcs) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -7656,7 +7565,7 @@ fn bindgen_test_layout_user_fpxregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpxregs_struct>())).foo as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -7666,7 +7575,7 @@ fn bindgen_test_layout_user_fpxregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpxregs_struct>())).fos as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fos) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -7676,7 +7585,7 @@ fn bindgen_test_layout_user_fpxregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpxregs_struct>())).mxcsr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).mxcsr) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -7686,7 +7595,7 @@ fn bindgen_test_layout_user_fpxregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpxregs_struct>())).reserved as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -7696,7 +7605,7 @@ fn bindgen_test_layout_user_fpxregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpxregs_struct>())).st_space as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).st_space) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -7706,7 +7615,7 @@ fn bindgen_test_layout_user_fpxregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpxregs_struct>())).xmm_space as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xmm_space) as usize - ptr as usize },
         160usize,
         concat!(
             "Offset of field: ",
@@ -7716,7 +7625,7 @@ fn bindgen_test_layout_user_fpxregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpxregs_struct>())).padding as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         288usize,
         concat!(
             "Offset of field: ",
@@ -7749,6 +7658,8 @@ pub struct user_regs_struct {
 }
 #[test]
 fn bindgen_test_layout_user_regs_struct() {
+    const UNINIT: ::std::mem::MaybeUninit<user_regs_struct> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<user_regs_struct>(),
         68usize,
@@ -7760,7 +7671,7 @@ fn bindgen_test_layout_user_regs_struct() {
         concat!("Alignment of ", stringify!(user_regs_struct))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).ebx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ebx) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7770,7 +7681,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).ecx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ecx) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -7780,7 +7691,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).edx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).edx) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7790,7 +7701,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).esi as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).esi) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -7800,7 +7711,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).edi as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).edi) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -7810,7 +7721,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).ebp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ebp) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -7820,7 +7731,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).eax as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).eax) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -7830,7 +7741,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).xds as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xds) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -7840,7 +7751,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).xes as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xes) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -7850,7 +7761,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).xfs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xfs) as usize - ptr as usize },
         36usize,
         concat!(
             "Offset of field: ",
@@ -7860,7 +7771,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).xgs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xgs) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -7870,7 +7781,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).orig_eax as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).orig_eax) as usize - ptr as usize },
         44usize,
         concat!(
             "Offset of field: ",
@@ -7880,7 +7791,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).eip as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).eip) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -7890,7 +7801,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).xcs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xcs) as usize - ptr as usize },
         52usize,
         concat!(
             "Offset of field: ",
@@ -7900,7 +7811,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).eflags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).eflags) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -7910,7 +7821,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).esp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).esp) as usize - ptr as usize },
         60usize,
         concat!(
             "Offset of field: ",
@@ -7920,7 +7831,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).xss as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xss) as usize - ptr as usize },
         64usize,
         concat!(
             "Offset of field: ",
@@ -7951,6 +7862,8 @@ pub struct user {
 }
 #[test]
 fn bindgen_test_layout_user() {
+    const UNINIT: ::std::mem::MaybeUninit<user> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<user>(),
         284usize,
@@ -7962,7 +7875,7 @@ fn bindgen_test_layout_user() {
         concat!("Alignment of ", stringify!(user))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).regs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).regs) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7972,7 +7885,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_fpvalid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_fpvalid) as usize - ptr as usize },
         68usize,
         concat!(
             "Offset of field: ",
@@ -7982,7 +7895,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).i387 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).i387) as usize - ptr as usize },
         72usize,
         concat!(
             "Offset of field: ",
@@ -7992,7 +7905,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_tsize as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_tsize) as usize - ptr as usize },
         180usize,
         concat!(
             "Offset of field: ",
@@ -8002,7 +7915,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_dsize as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_dsize) as usize - ptr as usize },
         184usize,
         concat!(
             "Offset of field: ",
@@ -8012,7 +7925,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_ssize as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_ssize) as usize - ptr as usize },
         188usize,
         concat!(
             "Offset of field: ",
@@ -8022,7 +7935,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).start_code as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).start_code) as usize - ptr as usize },
         192usize,
         concat!(
             "Offset of field: ",
@@ -8032,7 +7945,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).start_stack as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).start_stack) as usize - ptr as usize },
         196usize,
         concat!(
             "Offset of field: ",
@@ -8042,7 +7955,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).signal as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).signal) as usize - ptr as usize },
         200usize,
         concat!(
             "Offset of field: ",
@@ -8052,7 +7965,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).reserved as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved) as usize - ptr as usize },
         204usize,
         concat!(
             "Offset of field: ",
@@ -8062,7 +7975,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_ar0 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_ar0) as usize - ptr as usize },
         208usize,
         concat!(
             "Offset of field: ",
@@ -8072,7 +7985,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_fpstate as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_fpstate) as usize - ptr as usize },
         212usize,
         concat!(
             "Offset of field: ",
@@ -8082,7 +7995,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).magic as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).magic) as usize - ptr as usize },
         216usize,
         concat!(
             "Offset of field: ",
@@ -8092,7 +8005,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_comm as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_comm) as usize - ptr as usize },
         220usize,
         concat!(
             "Offset of field: ",
@@ -8102,7 +8015,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_debugreg as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_debugreg) as usize - ptr as usize },
         252usize,
         concat!(
             "Offset of field: ",
@@ -8112,26 +8025,26 @@ fn bindgen_test_layout_user() {
         )
     );
 }
-pub const REG_GS: ::std::os::raw::c_uint = 0;
-pub const REG_FS: ::std::os::raw::c_uint = 1;
-pub const REG_ES: ::std::os::raw::c_uint = 2;
-pub const REG_DS: ::std::os::raw::c_uint = 3;
-pub const REG_EDI: ::std::os::raw::c_uint = 4;
-pub const REG_ESI: ::std::os::raw::c_uint = 5;
-pub const REG_EBP: ::std::os::raw::c_uint = 6;
-pub const REG_ESP: ::std::os::raw::c_uint = 7;
-pub const REG_EBX: ::std::os::raw::c_uint = 8;
-pub const REG_EDX: ::std::os::raw::c_uint = 9;
-pub const REG_ECX: ::std::os::raw::c_uint = 10;
-pub const REG_EAX: ::std::os::raw::c_uint = 11;
-pub const REG_TRAPNO: ::std::os::raw::c_uint = 12;
-pub const REG_ERR: ::std::os::raw::c_uint = 13;
-pub const REG_EIP: ::std::os::raw::c_uint = 14;
-pub const REG_CS: ::std::os::raw::c_uint = 15;
-pub const REG_EFL: ::std::os::raw::c_uint = 16;
-pub const REG_UESP: ::std::os::raw::c_uint = 17;
-pub const REG_SS: ::std::os::raw::c_uint = 18;
-pub const NGREG: ::std::os::raw::c_uint = 19;
+pub const REG_GS: _bindgen_ty_22 = 0;
+pub const REG_FS: _bindgen_ty_22 = 1;
+pub const REG_ES: _bindgen_ty_22 = 2;
+pub const REG_DS: _bindgen_ty_22 = 3;
+pub const REG_EDI: _bindgen_ty_22 = 4;
+pub const REG_ESI: _bindgen_ty_22 = 5;
+pub const REG_EBP: _bindgen_ty_22 = 6;
+pub const REG_ESP: _bindgen_ty_22 = 7;
+pub const REG_EBX: _bindgen_ty_22 = 8;
+pub const REG_EDX: _bindgen_ty_22 = 9;
+pub const REG_ECX: _bindgen_ty_22 = 10;
+pub const REG_EAX: _bindgen_ty_22 = 11;
+pub const REG_TRAPNO: _bindgen_ty_22 = 12;
+pub const REG_ERR: _bindgen_ty_22 = 13;
+pub const REG_EIP: _bindgen_ty_22 = 14;
+pub const REG_CS: _bindgen_ty_22 = 15;
+pub const REG_EFL: _bindgen_ty_22 = 16;
+pub const REG_UESP: _bindgen_ty_22 = 17;
+pub const REG_SS: _bindgen_ty_22 = 18;
+pub const NGREG: _bindgen_ty_22 = 19;
 pub type _bindgen_ty_22 = ::std::os::raw::c_uint;
 pub type greg_t = ::std::os::raw::c_int;
 pub type gregset_t = [greg_t; 19usize];
@@ -8143,6 +8056,8 @@ pub struct _libc_fpreg {
 }
 #[test]
 fn bindgen_test_layout__libc_fpreg() {
+    const UNINIT: ::std::mem::MaybeUninit<_libc_fpreg> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_libc_fpreg>(),
         10usize,
@@ -8154,7 +8069,7 @@ fn bindgen_test_layout__libc_fpreg() {
         concat!("Alignment of ", stringify!(_libc_fpreg))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpreg>())).significand as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).significand) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8164,7 +8079,7 @@ fn bindgen_test_layout__libc_fpreg() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpreg>())).exponent as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).exponent) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -8189,6 +8104,8 @@ pub struct _libc_fpstate {
 }
 #[test]
 fn bindgen_test_layout__libc_fpstate() {
+    const UNINIT: ::std::mem::MaybeUninit<_libc_fpstate> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_libc_fpstate>(),
         112usize,
@@ -8200,7 +8117,7 @@ fn bindgen_test_layout__libc_fpstate() {
         concat!("Alignment of ", stringify!(_libc_fpstate))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).cw as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cw) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8210,7 +8127,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).sw as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sw) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -8220,7 +8137,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).tag as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tag) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -8230,7 +8147,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).ipoff as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ipoff) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -8240,7 +8157,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).cssel as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cssel) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -8250,7 +8167,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).dataoff as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).dataoff) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -8260,7 +8177,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).datasel as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).datasel) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -8270,7 +8187,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>()))._st as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._st) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -8280,7 +8197,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).status as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).status) as usize - ptr as usize },
         108usize,
         concat!(
             "Offset of field: ",
@@ -8301,6 +8218,8 @@ pub struct mcontext_t {
 }
 #[test]
 fn bindgen_test_layout_mcontext_t() {
+    const UNINIT: ::std::mem::MaybeUninit<mcontext_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<mcontext_t>(),
         88usize,
@@ -8312,7 +8231,7 @@ fn bindgen_test_layout_mcontext_t() {
         concat!("Alignment of ", stringify!(mcontext_t))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<mcontext_t>())).gregs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).gregs) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8322,7 +8241,7 @@ fn bindgen_test_layout_mcontext_t() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<mcontext_t>())).fpregs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpregs) as usize - ptr as usize },
         76usize,
         concat!(
             "Offset of field: ",
@@ -8332,7 +8251,7 @@ fn bindgen_test_layout_mcontext_t() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<mcontext_t>())).oldmask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         80usize,
         concat!(
             "Offset of field: ",
@@ -8342,7 +8261,7 @@ fn bindgen_test_layout_mcontext_t() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<mcontext_t>())).cr2 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cr2) as usize - ptr as usize },
         84usize,
         concat!(
             "Offset of field: ",
@@ -8353,6 +8272,7 @@ fn bindgen_test_layout_mcontext_t() {
     );
 }
 #[repr(C)]
+#[derive(Copy, Clone)]
 pub struct ucontext {
     pub uc_flags: ::std::os::raw::c_ulong,
     pub uc_link: *mut ucontext,
@@ -8375,6 +8295,9 @@ pub struct ucontext__bindgen_ty_1__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_ucontext__bindgen_ty_1__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<ucontext__bindgen_ty_1__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<ucontext__bindgen_ty_1__bindgen_ty_1>(),
         8usize,
@@ -8392,10 +8315,7 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<ucontext__bindgen_ty_1__bindgen_ty_1>())).uc_sigmask as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8405,10 +8325,7 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<ucontext__bindgen_ty_1__bindgen_ty_1>())).__padding_rt_sigset
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__padding_rt_sigset) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -8420,6 +8337,9 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_ucontext__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<ucontext__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<ucontext__bindgen_ty_1>(),
         8usize,
@@ -8431,9 +8351,7 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(ucontext__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<ucontext__bindgen_ty_1>())).uc_sigmask64 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask64) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8445,6 +8363,8 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_ucontext() {
+    const UNINIT: ::std::mem::MaybeUninit<ucontext> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<ucontext>(),
         228usize,
@@ -8456,7 +8376,7 @@ fn bindgen_test_layout_ucontext() {
         concat!("Alignment of ", stringify!(ucontext))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_flags) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8466,7 +8386,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_link as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_link) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -8476,7 +8396,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_stack as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_stack) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -8486,7 +8406,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_mcontext as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_mcontext) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -8496,7 +8416,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).__fpregs_mem as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__fpregs_mem) as usize - ptr as usize },
         116usize,
         concat!(
             "Offset of field: ",
@@ -8710,6 +8630,8 @@ pub struct fd_set {
 }
 #[test]
 fn bindgen_test_layout_fd_set() {
+    const UNINIT: ::std::mem::MaybeUninit<fd_set> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<fd_set>(),
         128usize,
@@ -8721,7 +8643,7 @@ fn bindgen_test_layout_fd_set() {
         concat!("Alignment of ", stringify!(fd_set))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<fd_set>())).fds_bits as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8732,21 +8654,21 @@ fn bindgen_test_layout_fd_set() {
     );
 }
 extern "C" {
-    pub fn __FD_CLR_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: size_t);
+    pub fn __FD_CLR_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: usize);
 }
 extern "C" {
-    pub fn __FD_SET_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: size_t);
+    pub fn __FD_SET_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: usize);
 }
 extern "C" {
     pub fn __FD_ISSET_chk(
         arg1: ::std::os::raw::c_int,
         arg2: *const fd_set,
-        arg3: size_t,
+        arg3: usize,
     ) -> ::std::os::raw::c_int;
 }
 extern "C" {
     pub fn select(
-        __fd_count: ::std::os::raw::c_int,
+        __max_fd_plus_one: ::std::os::raw::c_int,
         __read_fds: *mut fd_set,
         __write_fds: *mut fd_set,
         __exception_fds: *mut fd_set,
@@ -8755,7 +8677,7 @@ extern "C" {
 }
 extern "C" {
     pub fn pselect(
-        __fd_count: ::std::os::raw::c_int,
+        __max_fd_plus_one: ::std::os::raw::c_int,
         __read_fds: *mut fd_set,
         __write_fds: *mut fd_set,
         __exception_fds: *mut fd_set,
@@ -8765,7 +8687,7 @@ extern "C" {
 }
 extern "C" {
     pub fn pselect64(
-        __fd_count: ::std::os::raw::c_int,
+        __max_fd_plus_one: ::std::os::raw::c_int,
         __read_fds: *mut fd_set,
         __write_fds: *mut fd_set,
         __exception_fds: *mut fd_set,
@@ -8830,6 +8752,8 @@ pub struct tm {
 }
 #[test]
 fn bindgen_test_layout_tm() {
+    const UNINIT: ::std::mem::MaybeUninit<tm> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<tm>(),
         44usize,
@@ -8841,7 +8765,7 @@ fn bindgen_test_layout_tm() {
         concat!("Alignment of ", stringify!(tm))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8851,7 +8775,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_min as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_min) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -8861,7 +8785,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_hour as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_hour) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -8871,7 +8795,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_mday as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_mday) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -8881,7 +8805,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_mon as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_mon) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -8891,7 +8815,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_year as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_year) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -8901,7 +8825,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_wday as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_wday) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -8911,7 +8835,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_yday as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_yday) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -8921,7 +8845,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_isdst as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_isdst) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -8931,7 +8855,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_gmtoff as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_gmtoff) as usize - ptr as usize },
         36usize,
         concat!(
             "Offset of field: ",
@@ -8941,7 +8865,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_zone as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_zone) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -9005,19 +8929,19 @@ extern "C" {
 extern "C" {
     pub fn strftime(
         __buf: *mut ::std::os::raw::c_char,
-        __n: size_t,
+        __n: usize,
         __fmt: *const ::std::os::raw::c_char,
         __tm: *const tm,
-    ) -> size_t;
+    ) -> usize;
 }
 extern "C" {
     pub fn strftime_l(
         __buf: *mut ::std::os::raw::c_char,
-        __n: size_t,
+        __n: usize,
         __fmt: *const ::std::os::raw::c_char,
         __tm: *const tm,
         __l: locale_t,
-    ) -> size_t;
+    ) -> usize;
 }
 extern "C" {
     pub fn ctime(__t: *const time_t) -> *mut ::std::os::raw::c_char;
@@ -9126,12 +9050,17 @@ pub struct clone_args {
     pub stack: __u64,
     pub stack_size: __u64,
     pub tls: __u64,
+    pub set_tid: __u64,
+    pub set_tid_size: __u64,
+    pub cgroup: __u64,
 }
 #[test]
 fn bindgen_test_layout_clone_args() {
+    const UNINIT: ::std::mem::MaybeUninit<clone_args> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<clone_args>(),
-        64usize,
+        88usize,
         concat!("Size of: ", stringify!(clone_args))
     );
     assert_eq!(
@@ -9140,7 +9069,7 @@ fn bindgen_test_layout_clone_args() {
         concat!("Alignment of ", stringify!(clone_args))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -9150,7 +9079,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).pidfd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).pidfd) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -9160,7 +9089,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).child_tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).child_tid) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -9170,7 +9099,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).parent_tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).parent_tid) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -9180,7 +9109,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).exit_signal as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).exit_signal) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -9190,7 +9119,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).stack as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).stack) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -9200,7 +9129,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).stack_size as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).stack_size) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -9210,7 +9139,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).tls as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tls) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -9219,6 +9148,36 @@ fn bindgen_test_layout_clone_args() {
             stringify!(tls)
         )
     );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).set_tid) as usize - ptr as usize },
+        64usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(clone_args),
+            "::",
+            stringify!(set_tid)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).set_tid_size) as usize - ptr as usize },
+        72usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(clone_args),
+            "::",
+            stringify!(set_tid_size)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).cgroup) as usize - ptr as usize },
+        80usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(clone_args),
+            "::",
+            stringify!(cgroup)
+        )
+    );
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -9227,6 +9186,8 @@ pub struct sched_param {
 }
 #[test]
 fn bindgen_test_layout_sched_param() {
+    const UNINIT: ::std::mem::MaybeUninit<sched_param> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sched_param>(),
         4usize,
@@ -9238,7 +9199,7 @@ fn bindgen_test_layout_sched_param() {
         concat!("Alignment of ", stringify!(sched_param))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sched_param>())).sched_priority as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sched_priority) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -9276,15 +9237,15 @@ extern "C" {
 extern "C" {
     pub fn sched_rr_get_interval(__pid: pid_t, __quantum: *mut timespec) -> ::std::os::raw::c_int;
 }
-pub const PTHREAD_MUTEX_NORMAL: ::std::os::raw::c_uint = 0;
-pub const PTHREAD_MUTEX_RECURSIVE: ::std::os::raw::c_uint = 1;
-pub const PTHREAD_MUTEX_ERRORCHECK: ::std::os::raw::c_uint = 2;
-pub const PTHREAD_MUTEX_ERRORCHECK_NP: ::std::os::raw::c_uint = 2;
-pub const PTHREAD_MUTEX_RECURSIVE_NP: ::std::os::raw::c_uint = 1;
-pub const PTHREAD_MUTEX_DEFAULT: ::std::os::raw::c_uint = 0;
+pub const PTHREAD_MUTEX_NORMAL: _bindgen_ty_23 = 0;
+pub const PTHREAD_MUTEX_RECURSIVE: _bindgen_ty_23 = 1;
+pub const PTHREAD_MUTEX_ERRORCHECK: _bindgen_ty_23 = 2;
+pub const PTHREAD_MUTEX_ERRORCHECK_NP: _bindgen_ty_23 = 2;
+pub const PTHREAD_MUTEX_RECURSIVE_NP: _bindgen_ty_23 = 1;
+pub const PTHREAD_MUTEX_DEFAULT: _bindgen_ty_23 = 0;
 pub type _bindgen_ty_23 = ::std::os::raw::c_uint;
-pub const PTHREAD_RWLOCK_PREFER_READER_NP: ::std::os::raw::c_uint = 0;
-pub const PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP: ::std::os::raw::c_uint = 1;
+pub const PTHREAD_RWLOCK_PREFER_READER_NP: _bindgen_ty_24 = 0;
+pub const PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP: _bindgen_ty_24 = 1;
 pub type _bindgen_ty_24 = ::std::os::raw::c_uint;
 pub type __pthread_cleanup_func_t =
     ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>;
@@ -9297,6 +9258,8 @@ pub struct __pthread_cleanup_t {
 }
 #[test]
 fn bindgen_test_layout___pthread_cleanup_t() {
+    const UNINIT: ::std::mem::MaybeUninit<__pthread_cleanup_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__pthread_cleanup_t>(),
         12usize,
@@ -9308,9 +9271,7 @@ fn bindgen_test_layout___pthread_cleanup_t() {
         concat!("Alignment of ", stringify!(__pthread_cleanup_t))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__pthread_cleanup_t>())).__cleanup_prev as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_prev) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -9320,9 +9281,7 @@ fn bindgen_test_layout___pthread_cleanup_t() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__pthread_cleanup_t>())).__cleanup_routine as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_routine) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -9332,9 +9291,7 @@ fn bindgen_test_layout___pthread_cleanup_t() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__pthread_cleanup_t>())).__cleanup_arg as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_arg) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -9354,24 +9311,23 @@ extern "C" {
 extern "C" {
     pub fn __pthread_cleanup_pop(arg1: *mut __pthread_cleanup_t, arg2: ::std::os::raw::c_int);
 }
-#[doc = " Data associated with an ALooper fd that will be returned as the \"outData\""]
-#[doc = " when that source has data ready."]
+#[doc = " Data associated with an ALooper fd that will be returned as the \"outData\"\n when that source has data ready."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct android_poll_source {
-    #[doc = " The identifier of this source.  May be LOOPER_ID_MAIN or"]
-    #[doc = " LOOPER_ID_INPUT."]
+    #[doc = " The identifier of this source.  May be LOOPER_ID_MAIN or\n LOOPER_ID_INPUT."]
     pub id: i32,
     #[doc = " The android_app this ident is associated with."]
     pub app: *mut android_app,
-    #[doc = " Function to call to perform the standard processing of data from"]
-    #[doc = " this source."]
+    #[doc = " Function to call to perform the standard processing of data from\n this source."]
     pub process: ::std::option::Option<
         unsafe extern "C" fn(app: *mut android_app, source: *mut android_poll_source),
     >,
 }
 #[test]
 fn bindgen_test_layout_android_poll_source() {
+    const UNINIT: ::std::mem::MaybeUninit<android_poll_source> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_poll_source>(),
         12usize,
@@ -9383,7 +9339,7 @@ fn bindgen_test_layout_android_poll_source() {
         concat!("Alignment of ", stringify!(android_poll_source))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_poll_source>())).id as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -9393,7 +9349,7 @@ fn bindgen_test_layout_android_poll_source() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_poll_source>())).app as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).app) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -9403,7 +9359,7 @@ fn bindgen_test_layout_android_poll_source() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_poll_source>())).process as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).process) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -9416,37 +9372,26 @@ fn bindgen_test_layout_android_poll_source() {
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct android_input_buffer {
-    #[doc = " Pointer to a read-only array of pointers to GameActivityMotionEvent."]
-    #[doc = " Only the first motionEventsCount events are valid."]
-    pub motionEvents: [GameActivityMotionEvent; 16usize],
+    #[doc = " Pointer to a read-only array of GameActivityMotionEvent.\n Only the first motionEventsCount events are valid."]
+    pub motionEvents: *mut GameActivityMotionEvent,
     #[doc = " The number of valid motion events in `motionEvents`."]
     pub motionEventsCount: u64,
-    #[doc = " Pointer to a read-only array of pointers to GameActivityHistoricalPointerAxes."]
-    #[doc = ""]
-    #[doc = " Only the first historicalSamplesCount samples are valid."]
-    #[doc = " Refer to event->historicalStart, event->pointerCount and event->historicalCount"]
-    #[doc = " to access the specific samples that relate to an event."]
-    #[doc = ""]
-    #[doc = " Each slice of samples for one event has a length of"]
-    #[doc = " (event->pointerCount and event->historicalCount) and is in pointer-major"]
-    #[doc = " order so the historic samples for each pointer are contiguous."]
-    #[doc = " E.g. you would access historic sample index 3 for pointer 2 of an event with:"]
-    #[doc = ""]
-    #[doc = "   historicalAxisSamples[event->historicalStart + (event->historicalCount * 2) + 3];"]
-    pub historicalAxisSamples: [GameActivityHistoricalPointerAxes; 64usize],
-    #[doc = " The number of valid historical samples in `historicalAxisSamples`."]
-    pub historicalSamplesCount: u64,
-    #[doc = " Pointer to a read-only array of pointers to GameActivityKeyEvent."]
-    #[doc = " Only the first keyEventsCount events are valid."]
-    pub keyEvents: [GameActivityKeyEvent; 4usize],
+    #[doc = " The size of the `motionEvents` buffer."]
+    pub motionEventsBufferSize: u64,
+    #[doc = " Pointer to a read-only array of GameActivityKeyEvent.\n Only the first keyEventsCount events are valid."]
+    pub keyEvents: *mut GameActivityKeyEvent,
     #[doc = " The number of valid \"Key\" events in `keyEvents`."]
     pub keyEventsCount: u64,
+    #[doc = " The size of the `keyEvents` buffer."]
+    pub keyEventsBufferSize: u64,
 }
 #[test]
 fn bindgen_test_layout_android_input_buffer() {
+    const UNINIT: ::std::mem::MaybeUninit<android_input_buffer> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_input_buffer>(),
-        40744usize,
+        40usize,
         concat!("Size of: ", stringify!(android_input_buffer))
     );
     assert_eq!(
@@ -9455,9 +9400,7 @@ fn bindgen_test_layout_android_input_buffer() {
         concat!("Alignment of ", stringify!(android_input_buffer))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).motionEvents as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEvents) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -9467,10 +9410,8 @@ fn bindgen_test_layout_android_input_buffer() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).motionEventsCount as *const _ as usize
-        },
-        27712usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEventsCount) as usize - ptr as usize },
+        4usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
@@ -9479,153 +9420,81 @@ fn bindgen_test_layout_android_input_buffer() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).historicalAxisSamples as *const _
-                as usize
-        },
-        27720usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEventsBufferSize) as usize - ptr as usize },
+        12usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(historicalAxisSamples)
+            stringify!(motionEventsBufferSize)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).historicalSamplesCount as *const _
-                as usize
-        },
-        40520usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEvents) as usize - ptr as usize },
+        20usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(historicalSamplesCount)
+            stringify!(keyEvents)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_input_buffer>())).keyEvents as *const _ as usize },
-        40528usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEventsCount) as usize - ptr as usize },
+        24usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(keyEvents)
+            stringify!(keyEventsCount)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).keyEventsCount as *const _ as usize
-        },
-        40736usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEventsBufferSize) as usize - ptr as usize },
+        32usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(keyEventsCount)
+            stringify!(keyEventsBufferSize)
         )
     );
 }
-#[doc = " Function pointer declaration for the filtering of key events."]
-#[doc = " A function with this signature should be passed to"]
-#[doc = " android_app_set_key_event_filter and return false for any events that should"]
-#[doc = " not be handled by android_native_app_glue. These events will be handled by"]
-#[doc = " the system instead."]
+#[doc = " Function pointer declaration for the filtering of key events.\n A function with this signature should be passed to\n android_app_set_key_event_filter and return false for any events that should\n not be handled by android_native_app_glue. These events will be handled by\n the system instead."]
 pub type android_key_event_filter =
     ::std::option::Option<unsafe extern "C" fn(arg1: *const GameActivityKeyEvent) -> bool>;
-#[doc = " Function pointer definition for the filtering of motion events."]
-#[doc = " A function with this signature should be passed to"]
-#[doc = " android_app_set_motion_event_filter and return false for any events that"]
-#[doc = " should not be handled by android_native_app_glue. These events will be"]
-#[doc = " handled by the system instead."]
+#[doc = " Function pointer definition for the filtering of motion events.\n A function with this signature should be passed to\n android_app_set_motion_event_filter and return false for any events that\n should not be handled by android_native_app_glue. These events will be\n handled by the system instead."]
 pub type android_motion_event_filter =
     ::std::option::Option<unsafe extern "C" fn(arg1: *const GameActivityMotionEvent) -> bool>;
-#[doc = " The GameActivity interface provided by <game-activity/GameActivity.h>"]
-#[doc = " is based on a set of application-provided callbacks that will be called"]
-#[doc = " by the Activity's main thread when certain events occur."]
-#[doc = ""]
-#[doc = " This means that each one of this callbacks _should_ _not_ block, or they"]
-#[doc = " risk having the system force-close the application. This programming"]
-#[doc = " model is direct, lightweight, but constraining."]
-#[doc = ""]
-#[doc = " The 'android_native_app_glue' static library is used to provide a different"]
-#[doc = " execution model where the application can implement its own main event"]
-#[doc = " loop in a different thread instead. Here's how it works:"]
-#[doc = ""]
-#[doc = " 1/ The application must provide a function named \"android_main()\" that"]
-#[doc = "    will be called when the activity is created, in a new thread that is"]
-#[doc = "    distinct from the activity's main thread."]
-#[doc = ""]
-#[doc = " 2/ android_main() receives a pointer to a valid \"android_app\" structure"]
-#[doc = "    that contains references to other important objects, e.g. the"]
-#[doc = "    GameActivity obejct instance the application is running in."]
-#[doc = ""]
-#[doc = " 3/ the \"android_app\" object holds an ALooper instance that already"]
-#[doc = "    listens to activity lifecycle events (e.g. \"pause\", \"resume\")."]
-#[doc = "    See APP_CMD_XXX declarations below."]
-#[doc = ""]
-#[doc = "    This corresponds to an ALooper identifier returned by"]
-#[doc = "    ALooper_pollOnce with value LOOPER_ID_MAIN."]
-#[doc = ""]
-#[doc = "    Your application can use the same ALooper to listen to additional"]
-#[doc = "    file-descriptors.  They can either be callback based, or with return"]
-#[doc = "    identifiers starting with LOOPER_ID_USER."]
-#[doc = ""]
-#[doc = " 4/ Whenever you receive a LOOPER_ID_MAIN event,"]
-#[doc = "    the returned data will point to an android_poll_source structure.  You"]
-#[doc = "    can call the process() function on it, and fill in android_app->onAppCmd"]
-#[doc = "    to be called for your own processing of the event."]
-#[doc = ""]
-#[doc = "    Alternatively, you can call the low-level functions to read and process"]
-#[doc = "    the data directly...  look at the process_cmd() and process_input()"]
-#[doc = "    implementations in the glue to see how to do this."]
-#[doc = ""]
-#[doc = " See the sample named \"native-activity\" that comes with the NDK with a"]
-#[doc = " full usage example.  Also look at the documentation of GameActivity."]
+#[doc = " The GameActivity interface provided by <game-activity/GameActivity.h>\n is based on a set of application-provided callbacks that will be called\n by the Activity's main thread when certain events occur.\n\n This means that each one of this callbacks _should_ _not_ block, or they\n risk having the system force-close the application. This programming\n model is direct, lightweight, but constraining.\n\n The 'android_native_app_glue' static library is used to provide a different\n execution model where the application can implement its own main event\n loop in a different thread instead. Here's how it works:\n\n 1/ The application must provide a function named \"android_main()\" that\n    will be called when the activity is created, in a new thread that is\n    distinct from the activity's main thread.\n\n 2/ android_main() receives a pointer to a valid \"android_app\" structure\n    that contains references to other important objects, e.g. the\n    GameActivity obejct instance the application is running in.\n\n 3/ the \"android_app\" object holds an ALooper instance that already\n    listens to activity lifecycle events (e.g. \"pause\", \"resume\").\n    See APP_CMD_XXX declarations below.\n\n    This corresponds to an ALooper identifier returned by\n    ALooper_pollOnce with value LOOPER_ID_MAIN.\n\n    Your application can use the same ALooper to listen to additional\n    file-descriptors.  They can either be callback based, or with return\n    identifiers starting with LOOPER_ID_USER.\n\n 4/ Whenever you receive a LOOPER_ID_MAIN event,\n    the returned data will point to an android_poll_source structure.  You\n    can call the process() function on it, and fill in android_app->onAppCmd\n    to be called for your own processing of the event.\n\n    Alternatively, you can call the low-level functions to read and process\n    the data directly...  look at the process_cmd() and process_input()\n    implementations in the glue to see how to do this.\n\n See the sample named \"native-activity\" that comes with the NDK with a\n full usage example.  Also look at the documentation of GameActivity."]
 #[repr(C)]
 pub struct android_app {
     #[doc = " An optional pointer to application-defined state."]
     pub userData: *mut ::std::os::raw::c_void,
-    #[doc = " A required callback for processing main app commands (`APP_CMD_*`)."]
-    #[doc = " This is called each frame if there are app commands that need processing."]
+    #[doc = " A required callback for processing main app commands (`APP_CMD_*`).\n This is called each frame if there are app commands that need processing."]
     pub onAppCmd: ::std::option::Option<unsafe extern "C" fn(app: *mut android_app, cmd: i32)>,
     #[doc = " The GameActivity object instance that this app is running in."]
     pub activity: *mut GameActivity,
     #[doc = " The current configuration the app is running in."]
     pub config: *mut AConfiguration,
-    #[doc = " The last activity saved state, as provided at creation time."]
-    #[doc = " It is NULL if there was no state.  You can use this as you need; the"]
-    #[doc = " memory will remain around until you call android_app_exec_cmd() for"]
-    #[doc = " APP_CMD_RESUME, at which point it will be freed and savedState set to"]
-    #[doc = " NULL. These variables should only be changed when processing a"]
-    #[doc = " APP_CMD_SAVE_STATE, at which point they will be initialized to NULL and"]
-    #[doc = " you can malloc your state and place the information here.  In that case"]
-    #[doc = " the memory will be freed for you later."]
+    #[doc = " The last activity saved state, as provided at creation time.\n It is NULL if there was no state.  You can use this as you need; the\n memory will remain around until you call android_app_exec_cmd() for\n APP_CMD_RESUME, at which point it will be freed and savedState set to\n NULL. These variables should only be changed when processing a\n APP_CMD_SAVE_STATE, at which point they will be initialized to NULL and\n you can malloc your state and place the information here.  In that case\n the memory will be freed for you later."]
     pub savedState: *mut ::std::os::raw::c_void,
     #[doc = " The size of the activity saved state. It is 0 if `savedState` is NULL."]
-    pub savedStateSize: size_t,
+    pub savedStateSize: usize,
     #[doc = " The ALooper associated with the app's thread."]
     pub looper: *mut ALooper,
     #[doc = " When non-NULL, this is the window surface that the app can draw in."]
     pub window: *mut ANativeWindow,
-    #[doc = " Current content rectangle of the window; this is the area where the"]
-    #[doc = " window's content should be placed to be seen by the user."]
+    #[doc = " Current content rectangle of the window; this is the area where the\n window's content should be placed to be seen by the user."]
     pub contentRect: ARect,
-    #[doc = " Current state of the app's activity.  May be either APP_CMD_START,"]
-    #[doc = " APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP."]
+    #[doc = " Current state of the app's activity.  May be either APP_CMD_START,\n APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP."]
     pub activityState: ::std::os::raw::c_int,
-    #[doc = " This is non-zero when the application's GameActivity is being"]
-    #[doc = " destroyed and waiting for the app thread to complete."]
+    #[doc = " This is non-zero when the application's GameActivity is being\n destroyed and waiting for the app thread to complete."]
     pub destroyRequested: ::std::os::raw::c_int,
-    #[doc = " This is used for buffering input from GameActivity. Once ready, the"]
-    #[doc = " application thread switches the buffers and processes what was"]
-    #[doc = " accumulated."]
+    #[doc = " This is used for buffering input from GameActivity. Once ready, the\n application thread switches the buffers and processes what was\n accumulated."]
     pub inputBuffers: [android_input_buffer; 2usize],
     pub currentInputBuffer: ::std::os::raw::c_int,
-    #[doc = " 0 if no text input event is outstanding, 1 if it is."]
-    #[doc = " Use `GameActivity_getTextInputState` to get information"]
-    #[doc = " about the text entered by the user."]
+    #[doc = " 0 if no text input event is outstanding, 1 if it is.\n Use `GameActivity_getTextInputState` to get information\n about the text entered by the user."]
     pub textInputState: ::std::os::raw::c_int,
     #[doc = " @cond INTERNAL"]
     pub mutex: pthread_mutex_t,
@@ -9647,9 +9516,11 @@ pub struct android_app {
 }
 #[test]
 fn bindgen_test_layout_android_app() {
+    const UNINIT: ::std::mem::MaybeUninit<android_app> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_app>(),
-        81632usize,
+        224usize,
         concat!("Size of: ", stringify!(android_app))
     );
     assert_eq!(
@@ -9658,7 +9529,7 @@ fn bindgen_test_layout_android_app() {
         concat!("Alignment of ", stringify!(android_app))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).userData as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).userData) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -9668,7 +9539,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).onAppCmd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onAppCmd) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -9678,7 +9549,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).activity as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).activity) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -9688,7 +9559,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).config as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).config) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -9698,7 +9569,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).savedState as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).savedState) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -9708,7 +9579,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).savedStateSize as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).savedStateSize) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -9718,7 +9589,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).looper as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).looper) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -9728,7 +9599,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).window as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).window) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -9738,7 +9609,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).contentRect as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).contentRect) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -9748,7 +9619,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).activityState as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).activityState) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -9758,7 +9629,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).destroyRequested as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).destroyRequested) as usize - ptr as usize },
         52usize,
         concat!(
             "Offset of field: ",
@@ -9768,7 +9639,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).inputBuffers as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).inputBuffers) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -9778,8 +9649,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).currentInputBuffer as *const _ as usize },
-        81544usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).currentInputBuffer) as usize - ptr as usize },
+        136usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9788,8 +9659,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).textInputState as *const _ as usize },
-        81548usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).textInputState) as usize - ptr as usize },
+        140usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9798,8 +9669,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).mutex as *const _ as usize },
-        81552usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).mutex) as usize - ptr as usize },
+        144usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9808,8 +9679,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).cond as *const _ as usize },
-        81556usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).cond) as usize - ptr as usize },
+        148usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9818,8 +9689,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).msgread as *const _ as usize },
-        81560usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).msgread) as usize - ptr as usize },
+        152usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9828,8 +9699,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).msgwrite as *const _ as usize },
-        81564usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).msgwrite) as usize - ptr as usize },
+        156usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9838,8 +9709,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).thread as *const _ as usize },
-        81568usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).thread) as usize - ptr as usize },
+        160usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9848,8 +9719,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).cmdPollSource as *const _ as usize },
-        81572usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).cmdPollSource) as usize - ptr as usize },
+        164usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9858,8 +9729,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).running as *const _ as usize },
-        81584usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).running) as usize - ptr as usize },
+        176usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9868,8 +9739,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).stateSaved as *const _ as usize },
-        81588usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).stateSaved) as usize - ptr as usize },
+        180usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9878,8 +9749,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).destroyed as *const _ as usize },
-        81592usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).destroyed) as usize - ptr as usize },
+        184usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9888,8 +9759,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).redrawNeeded as *const _ as usize },
-        81596usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).redrawNeeded) as usize - ptr as usize },
+        188usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9898,8 +9769,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).pendingWindow as *const _ as usize },
-        81600usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pendingWindow) as usize - ptr as usize },
+        192usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9908,8 +9779,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).pendingContentRect as *const _ as usize },
-        81604usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pendingContentRect) as usize - ptr as usize },
+        196usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9918,8 +9789,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).keyEventFilter as *const _ as usize },
-        81620usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEventFilter) as usize - ptr as usize },
+        212usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9928,8 +9799,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).motionEventFilter as *const _ as usize },
-        81624usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEventFilter) as usize - ptr as usize },
+        216usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9938,10 +9809,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_app>())).inputAvailableWakeUp as *const _ as usize
-        },
-        81628usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).inputAvailableWakeUp) as usize - ptr as usize },
+        220usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9950,8 +9819,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).inputSwapPending as *const _ as usize },
-        81629usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).inputSwapPending) as usize - ptr as usize },
+        221usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9960,139 +9829,89 @@ fn bindgen_test_layout_android_app() {
         )
     );
 }
-#[doc = " Looper data ID of commands coming from the app's main thread, which"]
-#[doc = " is returned as an identifier from ALooper_pollOnce().  The data for this"]
-#[doc = " identifier is a pointer to an android_poll_source structure."]
-#[doc = " These can be retrieved and processed with android_app_read_cmd()"]
-#[doc = " and android_app_exec_cmd()."]
+#[doc = " Looper data ID of commands coming from the app's main thread, which\n is returned as an identifier from ALooper_pollOnce().  The data for this\n identifier is a pointer to an android_poll_source structure.\n These can be retrieved and processed with android_app_read_cmd()\n and android_app_exec_cmd()."]
 pub const NativeAppGlueLooperId_LOOPER_ID_MAIN: NativeAppGlueLooperId = 1;
-#[doc = " Unused. Reserved for future use when usage of AInputQueue will be"]
-#[doc = " supported."]
+#[doc = " Unused. Reserved for future use when usage of AInputQueue will be\n supported."]
 pub const NativeAppGlueLooperId_LOOPER_ID_INPUT: NativeAppGlueLooperId = 2;
 #[doc = " Start of user-defined ALooper identifiers."]
 pub const NativeAppGlueLooperId_LOOPER_ID_USER: NativeAppGlueLooperId = 3;
-#[doc = " Looper ID of commands coming from the app's main thread, an AInputQueue or"]
-#[doc = " user-defined sources."]
+#[doc = " Looper ID of commands coming from the app's main thread, an AInputQueue or\n user-defined sources."]
 pub type NativeAppGlueLooperId = ::std::os::raw::c_uint;
-#[doc = " Unused. Reserved for future use when usage of AInputQueue will be"]
-#[doc = " supported."]
+#[doc = " Unused. Reserved for future use when usage of AInputQueue will be\n supported."]
 pub const NativeAppGlueAppCmd_UNUSED_APP_CMD_INPUT_CHANGED: NativeAppGlueAppCmd = 0;
-#[doc = " Command from main thread: a new ANativeWindow is ready for use.  Upon"]
-#[doc = " receiving this command, android_app->window will contain the new window"]
-#[doc = " surface."]
+#[doc = " Command from main thread: a new ANativeWindow is ready for use.  Upon\n receiving this command, android_app->window will contain the new window\n surface."]
 pub const NativeAppGlueAppCmd_APP_CMD_INIT_WINDOW: NativeAppGlueAppCmd = 1;
-#[doc = " Command from main thread: the existing ANativeWindow needs to be"]
-#[doc = " terminated.  Upon receiving this command, android_app->window still"]
-#[doc = " contains the existing window; after calling android_app_exec_cmd"]
-#[doc = " it will be set to NULL."]
+#[doc = " Command from main thread: the existing ANativeWindow needs to be\n terminated.  Upon receiving this command, android_app->window still\n contains the existing window; after calling android_app_exec_cmd\n it will be set to NULL."]
 pub const NativeAppGlueAppCmd_APP_CMD_TERM_WINDOW: NativeAppGlueAppCmd = 2;
-#[doc = " Command from main thread: the current ANativeWindow has been resized."]
-#[doc = " Please redraw with its new size."]
+#[doc = " Command from main thread: the current ANativeWindow has been resized.\n Please redraw with its new size."]
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_RESIZED: NativeAppGlueAppCmd = 3;
-#[doc = " Command from main thread: the system needs that the current ANativeWindow"]
-#[doc = " be redrawn.  You should redraw the window before handing this to"]
-#[doc = " android_app_exec_cmd() in order to avoid transient drawing glitches."]
+#[doc = " Command from main thread: the system needs that the current ANativeWindow\n be redrawn.  You should redraw the window before handing this to\n android_app_exec_cmd() in order to avoid transient drawing glitches."]
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_REDRAW_NEEDED: NativeAppGlueAppCmd = 4;
-#[doc = " Command from main thread: the content area of the window has changed,"]
-#[doc = " such as from the soft input window being shown or hidden.  You can"]
-#[doc = " find the new content rect in android_app::contentRect."]
+#[doc = " Command from main thread: the content area of the window has changed,\n such as from the soft input window being shown or hidden.  You can\n find the new content rect in android_app::contentRect."]
 pub const NativeAppGlueAppCmd_APP_CMD_CONTENT_RECT_CHANGED: NativeAppGlueAppCmd = 5;
-#[doc = " Command from main thread: the app's activity window has gained"]
-#[doc = " input focus."]
+#[doc = " Command from main thread: the app's activity window has gained\n input focus."]
 pub const NativeAppGlueAppCmd_APP_CMD_GAINED_FOCUS: NativeAppGlueAppCmd = 6;
-#[doc = " Command from main thread: the app's activity window has lost"]
-#[doc = " input focus."]
+#[doc = " Command from main thread: the app's activity window has lost\n input focus."]
 pub const NativeAppGlueAppCmd_APP_CMD_LOST_FOCUS: NativeAppGlueAppCmd = 7;
 #[doc = " Command from main thread: the current device configuration has changed."]
 pub const NativeAppGlueAppCmd_APP_CMD_CONFIG_CHANGED: NativeAppGlueAppCmd = 8;
-#[doc = " Command from main thread: the system is running low on memory."]
-#[doc = " Try to reduce your memory use."]
+#[doc = " Command from main thread: the system is running low on memory.\n Try to reduce your memory use."]
 pub const NativeAppGlueAppCmd_APP_CMD_LOW_MEMORY: NativeAppGlueAppCmd = 9;
 #[doc = " Command from main thread: the app's activity has been started."]
 pub const NativeAppGlueAppCmd_APP_CMD_START: NativeAppGlueAppCmd = 10;
 #[doc = " Command from main thread: the app's activity has been resumed."]
 pub const NativeAppGlueAppCmd_APP_CMD_RESUME: NativeAppGlueAppCmd = 11;
-#[doc = " Command from main thread: the app should generate a new saved state"]
-#[doc = " for itself, to restore from later if needed.  If you have saved state,"]
-#[doc = " allocate it with malloc and place it in android_app.savedState with"]
-#[doc = " the size in android_app.savedStateSize.  The will be freed for you"]
-#[doc = " later."]
+#[doc = " Command from main thread: the app should generate a new saved state\n for itself, to restore from later if needed.  If you have saved state,\n allocate it with malloc and place it in android_app.savedState with\n the size in android_app.savedStateSize.  The will be freed for you\n later."]
 pub const NativeAppGlueAppCmd_APP_CMD_SAVE_STATE: NativeAppGlueAppCmd = 12;
 #[doc = " Command from main thread: the app's activity has been paused."]
 pub const NativeAppGlueAppCmd_APP_CMD_PAUSE: NativeAppGlueAppCmd = 13;
 #[doc = " Command from main thread: the app's activity has been stopped."]
 pub const NativeAppGlueAppCmd_APP_CMD_STOP: NativeAppGlueAppCmd = 14;
-#[doc = " Command from main thread: the app's activity is being destroyed,"]
-#[doc = " and waiting for the app thread to clean up and exit before proceeding."]
+#[doc = " Command from main thread: the app's activity is being destroyed,\n and waiting for the app thread to clean up and exit before proceeding."]
 pub const NativeAppGlueAppCmd_APP_CMD_DESTROY: NativeAppGlueAppCmd = 15;
 #[doc = " Command from main thread: the app's insets have changed."]
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_INSETS_CHANGED: NativeAppGlueAppCmd = 16;
 #[doc = " Commands passed from the application's main Java thread to the game's thread."]
 pub type NativeAppGlueAppCmd = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next"]
-    #[doc = " app command message."]
+    #[doc = " Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next\n app command message."]
     pub fn android_app_read_cmd(android_app: *mut android_app) -> i8;
 }
 extern "C" {
-    #[doc = " Call with the command returned by android_app_read_cmd() to do the"]
-    #[doc = " initial pre-processing of the given command.  You can perform your own"]
-    #[doc = " actions for the command after calling this function."]
+    #[doc = " Call with the command returned by android_app_read_cmd() to do the\n initial pre-processing of the given command.  You can perform your own\n actions for the command after calling this function."]
     pub fn android_app_pre_exec_cmd(android_app: *mut android_app, cmd: i8);
 }
 extern "C" {
-    #[doc = " Call with the command returned by android_app_read_cmd() to do the"]
-    #[doc = " final post-processing of the given command.  You must have done your own"]
-    #[doc = " actions for the command before calling this function."]
+    #[doc = " Call with the command returned by android_app_read_cmd() to do the\n final post-processing of the given command.  You must have done your own\n actions for the command before calling this function."]
     pub fn android_app_post_exec_cmd(android_app: *mut android_app, cmd: i8);
 }
 extern "C" {
-    #[doc = " Call this before processing input events to get the events buffer."]
-    #[doc = " The function returns NULL if there are no events to process."]
+    #[doc = " Call this before processing input events to get the events buffer.\n The function returns NULL if there are no events to process."]
     pub fn android_app_swap_input_buffers(
         android_app: *mut android_app,
     ) -> *mut android_input_buffer;
 }
 extern "C" {
-    #[doc = " Clear the array of motion events that were waiting to be handled, and release"]
-    #[doc = " each of them."]
-    #[doc = ""]
-    #[doc = " This method should be called after you have processed the motion events in"]
-    #[doc = " your game loop. You should handle events at each iteration of your game loop."]
+    #[doc = " Clear the array of motion events that were waiting to be handled, and release\n each of them.\n\n This method should be called after you have processed the motion events in\n your game loop. You should handle events at each iteration of your game loop."]
     pub fn android_app_clear_motion_events(inputBuffer: *mut android_input_buffer);
 }
 extern "C" {
-    #[doc = " Clear the array of key events that were waiting to be handled, and release"]
-    #[doc = " each of them."]
-    #[doc = ""]
-    #[doc = " This method should be called after you have processed the key up events in"]
-    #[doc = " your game loop. You should handle events at each iteration of your game loop."]
+    #[doc = " Clear the array of key events that were waiting to be handled, and release\n each of them.\n\n This method should be called after you have processed the key up events in\n your game loop. You should handle events at each iteration of your game loop."]
     pub fn android_app_clear_key_events(inputBuffer: *mut android_input_buffer);
 }
 extern "C" {
-    #[doc = " This is a springboard into the Rust glue layer that wraps calling the"]
-    #[doc = " main entry for the app itself."]
+    #[doc = " This is a springboard into the Rust glue layer that wraps calling the\n main entry for the app itself."]
     pub fn _rust_glue_entry(app: *mut android_app);
 }
 extern "C" {
-    #[doc = " Set the filter to use when processing key events."]
-    #[doc = " Any events for which the filter returns false will be ignored by"]
-    #[doc = " android_native_app_glue. If filter is set to NULL, no filtering is done."]
-    #[doc = ""]
-    #[doc = " The default key filter will filter out volume and camera button presses."]
+    #[doc = " Set the filter to use when processing key events.\n Any events for which the filter returns false will be ignored by\n android_native_app_glue. If filter is set to NULL, no filtering is done.\n\n The default key filter will filter out volume and camera button presses."]
     pub fn android_app_set_key_event_filter(
         app: *mut android_app,
         filter: android_key_event_filter,
     );
 }
 extern "C" {
-    #[doc = " Set the filter to use when processing touch and motion events."]
-    #[doc = " Any events for which the filter returns false will be ignored by"]
-    #[doc = " android_native_app_glue. If filter is set to NULL, no filtering is done."]
-    #[doc = ""]
-    #[doc = " Note that the default motion event filter will only allow touchscreen events"]
-    #[doc = " through, in order to mimic NativeActivity's behaviour, so for controller"]
-    #[doc = " events to be passed to the app, set the filter to NULL."]
+    #[doc = " Set the filter to use when processing touch and motion events.\n Any events for which the filter returns false will be ignored by\n android_native_app_glue. If filter is set to NULL, no filtering is done.\n\n Note that the default motion event filter will only allow touchscreen events\n through, in order to mimic NativeActivity's behaviour, so for controller\n events to be passed to the app, set the filter to NULL."]
     pub fn android_app_set_motion_event_filter(
         app: *mut android_app,
         filter: android_motion_event_filter,
diff --git a/android-activity/src/game_activity/ffi_x86_64.rs b/android-activity/src/game_activity/ffi_x86_64.rs
index 78bf9ff..852e212 100644
--- a/android-activity/src/game_activity/ffi_x86_64.rs
+++ b/android-activity/src/game_activity/ffi_x86_64.rs
@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.59.2 */
+/* automatically generated by rust-bindgen 0.66.1 */
 
 pub const __BIONIC__: u32 = 1;
 pub const __WORDSIZE: u32 = 64;
@@ -21,10 +21,14 @@ pub const __ANDROID_API_O_MR1__: u32 = 27;
 pub const __ANDROID_API_P__: u32 = 28;
 pub const __ANDROID_API_Q__: u32 = 29;
 pub const __ANDROID_API_R__: u32 = 30;
-pub const __NDK_MAJOR__: u32 = 21;
-pub const __NDK_MINOR__: u32 = 1;
+pub const __ANDROID_API_S__: u32 = 31;
+pub const __ANDROID_API_T__: u32 = 33;
+pub const __ANDROID_API_U__: u32 = 34;
+pub const __ANDROID_NDK__: u32 = 1;
+pub const __NDK_MAJOR__: u32 = 25;
+pub const __NDK_MINOR__: u32 = 2;
 pub const __NDK_BETA__: u32 = 0;
-pub const __NDK_BUILD__: u32 = 6352462;
+pub const __NDK_BUILD__: u32 = 9519653;
 pub const __NDK_CANARY__: u32 = 0;
 pub const INT8_MIN: i32 = -128;
 pub const INT8_MAX: u32 = 127;
@@ -56,171 +60,176 @@ pub const WINT_MAX: u32 = 4294967295;
 pub const WINT_MIN: u32 = 0;
 pub const __BITS_PER_LONG: u32 = 64;
 pub const __FD_SETSIZE: u32 = 1024;
-pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8;
-pub const __PRI_64_prefix: &[u8; 2usize] = b"l\0";
-pub const __PRI_PTR_prefix: &[u8; 2usize] = b"l\0";
-pub const __PRI_FAST_prefix: &[u8; 2usize] = b"l\0";
-pub const PRId8: &[u8; 2usize] = b"d\0";
-pub const PRId16: &[u8; 2usize] = b"d\0";
-pub const PRId32: &[u8; 2usize] = b"d\0";
-pub const PRId64: &[u8; 3usize] = b"ld\0";
-pub const PRIdLEAST8: &[u8; 2usize] = b"d\0";
-pub const PRIdLEAST16: &[u8; 2usize] = b"d\0";
-pub const PRIdLEAST32: &[u8; 2usize] = b"d\0";
-pub const PRIdLEAST64: &[u8; 3usize] = b"ld\0";
-pub const PRIdFAST8: &[u8; 2usize] = b"d\0";
-pub const PRIdFAST16: &[u8; 3usize] = b"ld\0";
-pub const PRIdFAST32: &[u8; 3usize] = b"ld\0";
-pub const PRIdFAST64: &[u8; 3usize] = b"ld\0";
-pub const PRIdMAX: &[u8; 3usize] = b"jd\0";
-pub const PRIdPTR: &[u8; 3usize] = b"ld\0";
-pub const PRIi8: &[u8; 2usize] = b"i\0";
-pub const PRIi16: &[u8; 2usize] = b"i\0";
-pub const PRIi32: &[u8; 2usize] = b"i\0";
-pub const PRIi64: &[u8; 3usize] = b"li\0";
-pub const PRIiLEAST8: &[u8; 2usize] = b"i\0";
-pub const PRIiLEAST16: &[u8; 2usize] = b"i\0";
-pub const PRIiLEAST32: &[u8; 2usize] = b"i\0";
-pub const PRIiLEAST64: &[u8; 3usize] = b"li\0";
-pub const PRIiFAST8: &[u8; 2usize] = b"i\0";
-pub const PRIiFAST16: &[u8; 3usize] = b"li\0";
-pub const PRIiFAST32: &[u8; 3usize] = b"li\0";
-pub const PRIiFAST64: &[u8; 3usize] = b"li\0";
-pub const PRIiMAX: &[u8; 3usize] = b"ji\0";
-pub const PRIiPTR: &[u8; 3usize] = b"li\0";
-pub const PRIo8: &[u8; 2usize] = b"o\0";
-pub const PRIo16: &[u8; 2usize] = b"o\0";
-pub const PRIo32: &[u8; 2usize] = b"o\0";
-pub const PRIo64: &[u8; 3usize] = b"lo\0";
-pub const PRIoLEAST8: &[u8; 2usize] = b"o\0";
-pub const PRIoLEAST16: &[u8; 2usize] = b"o\0";
-pub const PRIoLEAST32: &[u8; 2usize] = b"o\0";
-pub const PRIoLEAST64: &[u8; 3usize] = b"lo\0";
-pub const PRIoFAST8: &[u8; 2usize] = b"o\0";
-pub const PRIoFAST16: &[u8; 3usize] = b"lo\0";
-pub const PRIoFAST32: &[u8; 3usize] = b"lo\0";
-pub const PRIoFAST64: &[u8; 3usize] = b"lo\0";
-pub const PRIoMAX: &[u8; 3usize] = b"jo\0";
-pub const PRIoPTR: &[u8; 3usize] = b"lo\0";
-pub const PRIu8: &[u8; 2usize] = b"u\0";
-pub const PRIu16: &[u8; 2usize] = b"u\0";
-pub const PRIu32: &[u8; 2usize] = b"u\0";
-pub const PRIu64: &[u8; 3usize] = b"lu\0";
-pub const PRIuLEAST8: &[u8; 2usize] = b"u\0";
-pub const PRIuLEAST16: &[u8; 2usize] = b"u\0";
-pub const PRIuLEAST32: &[u8; 2usize] = b"u\0";
-pub const PRIuLEAST64: &[u8; 3usize] = b"lu\0";
-pub const PRIuFAST8: &[u8; 2usize] = b"u\0";
-pub const PRIuFAST16: &[u8; 3usize] = b"lu\0";
-pub const PRIuFAST32: &[u8; 3usize] = b"lu\0";
-pub const PRIuFAST64: &[u8; 3usize] = b"lu\0";
-pub const PRIuMAX: &[u8; 3usize] = b"ju\0";
-pub const PRIuPTR: &[u8; 3usize] = b"lu\0";
-pub const PRIx8: &[u8; 2usize] = b"x\0";
-pub const PRIx16: &[u8; 2usize] = b"x\0";
-pub const PRIx32: &[u8; 2usize] = b"x\0";
-pub const PRIx64: &[u8; 3usize] = b"lx\0";
-pub const PRIxLEAST8: &[u8; 2usize] = b"x\0";
-pub const PRIxLEAST16: &[u8; 2usize] = b"x\0";
-pub const PRIxLEAST32: &[u8; 2usize] = b"x\0";
-pub const PRIxLEAST64: &[u8; 3usize] = b"lx\0";
-pub const PRIxFAST8: &[u8; 2usize] = b"x\0";
-pub const PRIxFAST16: &[u8; 3usize] = b"lx\0";
-pub const PRIxFAST32: &[u8; 3usize] = b"lx\0";
-pub const PRIxFAST64: &[u8; 3usize] = b"lx\0";
-pub const PRIxMAX: &[u8; 3usize] = b"jx\0";
-pub const PRIxPTR: &[u8; 3usize] = b"lx\0";
-pub const PRIX8: &[u8; 2usize] = b"X\0";
-pub const PRIX16: &[u8; 2usize] = b"X\0";
-pub const PRIX32: &[u8; 2usize] = b"X\0";
-pub const PRIX64: &[u8; 3usize] = b"lX\0";
-pub const PRIXLEAST8: &[u8; 2usize] = b"X\0";
-pub const PRIXLEAST16: &[u8; 2usize] = b"X\0";
-pub const PRIXLEAST32: &[u8; 2usize] = b"X\0";
-pub const PRIXLEAST64: &[u8; 3usize] = b"lX\0";
-pub const PRIXFAST8: &[u8; 2usize] = b"X\0";
-pub const PRIXFAST16: &[u8; 3usize] = b"lX\0";
-pub const PRIXFAST32: &[u8; 3usize] = b"lX\0";
-pub const PRIXFAST64: &[u8; 3usize] = b"lX\0";
-pub const PRIXMAX: &[u8; 3usize] = b"jX\0";
-pub const PRIXPTR: &[u8; 3usize] = b"lX\0";
-pub const SCNd8: &[u8; 4usize] = b"hhd\0";
-pub const SCNd16: &[u8; 3usize] = b"hd\0";
-pub const SCNd32: &[u8; 2usize] = b"d\0";
-pub const SCNd64: &[u8; 3usize] = b"ld\0";
-pub const SCNdLEAST8: &[u8; 4usize] = b"hhd\0";
-pub const SCNdLEAST16: &[u8; 3usize] = b"hd\0";
-pub const SCNdLEAST32: &[u8; 2usize] = b"d\0";
-pub const SCNdLEAST64: &[u8; 3usize] = b"ld\0";
-pub const SCNdFAST8: &[u8; 4usize] = b"hhd\0";
-pub const SCNdFAST16: &[u8; 3usize] = b"ld\0";
-pub const SCNdFAST32: &[u8; 3usize] = b"ld\0";
-pub const SCNdFAST64: &[u8; 3usize] = b"ld\0";
-pub const SCNdMAX: &[u8; 3usize] = b"jd\0";
-pub const SCNdPTR: &[u8; 3usize] = b"ld\0";
-pub const SCNi8: &[u8; 4usize] = b"hhi\0";
-pub const SCNi16: &[u8; 3usize] = b"hi\0";
-pub const SCNi32: &[u8; 2usize] = b"i\0";
-pub const SCNi64: &[u8; 3usize] = b"li\0";
-pub const SCNiLEAST8: &[u8; 4usize] = b"hhi\0";
-pub const SCNiLEAST16: &[u8; 3usize] = b"hi\0";
-pub const SCNiLEAST32: &[u8; 2usize] = b"i\0";
-pub const SCNiLEAST64: &[u8; 3usize] = b"li\0";
-pub const SCNiFAST8: &[u8; 4usize] = b"hhi\0";
-pub const SCNiFAST16: &[u8; 3usize] = b"li\0";
-pub const SCNiFAST32: &[u8; 3usize] = b"li\0";
-pub const SCNiFAST64: &[u8; 3usize] = b"li\0";
-pub const SCNiMAX: &[u8; 3usize] = b"ji\0";
-pub const SCNiPTR: &[u8; 3usize] = b"li\0";
-pub const SCNo8: &[u8; 4usize] = b"hho\0";
-pub const SCNo16: &[u8; 3usize] = b"ho\0";
-pub const SCNo32: &[u8; 2usize] = b"o\0";
-pub const SCNo64: &[u8; 3usize] = b"lo\0";
-pub const SCNoLEAST8: &[u8; 4usize] = b"hho\0";
-pub const SCNoLEAST16: &[u8; 3usize] = b"ho\0";
-pub const SCNoLEAST32: &[u8; 2usize] = b"o\0";
-pub const SCNoLEAST64: &[u8; 3usize] = b"lo\0";
-pub const SCNoFAST8: &[u8; 4usize] = b"hho\0";
-pub const SCNoFAST16: &[u8; 3usize] = b"lo\0";
-pub const SCNoFAST32: &[u8; 3usize] = b"lo\0";
-pub const SCNoFAST64: &[u8; 3usize] = b"lo\0";
-pub const SCNoMAX: &[u8; 3usize] = b"jo\0";
-pub const SCNoPTR: &[u8; 3usize] = b"lo\0";
-pub const SCNu8: &[u8; 4usize] = b"hhu\0";
-pub const SCNu16: &[u8; 3usize] = b"hu\0";
-pub const SCNu32: &[u8; 2usize] = b"u\0";
-pub const SCNu64: &[u8; 3usize] = b"lu\0";
-pub const SCNuLEAST8: &[u8; 4usize] = b"hhu\0";
-pub const SCNuLEAST16: &[u8; 3usize] = b"hu\0";
-pub const SCNuLEAST32: &[u8; 2usize] = b"u\0";
-pub const SCNuLEAST64: &[u8; 3usize] = b"lu\0";
-pub const SCNuFAST8: &[u8; 4usize] = b"hhu\0";
-pub const SCNuFAST16: &[u8; 3usize] = b"lu\0";
-pub const SCNuFAST32: &[u8; 3usize] = b"lu\0";
-pub const SCNuFAST64: &[u8; 3usize] = b"lu\0";
-pub const SCNuMAX: &[u8; 3usize] = b"ju\0";
-pub const SCNuPTR: &[u8; 3usize] = b"lu\0";
-pub const SCNx8: &[u8; 4usize] = b"hhx\0";
-pub const SCNx16: &[u8; 3usize] = b"hx\0";
-pub const SCNx32: &[u8; 2usize] = b"x\0";
-pub const SCNx64: &[u8; 3usize] = b"lx\0";
-pub const SCNxLEAST8: &[u8; 4usize] = b"hhx\0";
-pub const SCNxLEAST16: &[u8; 3usize] = b"hx\0";
-pub const SCNxLEAST32: &[u8; 2usize] = b"x\0";
-pub const SCNxLEAST64: &[u8; 3usize] = b"lx\0";
-pub const SCNxFAST8: &[u8; 4usize] = b"hhx\0";
-pub const SCNxFAST16: &[u8; 3usize] = b"lx\0";
-pub const SCNxFAST32: &[u8; 3usize] = b"lx\0";
-pub const SCNxFAST64: &[u8; 3usize] = b"lx\0";
-pub const SCNxMAX: &[u8; 3usize] = b"jx\0";
-pub const SCNxPTR: &[u8; 3usize] = b"lx\0";
 pub const __GNUC_VA_LIST: u32 = 1;
+pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8;
 pub const true_: u32 = 1;
 pub const false_: u32 = 0;
 pub const __bool_true_false_are_defined: u32 = 1;
+pub const __PRI_64_prefix: &[u8; 2] = b"l\0";
+pub const __PRI_PTR_prefix: &[u8; 2] = b"l\0";
+pub const __PRI_FAST_prefix: &[u8; 2] = b"l\0";
+pub const PRId8: &[u8; 2] = b"d\0";
+pub const PRId16: &[u8; 2] = b"d\0";
+pub const PRId32: &[u8; 2] = b"d\0";
+pub const PRId64: &[u8; 3] = b"ld\0";
+pub const PRIdLEAST8: &[u8; 2] = b"d\0";
+pub const PRIdLEAST16: &[u8; 2] = b"d\0";
+pub const PRIdLEAST32: &[u8; 2] = b"d\0";
+pub const PRIdLEAST64: &[u8; 3] = b"ld\0";
+pub const PRIdFAST8: &[u8; 2] = b"d\0";
+pub const PRIdFAST16: &[u8; 3] = b"ld\0";
+pub const PRIdFAST32: &[u8; 3] = b"ld\0";
+pub const PRIdFAST64: &[u8; 3] = b"ld\0";
+pub const PRIdMAX: &[u8; 3] = b"jd\0";
+pub const PRIdPTR: &[u8; 3] = b"ld\0";
+pub const PRIi8: &[u8; 2] = b"i\0";
+pub const PRIi16: &[u8; 2] = b"i\0";
+pub const PRIi32: &[u8; 2] = b"i\0";
+pub const PRIi64: &[u8; 3] = b"li\0";
+pub const PRIiLEAST8: &[u8; 2] = b"i\0";
+pub const PRIiLEAST16: &[u8; 2] = b"i\0";
+pub const PRIiLEAST32: &[u8; 2] = b"i\0";
+pub const PRIiLEAST64: &[u8; 3] = b"li\0";
+pub const PRIiFAST8: &[u8; 2] = b"i\0";
+pub const PRIiFAST16: &[u8; 3] = b"li\0";
+pub const PRIiFAST32: &[u8; 3] = b"li\0";
+pub const PRIiFAST64: &[u8; 3] = b"li\0";
+pub const PRIiMAX: &[u8; 3] = b"ji\0";
+pub const PRIiPTR: &[u8; 3] = b"li\0";
+pub const PRIo8: &[u8; 2] = b"o\0";
+pub const PRIo16: &[u8; 2] = b"o\0";
+pub const PRIo32: &[u8; 2] = b"o\0";
+pub const PRIo64: &[u8; 3] = b"lo\0";
+pub const PRIoLEAST8: &[u8; 2] = b"o\0";
+pub const PRIoLEAST16: &[u8; 2] = b"o\0";
+pub const PRIoLEAST32: &[u8; 2] = b"o\0";
+pub const PRIoLEAST64: &[u8; 3] = b"lo\0";
+pub const PRIoFAST8: &[u8; 2] = b"o\0";
+pub const PRIoFAST16: &[u8; 3] = b"lo\0";
+pub const PRIoFAST32: &[u8; 3] = b"lo\0";
+pub const PRIoFAST64: &[u8; 3] = b"lo\0";
+pub const PRIoMAX: &[u8; 3] = b"jo\0";
+pub const PRIoPTR: &[u8; 3] = b"lo\0";
+pub const PRIu8: &[u8; 2] = b"u\0";
+pub const PRIu16: &[u8; 2] = b"u\0";
+pub const PRIu32: &[u8; 2] = b"u\0";
+pub const PRIu64: &[u8; 3] = b"lu\0";
+pub const PRIuLEAST8: &[u8; 2] = b"u\0";
+pub const PRIuLEAST16: &[u8; 2] = b"u\0";
+pub const PRIuLEAST32: &[u8; 2] = b"u\0";
+pub const PRIuLEAST64: &[u8; 3] = b"lu\0";
+pub const PRIuFAST8: &[u8; 2] = b"u\0";
+pub const PRIuFAST16: &[u8; 3] = b"lu\0";
+pub const PRIuFAST32: &[u8; 3] = b"lu\0";
+pub const PRIuFAST64: &[u8; 3] = b"lu\0";
+pub const PRIuMAX: &[u8; 3] = b"ju\0";
+pub const PRIuPTR: &[u8; 3] = b"lu\0";
+pub const PRIx8: &[u8; 2] = b"x\0";
+pub const PRIx16: &[u8; 2] = b"x\0";
+pub const PRIx32: &[u8; 2] = b"x\0";
+pub const PRIx64: &[u8; 3] = b"lx\0";
+pub const PRIxLEAST8: &[u8; 2] = b"x\0";
+pub const PRIxLEAST16: &[u8; 2] = b"x\0";
+pub const PRIxLEAST32: &[u8; 2] = b"x\0";
+pub const PRIxLEAST64: &[u8; 3] = b"lx\0";
+pub const PRIxFAST8: &[u8; 2] = b"x\0";
+pub const PRIxFAST16: &[u8; 3] = b"lx\0";
+pub const PRIxFAST32: &[u8; 3] = b"lx\0";
+pub const PRIxFAST64: &[u8; 3] = b"lx\0";
+pub const PRIxMAX: &[u8; 3] = b"jx\0";
+pub const PRIxPTR: &[u8; 3] = b"lx\0";
+pub const PRIX8: &[u8; 2] = b"X\0";
+pub const PRIX16: &[u8; 2] = b"X\0";
+pub const PRIX32: &[u8; 2] = b"X\0";
+pub const PRIX64: &[u8; 3] = b"lX\0";
+pub const PRIXLEAST8: &[u8; 2] = b"X\0";
+pub const PRIXLEAST16: &[u8; 2] = b"X\0";
+pub const PRIXLEAST32: &[u8; 2] = b"X\0";
+pub const PRIXLEAST64: &[u8; 3] = b"lX\0";
+pub const PRIXFAST8: &[u8; 2] = b"X\0";
+pub const PRIXFAST16: &[u8; 3] = b"lX\0";
+pub const PRIXFAST32: &[u8; 3] = b"lX\0";
+pub const PRIXFAST64: &[u8; 3] = b"lX\0";
+pub const PRIXMAX: &[u8; 3] = b"jX\0";
+pub const PRIXPTR: &[u8; 3] = b"lX\0";
+pub const SCNd8: &[u8; 4] = b"hhd\0";
+pub const SCNd16: &[u8; 3] = b"hd\0";
+pub const SCNd32: &[u8; 2] = b"d\0";
+pub const SCNd64: &[u8; 3] = b"ld\0";
+pub const SCNdLEAST8: &[u8; 4] = b"hhd\0";
+pub const SCNdLEAST16: &[u8; 3] = b"hd\0";
+pub const SCNdLEAST32: &[u8; 2] = b"d\0";
+pub const SCNdLEAST64: &[u8; 3] = b"ld\0";
+pub const SCNdFAST8: &[u8; 4] = b"hhd\0";
+pub const SCNdFAST16: &[u8; 3] = b"ld\0";
+pub const SCNdFAST32: &[u8; 3] = b"ld\0";
+pub const SCNdFAST64: &[u8; 3] = b"ld\0";
+pub const SCNdMAX: &[u8; 3] = b"jd\0";
+pub const SCNdPTR: &[u8; 3] = b"ld\0";
+pub const SCNi8: &[u8; 4] = b"hhi\0";
+pub const SCNi16: &[u8; 3] = b"hi\0";
+pub const SCNi32: &[u8; 2] = b"i\0";
+pub const SCNi64: &[u8; 3] = b"li\0";
+pub const SCNiLEAST8: &[u8; 4] = b"hhi\0";
+pub const SCNiLEAST16: &[u8; 3] = b"hi\0";
+pub const SCNiLEAST32: &[u8; 2] = b"i\0";
+pub const SCNiLEAST64: &[u8; 3] = b"li\0";
+pub const SCNiFAST8: &[u8; 4] = b"hhi\0";
+pub const SCNiFAST16: &[u8; 3] = b"li\0";
+pub const SCNiFAST32: &[u8; 3] = b"li\0";
+pub const SCNiFAST64: &[u8; 3] = b"li\0";
+pub const SCNiMAX: &[u8; 3] = b"ji\0";
+pub const SCNiPTR: &[u8; 3] = b"li\0";
+pub const SCNo8: &[u8; 4] = b"hho\0";
+pub const SCNo16: &[u8; 3] = b"ho\0";
+pub const SCNo32: &[u8; 2] = b"o\0";
+pub const SCNo64: &[u8; 3] = b"lo\0";
+pub const SCNoLEAST8: &[u8; 4] = b"hho\0";
+pub const SCNoLEAST16: &[u8; 3] = b"ho\0";
+pub const SCNoLEAST32: &[u8; 2] = b"o\0";
+pub const SCNoLEAST64: &[u8; 3] = b"lo\0";
+pub const SCNoFAST8: &[u8; 4] = b"hho\0";
+pub const SCNoFAST16: &[u8; 3] = b"lo\0";
+pub const SCNoFAST32: &[u8; 3] = b"lo\0";
+pub const SCNoFAST64: &[u8; 3] = b"lo\0";
+pub const SCNoMAX: &[u8; 3] = b"jo\0";
+pub const SCNoPTR: &[u8; 3] = b"lo\0";
+pub const SCNu8: &[u8; 4] = b"hhu\0";
+pub const SCNu16: &[u8; 3] = b"hu\0";
+pub const SCNu32: &[u8; 2] = b"u\0";
+pub const SCNu64: &[u8; 3] = b"lu\0";
+pub const SCNuLEAST8: &[u8; 4] = b"hhu\0";
+pub const SCNuLEAST16: &[u8; 3] = b"hu\0";
+pub const SCNuLEAST32: &[u8; 2] = b"u\0";
+pub const SCNuLEAST64: &[u8; 3] = b"lu\0";
+pub const SCNuFAST8: &[u8; 4] = b"hhu\0";
+pub const SCNuFAST16: &[u8; 3] = b"lu\0";
+pub const SCNuFAST32: &[u8; 3] = b"lu\0";
+pub const SCNuFAST64: &[u8; 3] = b"lu\0";
+pub const SCNuMAX: &[u8; 3] = b"ju\0";
+pub const SCNuPTR: &[u8; 3] = b"lu\0";
+pub const SCNx8: &[u8; 4] = b"hhx\0";
+pub const SCNx16: &[u8; 3] = b"hx\0";
+pub const SCNx32: &[u8; 2] = b"x\0";
+pub const SCNx64: &[u8; 3] = b"lx\0";
+pub const SCNxLEAST8: &[u8; 4] = b"hhx\0";
+pub const SCNxLEAST16: &[u8; 3] = b"hx\0";
+pub const SCNxLEAST32: &[u8; 2] = b"x\0";
+pub const SCNxLEAST64: &[u8; 3] = b"lx\0";
+pub const SCNxFAST8: &[u8; 4] = b"hhx\0";
+pub const SCNxFAST16: &[u8; 3] = b"lx\0";
+pub const SCNxFAST32: &[u8; 3] = b"lx\0";
+pub const SCNxFAST64: &[u8; 3] = b"lx\0";
+pub const SCNxMAX: &[u8; 3] = b"jx\0";
+pub const SCNxPTR: &[u8; 3] = b"lx\0";
 pub const GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT: u32 = 48;
 pub const GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT: u32 = 8;
-pub const GAMEACTIVITY_MAX_NUM_HISTORICAL_IN_MOTION_EVENT: u32 = 8;
+pub const GAMETEXTINPUT_MAJOR_VERSION: u32 = 2;
+pub const GAMETEXTINPUT_MINOR_VERSION: u32 = 0;
+pub const GAMETEXTINPUT_BUGFIX_VERSION: u32 = 0;
+pub const GAMEACTIVITY_MAJOR_VERSION: u32 = 2;
+pub const GAMEACTIVITY_MINOR_VERSION: u32 = 0;
+pub const GAMEACTIVITY_BUGFIX_VERSION: u32 = 2;
 pub const POLLIN: u32 = 1;
 pub const POLLPRI: u32 = 2;
 pub const POLLOUT: u32 = 4;
@@ -464,18 +473,20 @@ pub const SIGPWR: u32 = 30;
 pub const SIGSYS: u32 = 31;
 pub const SIGUNUSED: u32 = 31;
 pub const __SIGRTMIN: u32 = 32;
+pub const SA_RESTORER: u32 = 67108864;
+pub const MINSIGSTKSZ: u32 = 2048;
+pub const SIGSTKSZ: u32 = 8192;
 pub const SA_NOCLDSTOP: u32 = 1;
 pub const SA_NOCLDWAIT: u32 = 2;
 pub const SA_SIGINFO: u32 = 4;
+pub const SA_UNSUPPORTED: u32 = 1024;
+pub const SA_EXPOSE_TAGBITS: u32 = 2048;
 pub const SA_ONSTACK: u32 = 134217728;
 pub const SA_RESTART: u32 = 268435456;
 pub const SA_NODEFER: u32 = 1073741824;
 pub const SA_RESETHAND: u32 = 2147483648;
 pub const SA_NOMASK: u32 = 1073741824;
 pub const SA_ONESHOT: u32 = 2147483648;
-pub const SA_RESTORER: u32 = 67108864;
-pub const MINSIGSTKSZ: u32 = 2048;
-pub const SIGSTKSZ: u32 = 8192;
 pub const SIG_BLOCK: u32 = 0;
 pub const SIG_UNBLOCK: u32 = 1;
 pub const SIG_SETMASK: u32 = 2;
@@ -525,7 +536,9 @@ pub const SEGV_PKUERR: u32 = 4;
 pub const SEGV_ACCADI: u32 = 5;
 pub const SEGV_ADIDERR: u32 = 6;
 pub const SEGV_ADIPERR: u32 = 7;
-pub const NSIGSEGV: u32 = 7;
+pub const SEGV_MTEAERR: u32 = 8;
+pub const SEGV_MTESERR: u32 = 9;
+pub const NSIGSEGV: u32 = 9;
 pub const BUS_ADRALN: u32 = 1;
 pub const BUS_ADRERR: u32 = 2;
 pub const BUS_OBJERR: u32 = 3;
@@ -537,7 +550,8 @@ pub const TRAP_TRACE: u32 = 2;
 pub const TRAP_BRANCH: u32 = 3;
 pub const TRAP_HWBKPT: u32 = 4;
 pub const TRAP_UNK: u32 = 5;
-pub const NSIGTRAP: u32 = 5;
+pub const TRAP_PERF: u32 = 6;
+pub const NSIGTRAP: u32 = 6;
 pub const CLD_EXITED: u32 = 1;
 pub const CLD_KILLED: u32 = 2;
 pub const CLD_DUMPED: u32 = 3;
@@ -553,7 +567,8 @@ pub const POLL_PRI: u32 = 5;
 pub const POLL_HUP: u32 = 6;
 pub const NSIGPOLL: u32 = 6;
 pub const SYS_SECCOMP: u32 = 1;
-pub const NSIGSYS: u32 = 1;
+pub const SYS_USER_DISPATCH: u32 = 2;
+pub const NSIGSYS: u32 = 2;
 pub const EMT_TAGOVF: u32 = 1;
 pub const NSIGEMT: u32 = 1;
 pub const SIGEV_SIGNAL: u32 = 0;
@@ -598,6 +613,12 @@ pub const CLONE_NEWUSER: u32 = 268435456;
 pub const CLONE_NEWPID: u32 = 536870912;
 pub const CLONE_NEWNET: u32 = 1073741824;
 pub const CLONE_IO: u32 = 2147483648;
+pub const CLONE_CLEAR_SIGHAND: u64 = 4294967296;
+pub const CLONE_INTO_CGROUP: u64 = 8589934592;
+pub const CLONE_NEWTIME: u32 = 128;
+pub const CLONE_ARGS_SIZE_VER0: u32 = 64;
+pub const CLONE_ARGS_SIZE_VER1: u32 = 80;
+pub const CLONE_ARGS_SIZE_VER2: u32 = 88;
 pub const SCHED_NORMAL: u32 = 0;
 pub const SCHED_FIFO: u32 = 1;
 pub const SCHED_RR: u32 = 2;
@@ -629,9 +650,6 @@ pub const PTHREAD_PROCESS_PRIVATE: u32 = 0;
 pub const PTHREAD_PROCESS_SHARED: u32 = 1;
 pub const PTHREAD_SCOPE_SYSTEM: u32 = 0;
 pub const PTHREAD_SCOPE_PROCESS: u32 = 1;
-pub const NATIVE_APP_GLUE_MAX_NUM_MOTION_EVENTS: u32 = 16;
-pub const NATIVE_APP_GLUE_MAX_HISTORICAL_POINTER_SAMPLES: u32 = 64;
-pub const NATIVE_APP_GLUE_MAX_NUM_KEY_EVENTS: u32 = 4;
 pub const NATIVE_APP_GLUE_MAX_INPUT_BUFFERS: u32 = 2;
 extern "C" {
     pub fn android_get_application_target_sdk_version() -> ::std::os::raw::c_int;
@@ -650,6 +668,8 @@ pub struct max_align_t {
 }
 #[test]
 fn bindgen_test_layout_max_align_t() {
+    const UNINIT: ::std::mem::MaybeUninit<max_align_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<max_align_t>(),
         32usize,
@@ -661,9 +681,7 @@ fn bindgen_test_layout_max_align_t() {
         concat!("Alignment of ", stringify!(max_align_t))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<max_align_t>())).__clang_max_align_nonce1 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce1) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -673,9 +691,7 @@ fn bindgen_test_layout_max_align_t() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<max_align_t>())).__clang_max_align_nonce2 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce2) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -728,6 +744,8 @@ pub struct __kernel_fd_set {
 }
 #[test]
 fn bindgen_test_layout___kernel_fd_set() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_fd_set> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_fd_set>(),
         128usize,
@@ -739,7 +757,7 @@ fn bindgen_test_layout___kernel_fd_set() {
         concat!("Alignment of ", stringify!(__kernel_fd_set))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_fd_set>())).fds_bits as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -778,6 +796,8 @@ pub struct __kernel_fsid_t {
 }
 #[test]
 fn bindgen_test_layout___kernel_fsid_t() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_fsid_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_fsid_t>(),
         8usize,
@@ -789,7 +809,7 @@ fn bindgen_test_layout___kernel_fsid_t() {
         concat!("Alignment of ", stringify!(__kernel_fsid_t))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_fsid_t>())).val as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).val) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -801,6 +821,7 @@ fn bindgen_test_layout___kernel_fsid_t() {
 }
 pub type __kernel_off_t = __kernel_long_t;
 pub type __kernel_loff_t = ::std::os::raw::c_longlong;
+pub type __kernel_old_time_t = __kernel_long_t;
 pub type __kernel_time_t = __kernel_long_t;
 pub type __kernel_time64_t = ::std::os::raw::c_longlong;
 pub type __kernel_clock_t = __kernel_long_t;
@@ -859,7 +880,6 @@ pub type off64_t = loff_t;
 pub type __socklen_t = u32;
 pub type socklen_t = __socklen_t;
 pub type __va_list = __builtin_va_list;
-pub type ssize_t = __kernel_ssize_t;
 pub type uint_t = ::std::os::raw::c_uint;
 pub type uint = ::std::os::raw::c_uint;
 pub type u_char = ::std::os::raw::c_uchar;
@@ -870,483 +890,651 @@ pub type u_int32_t = u32;
 pub type u_int16_t = u16;
 pub type u_int8_t = u8;
 pub type u_int64_t = u64;
-pub const AASSET_MODE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AASSET_MODE_RANDOM: ::std::os::raw::c_uint = 1;
-pub const AASSET_MODE_STREAMING: ::std::os::raw::c_uint = 2;
-pub const AASSET_MODE_BUFFER: ::std::os::raw::c_uint = 3;
+pub const AASSET_MODE_UNKNOWN: _bindgen_ty_1 = 0;
+pub const AASSET_MODE_RANDOM: _bindgen_ty_1 = 1;
+pub const AASSET_MODE_STREAMING: _bindgen_ty_1 = 2;
+pub const AASSET_MODE_BUFFER: _bindgen_ty_1 = 3;
 pub type _bindgen_ty_1 = ::std::os::raw::c_uint;
-pub const AKEYCODE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AKEYCODE_SOFT_LEFT: ::std::os::raw::c_uint = 1;
-pub const AKEYCODE_SOFT_RIGHT: ::std::os::raw::c_uint = 2;
-pub const AKEYCODE_HOME: ::std::os::raw::c_uint = 3;
-pub const AKEYCODE_BACK: ::std::os::raw::c_uint = 4;
-pub const AKEYCODE_CALL: ::std::os::raw::c_uint = 5;
-pub const AKEYCODE_ENDCALL: ::std::os::raw::c_uint = 6;
-pub const AKEYCODE_0: ::std::os::raw::c_uint = 7;
-pub const AKEYCODE_1: ::std::os::raw::c_uint = 8;
-pub const AKEYCODE_2: ::std::os::raw::c_uint = 9;
-pub const AKEYCODE_3: ::std::os::raw::c_uint = 10;
-pub const AKEYCODE_4: ::std::os::raw::c_uint = 11;
-pub const AKEYCODE_5: ::std::os::raw::c_uint = 12;
-pub const AKEYCODE_6: ::std::os::raw::c_uint = 13;
-pub const AKEYCODE_7: ::std::os::raw::c_uint = 14;
-pub const AKEYCODE_8: ::std::os::raw::c_uint = 15;
-pub const AKEYCODE_9: ::std::os::raw::c_uint = 16;
-pub const AKEYCODE_STAR: ::std::os::raw::c_uint = 17;
-pub const AKEYCODE_POUND: ::std::os::raw::c_uint = 18;
-pub const AKEYCODE_DPAD_UP: ::std::os::raw::c_uint = 19;
-pub const AKEYCODE_DPAD_DOWN: ::std::os::raw::c_uint = 20;
-pub const AKEYCODE_DPAD_LEFT: ::std::os::raw::c_uint = 21;
-pub const AKEYCODE_DPAD_RIGHT: ::std::os::raw::c_uint = 22;
-pub const AKEYCODE_DPAD_CENTER: ::std::os::raw::c_uint = 23;
-pub const AKEYCODE_VOLUME_UP: ::std::os::raw::c_uint = 24;
-pub const AKEYCODE_VOLUME_DOWN: ::std::os::raw::c_uint = 25;
-pub const AKEYCODE_POWER: ::std::os::raw::c_uint = 26;
-pub const AKEYCODE_CAMERA: ::std::os::raw::c_uint = 27;
-pub const AKEYCODE_CLEAR: ::std::os::raw::c_uint = 28;
-pub const AKEYCODE_A: ::std::os::raw::c_uint = 29;
-pub const AKEYCODE_B: ::std::os::raw::c_uint = 30;
-pub const AKEYCODE_C: ::std::os::raw::c_uint = 31;
-pub const AKEYCODE_D: ::std::os::raw::c_uint = 32;
-pub const AKEYCODE_E: ::std::os::raw::c_uint = 33;
-pub const AKEYCODE_F: ::std::os::raw::c_uint = 34;
-pub const AKEYCODE_G: ::std::os::raw::c_uint = 35;
-pub const AKEYCODE_H: ::std::os::raw::c_uint = 36;
-pub const AKEYCODE_I: ::std::os::raw::c_uint = 37;
-pub const AKEYCODE_J: ::std::os::raw::c_uint = 38;
-pub const AKEYCODE_K: ::std::os::raw::c_uint = 39;
-pub const AKEYCODE_L: ::std::os::raw::c_uint = 40;
-pub const AKEYCODE_M: ::std::os::raw::c_uint = 41;
-pub const AKEYCODE_N: ::std::os::raw::c_uint = 42;
-pub const AKEYCODE_O: ::std::os::raw::c_uint = 43;
-pub const AKEYCODE_P: ::std::os::raw::c_uint = 44;
-pub const AKEYCODE_Q: ::std::os::raw::c_uint = 45;
-pub const AKEYCODE_R: ::std::os::raw::c_uint = 46;
-pub const AKEYCODE_S: ::std::os::raw::c_uint = 47;
-pub const AKEYCODE_T: ::std::os::raw::c_uint = 48;
-pub const AKEYCODE_U: ::std::os::raw::c_uint = 49;
-pub const AKEYCODE_V: ::std::os::raw::c_uint = 50;
-pub const AKEYCODE_W: ::std::os::raw::c_uint = 51;
-pub const AKEYCODE_X: ::std::os::raw::c_uint = 52;
-pub const AKEYCODE_Y: ::std::os::raw::c_uint = 53;
-pub const AKEYCODE_Z: ::std::os::raw::c_uint = 54;
-pub const AKEYCODE_COMMA: ::std::os::raw::c_uint = 55;
-pub const AKEYCODE_PERIOD: ::std::os::raw::c_uint = 56;
-pub const AKEYCODE_ALT_LEFT: ::std::os::raw::c_uint = 57;
-pub const AKEYCODE_ALT_RIGHT: ::std::os::raw::c_uint = 58;
-pub const AKEYCODE_SHIFT_LEFT: ::std::os::raw::c_uint = 59;
-pub const AKEYCODE_SHIFT_RIGHT: ::std::os::raw::c_uint = 60;
-pub const AKEYCODE_TAB: ::std::os::raw::c_uint = 61;
-pub const AKEYCODE_SPACE: ::std::os::raw::c_uint = 62;
-pub const AKEYCODE_SYM: ::std::os::raw::c_uint = 63;
-pub const AKEYCODE_EXPLORER: ::std::os::raw::c_uint = 64;
-pub const AKEYCODE_ENVELOPE: ::std::os::raw::c_uint = 65;
-pub const AKEYCODE_ENTER: ::std::os::raw::c_uint = 66;
-pub const AKEYCODE_DEL: ::std::os::raw::c_uint = 67;
-pub const AKEYCODE_GRAVE: ::std::os::raw::c_uint = 68;
-pub const AKEYCODE_MINUS: ::std::os::raw::c_uint = 69;
-pub const AKEYCODE_EQUALS: ::std::os::raw::c_uint = 70;
-pub const AKEYCODE_LEFT_BRACKET: ::std::os::raw::c_uint = 71;
-pub const AKEYCODE_RIGHT_BRACKET: ::std::os::raw::c_uint = 72;
-pub const AKEYCODE_BACKSLASH: ::std::os::raw::c_uint = 73;
-pub const AKEYCODE_SEMICOLON: ::std::os::raw::c_uint = 74;
-pub const AKEYCODE_APOSTROPHE: ::std::os::raw::c_uint = 75;
-pub const AKEYCODE_SLASH: ::std::os::raw::c_uint = 76;
-pub const AKEYCODE_AT: ::std::os::raw::c_uint = 77;
-pub const AKEYCODE_NUM: ::std::os::raw::c_uint = 78;
-pub const AKEYCODE_HEADSETHOOK: ::std::os::raw::c_uint = 79;
-pub const AKEYCODE_FOCUS: ::std::os::raw::c_uint = 80;
-pub const AKEYCODE_PLUS: ::std::os::raw::c_uint = 81;
-pub const AKEYCODE_MENU: ::std::os::raw::c_uint = 82;
-pub const AKEYCODE_NOTIFICATION: ::std::os::raw::c_uint = 83;
-pub const AKEYCODE_SEARCH: ::std::os::raw::c_uint = 84;
-pub const AKEYCODE_MEDIA_PLAY_PAUSE: ::std::os::raw::c_uint = 85;
-pub const AKEYCODE_MEDIA_STOP: ::std::os::raw::c_uint = 86;
-pub const AKEYCODE_MEDIA_NEXT: ::std::os::raw::c_uint = 87;
-pub const AKEYCODE_MEDIA_PREVIOUS: ::std::os::raw::c_uint = 88;
-pub const AKEYCODE_MEDIA_REWIND: ::std::os::raw::c_uint = 89;
-pub const AKEYCODE_MEDIA_FAST_FORWARD: ::std::os::raw::c_uint = 90;
-pub const AKEYCODE_MUTE: ::std::os::raw::c_uint = 91;
-pub const AKEYCODE_PAGE_UP: ::std::os::raw::c_uint = 92;
-pub const AKEYCODE_PAGE_DOWN: ::std::os::raw::c_uint = 93;
-pub const AKEYCODE_PICTSYMBOLS: ::std::os::raw::c_uint = 94;
-pub const AKEYCODE_SWITCH_CHARSET: ::std::os::raw::c_uint = 95;
-pub const AKEYCODE_BUTTON_A: ::std::os::raw::c_uint = 96;
-pub const AKEYCODE_BUTTON_B: ::std::os::raw::c_uint = 97;
-pub const AKEYCODE_BUTTON_C: ::std::os::raw::c_uint = 98;
-pub const AKEYCODE_BUTTON_X: ::std::os::raw::c_uint = 99;
-pub const AKEYCODE_BUTTON_Y: ::std::os::raw::c_uint = 100;
-pub const AKEYCODE_BUTTON_Z: ::std::os::raw::c_uint = 101;
-pub const AKEYCODE_BUTTON_L1: ::std::os::raw::c_uint = 102;
-pub const AKEYCODE_BUTTON_R1: ::std::os::raw::c_uint = 103;
-pub const AKEYCODE_BUTTON_L2: ::std::os::raw::c_uint = 104;
-pub const AKEYCODE_BUTTON_R2: ::std::os::raw::c_uint = 105;
-pub const AKEYCODE_BUTTON_THUMBL: ::std::os::raw::c_uint = 106;
-pub const AKEYCODE_BUTTON_THUMBR: ::std::os::raw::c_uint = 107;
-pub const AKEYCODE_BUTTON_START: ::std::os::raw::c_uint = 108;
-pub const AKEYCODE_BUTTON_SELECT: ::std::os::raw::c_uint = 109;
-pub const AKEYCODE_BUTTON_MODE: ::std::os::raw::c_uint = 110;
-pub const AKEYCODE_ESCAPE: ::std::os::raw::c_uint = 111;
-pub const AKEYCODE_FORWARD_DEL: ::std::os::raw::c_uint = 112;
-pub const AKEYCODE_CTRL_LEFT: ::std::os::raw::c_uint = 113;
-pub const AKEYCODE_CTRL_RIGHT: ::std::os::raw::c_uint = 114;
-pub const AKEYCODE_CAPS_LOCK: ::std::os::raw::c_uint = 115;
-pub const AKEYCODE_SCROLL_LOCK: ::std::os::raw::c_uint = 116;
-pub const AKEYCODE_META_LEFT: ::std::os::raw::c_uint = 117;
-pub const AKEYCODE_META_RIGHT: ::std::os::raw::c_uint = 118;
-pub const AKEYCODE_FUNCTION: ::std::os::raw::c_uint = 119;
-pub const AKEYCODE_SYSRQ: ::std::os::raw::c_uint = 120;
-pub const AKEYCODE_BREAK: ::std::os::raw::c_uint = 121;
-pub const AKEYCODE_MOVE_HOME: ::std::os::raw::c_uint = 122;
-pub const AKEYCODE_MOVE_END: ::std::os::raw::c_uint = 123;
-pub const AKEYCODE_INSERT: ::std::os::raw::c_uint = 124;
-pub const AKEYCODE_FORWARD: ::std::os::raw::c_uint = 125;
-pub const AKEYCODE_MEDIA_PLAY: ::std::os::raw::c_uint = 126;
-pub const AKEYCODE_MEDIA_PAUSE: ::std::os::raw::c_uint = 127;
-pub const AKEYCODE_MEDIA_CLOSE: ::std::os::raw::c_uint = 128;
-pub const AKEYCODE_MEDIA_EJECT: ::std::os::raw::c_uint = 129;
-pub const AKEYCODE_MEDIA_RECORD: ::std::os::raw::c_uint = 130;
-pub const AKEYCODE_F1: ::std::os::raw::c_uint = 131;
-pub const AKEYCODE_F2: ::std::os::raw::c_uint = 132;
-pub const AKEYCODE_F3: ::std::os::raw::c_uint = 133;
-pub const AKEYCODE_F4: ::std::os::raw::c_uint = 134;
-pub const AKEYCODE_F5: ::std::os::raw::c_uint = 135;
-pub const AKEYCODE_F6: ::std::os::raw::c_uint = 136;
-pub const AKEYCODE_F7: ::std::os::raw::c_uint = 137;
-pub const AKEYCODE_F8: ::std::os::raw::c_uint = 138;
-pub const AKEYCODE_F9: ::std::os::raw::c_uint = 139;
-pub const AKEYCODE_F10: ::std::os::raw::c_uint = 140;
-pub const AKEYCODE_F11: ::std::os::raw::c_uint = 141;
-pub const AKEYCODE_F12: ::std::os::raw::c_uint = 142;
-pub const AKEYCODE_NUM_LOCK: ::std::os::raw::c_uint = 143;
-pub const AKEYCODE_NUMPAD_0: ::std::os::raw::c_uint = 144;
-pub const AKEYCODE_NUMPAD_1: ::std::os::raw::c_uint = 145;
-pub const AKEYCODE_NUMPAD_2: ::std::os::raw::c_uint = 146;
-pub const AKEYCODE_NUMPAD_3: ::std::os::raw::c_uint = 147;
-pub const AKEYCODE_NUMPAD_4: ::std::os::raw::c_uint = 148;
-pub const AKEYCODE_NUMPAD_5: ::std::os::raw::c_uint = 149;
-pub const AKEYCODE_NUMPAD_6: ::std::os::raw::c_uint = 150;
-pub const AKEYCODE_NUMPAD_7: ::std::os::raw::c_uint = 151;
-pub const AKEYCODE_NUMPAD_8: ::std::os::raw::c_uint = 152;
-pub const AKEYCODE_NUMPAD_9: ::std::os::raw::c_uint = 153;
-pub const AKEYCODE_NUMPAD_DIVIDE: ::std::os::raw::c_uint = 154;
-pub const AKEYCODE_NUMPAD_MULTIPLY: ::std::os::raw::c_uint = 155;
-pub const AKEYCODE_NUMPAD_SUBTRACT: ::std::os::raw::c_uint = 156;
-pub const AKEYCODE_NUMPAD_ADD: ::std::os::raw::c_uint = 157;
-pub const AKEYCODE_NUMPAD_DOT: ::std::os::raw::c_uint = 158;
-pub const AKEYCODE_NUMPAD_COMMA: ::std::os::raw::c_uint = 159;
-pub const AKEYCODE_NUMPAD_ENTER: ::std::os::raw::c_uint = 160;
-pub const AKEYCODE_NUMPAD_EQUALS: ::std::os::raw::c_uint = 161;
-pub const AKEYCODE_NUMPAD_LEFT_PAREN: ::std::os::raw::c_uint = 162;
-pub const AKEYCODE_NUMPAD_RIGHT_PAREN: ::std::os::raw::c_uint = 163;
-pub const AKEYCODE_VOLUME_MUTE: ::std::os::raw::c_uint = 164;
-pub const AKEYCODE_INFO: ::std::os::raw::c_uint = 165;
-pub const AKEYCODE_CHANNEL_UP: ::std::os::raw::c_uint = 166;
-pub const AKEYCODE_CHANNEL_DOWN: ::std::os::raw::c_uint = 167;
-pub const AKEYCODE_ZOOM_IN: ::std::os::raw::c_uint = 168;
-pub const AKEYCODE_ZOOM_OUT: ::std::os::raw::c_uint = 169;
-pub const AKEYCODE_TV: ::std::os::raw::c_uint = 170;
-pub const AKEYCODE_WINDOW: ::std::os::raw::c_uint = 171;
-pub const AKEYCODE_GUIDE: ::std::os::raw::c_uint = 172;
-pub const AKEYCODE_DVR: ::std::os::raw::c_uint = 173;
-pub const AKEYCODE_BOOKMARK: ::std::os::raw::c_uint = 174;
-pub const AKEYCODE_CAPTIONS: ::std::os::raw::c_uint = 175;
-pub const AKEYCODE_SETTINGS: ::std::os::raw::c_uint = 176;
-pub const AKEYCODE_TV_POWER: ::std::os::raw::c_uint = 177;
-pub const AKEYCODE_TV_INPUT: ::std::os::raw::c_uint = 178;
-pub const AKEYCODE_STB_POWER: ::std::os::raw::c_uint = 179;
-pub const AKEYCODE_STB_INPUT: ::std::os::raw::c_uint = 180;
-pub const AKEYCODE_AVR_POWER: ::std::os::raw::c_uint = 181;
-pub const AKEYCODE_AVR_INPUT: ::std::os::raw::c_uint = 182;
-pub const AKEYCODE_PROG_RED: ::std::os::raw::c_uint = 183;
-pub const AKEYCODE_PROG_GREEN: ::std::os::raw::c_uint = 184;
-pub const AKEYCODE_PROG_YELLOW: ::std::os::raw::c_uint = 185;
-pub const AKEYCODE_PROG_BLUE: ::std::os::raw::c_uint = 186;
-pub const AKEYCODE_APP_SWITCH: ::std::os::raw::c_uint = 187;
-pub const AKEYCODE_BUTTON_1: ::std::os::raw::c_uint = 188;
-pub const AKEYCODE_BUTTON_2: ::std::os::raw::c_uint = 189;
-pub const AKEYCODE_BUTTON_3: ::std::os::raw::c_uint = 190;
-pub const AKEYCODE_BUTTON_4: ::std::os::raw::c_uint = 191;
-pub const AKEYCODE_BUTTON_5: ::std::os::raw::c_uint = 192;
-pub const AKEYCODE_BUTTON_6: ::std::os::raw::c_uint = 193;
-pub const AKEYCODE_BUTTON_7: ::std::os::raw::c_uint = 194;
-pub const AKEYCODE_BUTTON_8: ::std::os::raw::c_uint = 195;
-pub const AKEYCODE_BUTTON_9: ::std::os::raw::c_uint = 196;
-pub const AKEYCODE_BUTTON_10: ::std::os::raw::c_uint = 197;
-pub const AKEYCODE_BUTTON_11: ::std::os::raw::c_uint = 198;
-pub const AKEYCODE_BUTTON_12: ::std::os::raw::c_uint = 199;
-pub const AKEYCODE_BUTTON_13: ::std::os::raw::c_uint = 200;
-pub const AKEYCODE_BUTTON_14: ::std::os::raw::c_uint = 201;
-pub const AKEYCODE_BUTTON_15: ::std::os::raw::c_uint = 202;
-pub const AKEYCODE_BUTTON_16: ::std::os::raw::c_uint = 203;
-pub const AKEYCODE_LANGUAGE_SWITCH: ::std::os::raw::c_uint = 204;
-pub const AKEYCODE_MANNER_MODE: ::std::os::raw::c_uint = 205;
-pub const AKEYCODE_3D_MODE: ::std::os::raw::c_uint = 206;
-pub const AKEYCODE_CONTACTS: ::std::os::raw::c_uint = 207;
-pub const AKEYCODE_CALENDAR: ::std::os::raw::c_uint = 208;
-pub const AKEYCODE_MUSIC: ::std::os::raw::c_uint = 209;
-pub const AKEYCODE_CALCULATOR: ::std::os::raw::c_uint = 210;
-pub const AKEYCODE_ZENKAKU_HANKAKU: ::std::os::raw::c_uint = 211;
-pub const AKEYCODE_EISU: ::std::os::raw::c_uint = 212;
-pub const AKEYCODE_MUHENKAN: ::std::os::raw::c_uint = 213;
-pub const AKEYCODE_HENKAN: ::std::os::raw::c_uint = 214;
-pub const AKEYCODE_KATAKANA_HIRAGANA: ::std::os::raw::c_uint = 215;
-pub const AKEYCODE_YEN: ::std::os::raw::c_uint = 216;
-pub const AKEYCODE_RO: ::std::os::raw::c_uint = 217;
-pub const AKEYCODE_KANA: ::std::os::raw::c_uint = 218;
-pub const AKEYCODE_ASSIST: ::std::os::raw::c_uint = 219;
-pub const AKEYCODE_BRIGHTNESS_DOWN: ::std::os::raw::c_uint = 220;
-pub const AKEYCODE_BRIGHTNESS_UP: ::std::os::raw::c_uint = 221;
-pub const AKEYCODE_MEDIA_AUDIO_TRACK: ::std::os::raw::c_uint = 222;
-pub const AKEYCODE_SLEEP: ::std::os::raw::c_uint = 223;
-pub const AKEYCODE_WAKEUP: ::std::os::raw::c_uint = 224;
-pub const AKEYCODE_PAIRING: ::std::os::raw::c_uint = 225;
-pub const AKEYCODE_MEDIA_TOP_MENU: ::std::os::raw::c_uint = 226;
-pub const AKEYCODE_11: ::std::os::raw::c_uint = 227;
-pub const AKEYCODE_12: ::std::os::raw::c_uint = 228;
-pub const AKEYCODE_LAST_CHANNEL: ::std::os::raw::c_uint = 229;
-pub const AKEYCODE_TV_DATA_SERVICE: ::std::os::raw::c_uint = 230;
-pub const AKEYCODE_VOICE_ASSIST: ::std::os::raw::c_uint = 231;
-pub const AKEYCODE_TV_RADIO_SERVICE: ::std::os::raw::c_uint = 232;
-pub const AKEYCODE_TV_TELETEXT: ::std::os::raw::c_uint = 233;
-pub const AKEYCODE_TV_NUMBER_ENTRY: ::std::os::raw::c_uint = 234;
-pub const AKEYCODE_TV_TERRESTRIAL_ANALOG: ::std::os::raw::c_uint = 235;
-pub const AKEYCODE_TV_TERRESTRIAL_DIGITAL: ::std::os::raw::c_uint = 236;
-pub const AKEYCODE_TV_SATELLITE: ::std::os::raw::c_uint = 237;
-pub const AKEYCODE_TV_SATELLITE_BS: ::std::os::raw::c_uint = 238;
-pub const AKEYCODE_TV_SATELLITE_CS: ::std::os::raw::c_uint = 239;
-pub const AKEYCODE_TV_SATELLITE_SERVICE: ::std::os::raw::c_uint = 240;
-pub const AKEYCODE_TV_NETWORK: ::std::os::raw::c_uint = 241;
-pub const AKEYCODE_TV_ANTENNA_CABLE: ::std::os::raw::c_uint = 242;
-pub const AKEYCODE_TV_INPUT_HDMI_1: ::std::os::raw::c_uint = 243;
-pub const AKEYCODE_TV_INPUT_HDMI_2: ::std::os::raw::c_uint = 244;
-pub const AKEYCODE_TV_INPUT_HDMI_3: ::std::os::raw::c_uint = 245;
-pub const AKEYCODE_TV_INPUT_HDMI_4: ::std::os::raw::c_uint = 246;
-pub const AKEYCODE_TV_INPUT_COMPOSITE_1: ::std::os::raw::c_uint = 247;
-pub const AKEYCODE_TV_INPUT_COMPOSITE_2: ::std::os::raw::c_uint = 248;
-pub const AKEYCODE_TV_INPUT_COMPONENT_1: ::std::os::raw::c_uint = 249;
-pub const AKEYCODE_TV_INPUT_COMPONENT_2: ::std::os::raw::c_uint = 250;
-pub const AKEYCODE_TV_INPUT_VGA_1: ::std::os::raw::c_uint = 251;
-pub const AKEYCODE_TV_AUDIO_DESCRIPTION: ::std::os::raw::c_uint = 252;
-pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP: ::std::os::raw::c_uint = 253;
-pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN: ::std::os::raw::c_uint = 254;
-pub const AKEYCODE_TV_ZOOM_MODE: ::std::os::raw::c_uint = 255;
-pub const AKEYCODE_TV_CONTENTS_MENU: ::std::os::raw::c_uint = 256;
-pub const AKEYCODE_TV_MEDIA_CONTEXT_MENU: ::std::os::raw::c_uint = 257;
-pub const AKEYCODE_TV_TIMER_PROGRAMMING: ::std::os::raw::c_uint = 258;
-pub const AKEYCODE_HELP: ::std::os::raw::c_uint = 259;
-pub const AKEYCODE_NAVIGATE_PREVIOUS: ::std::os::raw::c_uint = 260;
-pub const AKEYCODE_NAVIGATE_NEXT: ::std::os::raw::c_uint = 261;
-pub const AKEYCODE_NAVIGATE_IN: ::std::os::raw::c_uint = 262;
-pub const AKEYCODE_NAVIGATE_OUT: ::std::os::raw::c_uint = 263;
-pub const AKEYCODE_STEM_PRIMARY: ::std::os::raw::c_uint = 264;
-pub const AKEYCODE_STEM_1: ::std::os::raw::c_uint = 265;
-pub const AKEYCODE_STEM_2: ::std::os::raw::c_uint = 266;
-pub const AKEYCODE_STEM_3: ::std::os::raw::c_uint = 267;
-pub const AKEYCODE_DPAD_UP_LEFT: ::std::os::raw::c_uint = 268;
-pub const AKEYCODE_DPAD_DOWN_LEFT: ::std::os::raw::c_uint = 269;
-pub const AKEYCODE_DPAD_UP_RIGHT: ::std::os::raw::c_uint = 270;
-pub const AKEYCODE_DPAD_DOWN_RIGHT: ::std::os::raw::c_uint = 271;
-pub const AKEYCODE_MEDIA_SKIP_FORWARD: ::std::os::raw::c_uint = 272;
-pub const AKEYCODE_MEDIA_SKIP_BACKWARD: ::std::os::raw::c_uint = 273;
-pub const AKEYCODE_MEDIA_STEP_FORWARD: ::std::os::raw::c_uint = 274;
-pub const AKEYCODE_MEDIA_STEP_BACKWARD: ::std::os::raw::c_uint = 275;
-pub const AKEYCODE_SOFT_SLEEP: ::std::os::raw::c_uint = 276;
-pub const AKEYCODE_CUT: ::std::os::raw::c_uint = 277;
-pub const AKEYCODE_COPY: ::std::os::raw::c_uint = 278;
-pub const AKEYCODE_PASTE: ::std::os::raw::c_uint = 279;
-pub const AKEYCODE_SYSTEM_NAVIGATION_UP: ::std::os::raw::c_uint = 280;
-pub const AKEYCODE_SYSTEM_NAVIGATION_DOWN: ::std::os::raw::c_uint = 281;
-pub const AKEYCODE_SYSTEM_NAVIGATION_LEFT: ::std::os::raw::c_uint = 282;
-pub const AKEYCODE_SYSTEM_NAVIGATION_RIGHT: ::std::os::raw::c_uint = 283;
-pub const AKEYCODE_ALL_APPS: ::std::os::raw::c_uint = 284;
-pub const AKEYCODE_REFRESH: ::std::os::raw::c_uint = 285;
-pub const AKEYCODE_THUMBS_UP: ::std::os::raw::c_uint = 286;
-pub const AKEYCODE_THUMBS_DOWN: ::std::os::raw::c_uint = 287;
-pub const AKEYCODE_PROFILE_SWITCH: ::std::os::raw::c_uint = 288;
+pub const AKEYCODE_UNKNOWN: _bindgen_ty_2 = 0;
+pub const AKEYCODE_SOFT_LEFT: _bindgen_ty_2 = 1;
+pub const AKEYCODE_SOFT_RIGHT: _bindgen_ty_2 = 2;
+pub const AKEYCODE_HOME: _bindgen_ty_2 = 3;
+pub const AKEYCODE_BACK: _bindgen_ty_2 = 4;
+pub const AKEYCODE_CALL: _bindgen_ty_2 = 5;
+pub const AKEYCODE_ENDCALL: _bindgen_ty_2 = 6;
+pub const AKEYCODE_0: _bindgen_ty_2 = 7;
+pub const AKEYCODE_1: _bindgen_ty_2 = 8;
+pub const AKEYCODE_2: _bindgen_ty_2 = 9;
+pub const AKEYCODE_3: _bindgen_ty_2 = 10;
+pub const AKEYCODE_4: _bindgen_ty_2 = 11;
+pub const AKEYCODE_5: _bindgen_ty_2 = 12;
+pub const AKEYCODE_6: _bindgen_ty_2 = 13;
+pub const AKEYCODE_7: _bindgen_ty_2 = 14;
+pub const AKEYCODE_8: _bindgen_ty_2 = 15;
+pub const AKEYCODE_9: _bindgen_ty_2 = 16;
+pub const AKEYCODE_STAR: _bindgen_ty_2 = 17;
+pub const AKEYCODE_POUND: _bindgen_ty_2 = 18;
+pub const AKEYCODE_DPAD_UP: _bindgen_ty_2 = 19;
+pub const AKEYCODE_DPAD_DOWN: _bindgen_ty_2 = 20;
+pub const AKEYCODE_DPAD_LEFT: _bindgen_ty_2 = 21;
+pub const AKEYCODE_DPAD_RIGHT: _bindgen_ty_2 = 22;
+pub const AKEYCODE_DPAD_CENTER: _bindgen_ty_2 = 23;
+pub const AKEYCODE_VOLUME_UP: _bindgen_ty_2 = 24;
+pub const AKEYCODE_VOLUME_DOWN: _bindgen_ty_2 = 25;
+pub const AKEYCODE_POWER: _bindgen_ty_2 = 26;
+pub const AKEYCODE_CAMERA: _bindgen_ty_2 = 27;
+pub const AKEYCODE_CLEAR: _bindgen_ty_2 = 28;
+pub const AKEYCODE_A: _bindgen_ty_2 = 29;
+pub const AKEYCODE_B: _bindgen_ty_2 = 30;
+pub const AKEYCODE_C: _bindgen_ty_2 = 31;
+pub const AKEYCODE_D: _bindgen_ty_2 = 32;
+pub const AKEYCODE_E: _bindgen_ty_2 = 33;
+pub const AKEYCODE_F: _bindgen_ty_2 = 34;
+pub const AKEYCODE_G: _bindgen_ty_2 = 35;
+pub const AKEYCODE_H: _bindgen_ty_2 = 36;
+pub const AKEYCODE_I: _bindgen_ty_2 = 37;
+pub const AKEYCODE_J: _bindgen_ty_2 = 38;
+pub const AKEYCODE_K: _bindgen_ty_2 = 39;
+pub const AKEYCODE_L: _bindgen_ty_2 = 40;
+pub const AKEYCODE_M: _bindgen_ty_2 = 41;
+pub const AKEYCODE_N: _bindgen_ty_2 = 42;
+pub const AKEYCODE_O: _bindgen_ty_2 = 43;
+pub const AKEYCODE_P: _bindgen_ty_2 = 44;
+pub const AKEYCODE_Q: _bindgen_ty_2 = 45;
+pub const AKEYCODE_R: _bindgen_ty_2 = 46;
+pub const AKEYCODE_S: _bindgen_ty_2 = 47;
+pub const AKEYCODE_T: _bindgen_ty_2 = 48;
+pub const AKEYCODE_U: _bindgen_ty_2 = 49;
+pub const AKEYCODE_V: _bindgen_ty_2 = 50;
+pub const AKEYCODE_W: _bindgen_ty_2 = 51;
+pub const AKEYCODE_X: _bindgen_ty_2 = 52;
+pub const AKEYCODE_Y: _bindgen_ty_2 = 53;
+pub const AKEYCODE_Z: _bindgen_ty_2 = 54;
+pub const AKEYCODE_COMMA: _bindgen_ty_2 = 55;
+pub const AKEYCODE_PERIOD: _bindgen_ty_2 = 56;
+pub const AKEYCODE_ALT_LEFT: _bindgen_ty_2 = 57;
+pub const AKEYCODE_ALT_RIGHT: _bindgen_ty_2 = 58;
+pub const AKEYCODE_SHIFT_LEFT: _bindgen_ty_2 = 59;
+pub const AKEYCODE_SHIFT_RIGHT: _bindgen_ty_2 = 60;
+pub const AKEYCODE_TAB: _bindgen_ty_2 = 61;
+pub const AKEYCODE_SPACE: _bindgen_ty_2 = 62;
+pub const AKEYCODE_SYM: _bindgen_ty_2 = 63;
+pub const AKEYCODE_EXPLORER: _bindgen_ty_2 = 64;
+pub const AKEYCODE_ENVELOPE: _bindgen_ty_2 = 65;
+pub const AKEYCODE_ENTER: _bindgen_ty_2 = 66;
+pub const AKEYCODE_DEL: _bindgen_ty_2 = 67;
+pub const AKEYCODE_GRAVE: _bindgen_ty_2 = 68;
+pub const AKEYCODE_MINUS: _bindgen_ty_2 = 69;
+pub const AKEYCODE_EQUALS: _bindgen_ty_2 = 70;
+pub const AKEYCODE_LEFT_BRACKET: _bindgen_ty_2 = 71;
+pub const AKEYCODE_RIGHT_BRACKET: _bindgen_ty_2 = 72;
+pub const AKEYCODE_BACKSLASH: _bindgen_ty_2 = 73;
+pub const AKEYCODE_SEMICOLON: _bindgen_ty_2 = 74;
+pub const AKEYCODE_APOSTROPHE: _bindgen_ty_2 = 75;
+pub const AKEYCODE_SLASH: _bindgen_ty_2 = 76;
+pub const AKEYCODE_AT: _bindgen_ty_2 = 77;
+pub const AKEYCODE_NUM: _bindgen_ty_2 = 78;
+pub const AKEYCODE_HEADSETHOOK: _bindgen_ty_2 = 79;
+pub const AKEYCODE_FOCUS: _bindgen_ty_2 = 80;
+pub const AKEYCODE_PLUS: _bindgen_ty_2 = 81;
+pub const AKEYCODE_MENU: _bindgen_ty_2 = 82;
+pub const AKEYCODE_NOTIFICATION: _bindgen_ty_2 = 83;
+pub const AKEYCODE_SEARCH: _bindgen_ty_2 = 84;
+pub const AKEYCODE_MEDIA_PLAY_PAUSE: _bindgen_ty_2 = 85;
+pub const AKEYCODE_MEDIA_STOP: _bindgen_ty_2 = 86;
+pub const AKEYCODE_MEDIA_NEXT: _bindgen_ty_2 = 87;
+pub const AKEYCODE_MEDIA_PREVIOUS: _bindgen_ty_2 = 88;
+pub const AKEYCODE_MEDIA_REWIND: _bindgen_ty_2 = 89;
+pub const AKEYCODE_MEDIA_FAST_FORWARD: _bindgen_ty_2 = 90;
+pub const AKEYCODE_MUTE: _bindgen_ty_2 = 91;
+pub const AKEYCODE_PAGE_UP: _bindgen_ty_2 = 92;
+pub const AKEYCODE_PAGE_DOWN: _bindgen_ty_2 = 93;
+pub const AKEYCODE_PICTSYMBOLS: _bindgen_ty_2 = 94;
+pub const AKEYCODE_SWITCH_CHARSET: _bindgen_ty_2 = 95;
+pub const AKEYCODE_BUTTON_A: _bindgen_ty_2 = 96;
+pub const AKEYCODE_BUTTON_B: _bindgen_ty_2 = 97;
+pub const AKEYCODE_BUTTON_C: _bindgen_ty_2 = 98;
+pub const AKEYCODE_BUTTON_X: _bindgen_ty_2 = 99;
+pub const AKEYCODE_BUTTON_Y: _bindgen_ty_2 = 100;
+pub const AKEYCODE_BUTTON_Z: _bindgen_ty_2 = 101;
+pub const AKEYCODE_BUTTON_L1: _bindgen_ty_2 = 102;
+pub const AKEYCODE_BUTTON_R1: _bindgen_ty_2 = 103;
+pub const AKEYCODE_BUTTON_L2: _bindgen_ty_2 = 104;
+pub const AKEYCODE_BUTTON_R2: _bindgen_ty_2 = 105;
+pub const AKEYCODE_BUTTON_THUMBL: _bindgen_ty_2 = 106;
+pub const AKEYCODE_BUTTON_THUMBR: _bindgen_ty_2 = 107;
+pub const AKEYCODE_BUTTON_START: _bindgen_ty_2 = 108;
+pub const AKEYCODE_BUTTON_SELECT: _bindgen_ty_2 = 109;
+pub const AKEYCODE_BUTTON_MODE: _bindgen_ty_2 = 110;
+pub const AKEYCODE_ESCAPE: _bindgen_ty_2 = 111;
+pub const AKEYCODE_FORWARD_DEL: _bindgen_ty_2 = 112;
+pub const AKEYCODE_CTRL_LEFT: _bindgen_ty_2 = 113;
+pub const AKEYCODE_CTRL_RIGHT: _bindgen_ty_2 = 114;
+pub const AKEYCODE_CAPS_LOCK: _bindgen_ty_2 = 115;
+pub const AKEYCODE_SCROLL_LOCK: _bindgen_ty_2 = 116;
+pub const AKEYCODE_META_LEFT: _bindgen_ty_2 = 117;
+pub const AKEYCODE_META_RIGHT: _bindgen_ty_2 = 118;
+pub const AKEYCODE_FUNCTION: _bindgen_ty_2 = 119;
+pub const AKEYCODE_SYSRQ: _bindgen_ty_2 = 120;
+pub const AKEYCODE_BREAK: _bindgen_ty_2 = 121;
+pub const AKEYCODE_MOVE_HOME: _bindgen_ty_2 = 122;
+pub const AKEYCODE_MOVE_END: _bindgen_ty_2 = 123;
+pub const AKEYCODE_INSERT: _bindgen_ty_2 = 124;
+pub const AKEYCODE_FORWARD: _bindgen_ty_2 = 125;
+pub const AKEYCODE_MEDIA_PLAY: _bindgen_ty_2 = 126;
+pub const AKEYCODE_MEDIA_PAUSE: _bindgen_ty_2 = 127;
+pub const AKEYCODE_MEDIA_CLOSE: _bindgen_ty_2 = 128;
+pub const AKEYCODE_MEDIA_EJECT: _bindgen_ty_2 = 129;
+pub const AKEYCODE_MEDIA_RECORD: _bindgen_ty_2 = 130;
+pub const AKEYCODE_F1: _bindgen_ty_2 = 131;
+pub const AKEYCODE_F2: _bindgen_ty_2 = 132;
+pub const AKEYCODE_F3: _bindgen_ty_2 = 133;
+pub const AKEYCODE_F4: _bindgen_ty_2 = 134;
+pub const AKEYCODE_F5: _bindgen_ty_2 = 135;
+pub const AKEYCODE_F6: _bindgen_ty_2 = 136;
+pub const AKEYCODE_F7: _bindgen_ty_2 = 137;
+pub const AKEYCODE_F8: _bindgen_ty_2 = 138;
+pub const AKEYCODE_F9: _bindgen_ty_2 = 139;
+pub const AKEYCODE_F10: _bindgen_ty_2 = 140;
+pub const AKEYCODE_F11: _bindgen_ty_2 = 141;
+pub const AKEYCODE_F12: _bindgen_ty_2 = 142;
+pub const AKEYCODE_NUM_LOCK: _bindgen_ty_2 = 143;
+pub const AKEYCODE_NUMPAD_0: _bindgen_ty_2 = 144;
+pub const AKEYCODE_NUMPAD_1: _bindgen_ty_2 = 145;
+pub const AKEYCODE_NUMPAD_2: _bindgen_ty_2 = 146;
+pub const AKEYCODE_NUMPAD_3: _bindgen_ty_2 = 147;
+pub const AKEYCODE_NUMPAD_4: _bindgen_ty_2 = 148;
+pub const AKEYCODE_NUMPAD_5: _bindgen_ty_2 = 149;
+pub const AKEYCODE_NUMPAD_6: _bindgen_ty_2 = 150;
+pub const AKEYCODE_NUMPAD_7: _bindgen_ty_2 = 151;
+pub const AKEYCODE_NUMPAD_8: _bindgen_ty_2 = 152;
+pub const AKEYCODE_NUMPAD_9: _bindgen_ty_2 = 153;
+pub const AKEYCODE_NUMPAD_DIVIDE: _bindgen_ty_2 = 154;
+pub const AKEYCODE_NUMPAD_MULTIPLY: _bindgen_ty_2 = 155;
+pub const AKEYCODE_NUMPAD_SUBTRACT: _bindgen_ty_2 = 156;
+pub const AKEYCODE_NUMPAD_ADD: _bindgen_ty_2 = 157;
+pub const AKEYCODE_NUMPAD_DOT: _bindgen_ty_2 = 158;
+pub const AKEYCODE_NUMPAD_COMMA: _bindgen_ty_2 = 159;
+pub const AKEYCODE_NUMPAD_ENTER: _bindgen_ty_2 = 160;
+pub const AKEYCODE_NUMPAD_EQUALS: _bindgen_ty_2 = 161;
+pub const AKEYCODE_NUMPAD_LEFT_PAREN: _bindgen_ty_2 = 162;
+pub const AKEYCODE_NUMPAD_RIGHT_PAREN: _bindgen_ty_2 = 163;
+pub const AKEYCODE_VOLUME_MUTE: _bindgen_ty_2 = 164;
+pub const AKEYCODE_INFO: _bindgen_ty_2 = 165;
+pub const AKEYCODE_CHANNEL_UP: _bindgen_ty_2 = 166;
+pub const AKEYCODE_CHANNEL_DOWN: _bindgen_ty_2 = 167;
+pub const AKEYCODE_ZOOM_IN: _bindgen_ty_2 = 168;
+pub const AKEYCODE_ZOOM_OUT: _bindgen_ty_2 = 169;
+pub const AKEYCODE_TV: _bindgen_ty_2 = 170;
+pub const AKEYCODE_WINDOW: _bindgen_ty_2 = 171;
+pub const AKEYCODE_GUIDE: _bindgen_ty_2 = 172;
+pub const AKEYCODE_DVR: _bindgen_ty_2 = 173;
+pub const AKEYCODE_BOOKMARK: _bindgen_ty_2 = 174;
+pub const AKEYCODE_CAPTIONS: _bindgen_ty_2 = 175;
+pub const AKEYCODE_SETTINGS: _bindgen_ty_2 = 176;
+pub const AKEYCODE_TV_POWER: _bindgen_ty_2 = 177;
+pub const AKEYCODE_TV_INPUT: _bindgen_ty_2 = 178;
+pub const AKEYCODE_STB_POWER: _bindgen_ty_2 = 179;
+pub const AKEYCODE_STB_INPUT: _bindgen_ty_2 = 180;
+pub const AKEYCODE_AVR_POWER: _bindgen_ty_2 = 181;
+pub const AKEYCODE_AVR_INPUT: _bindgen_ty_2 = 182;
+pub const AKEYCODE_PROG_RED: _bindgen_ty_2 = 183;
+pub const AKEYCODE_PROG_GREEN: _bindgen_ty_2 = 184;
+pub const AKEYCODE_PROG_YELLOW: _bindgen_ty_2 = 185;
+pub const AKEYCODE_PROG_BLUE: _bindgen_ty_2 = 186;
+pub const AKEYCODE_APP_SWITCH: _bindgen_ty_2 = 187;
+pub const AKEYCODE_BUTTON_1: _bindgen_ty_2 = 188;
+pub const AKEYCODE_BUTTON_2: _bindgen_ty_2 = 189;
+pub const AKEYCODE_BUTTON_3: _bindgen_ty_2 = 190;
+pub const AKEYCODE_BUTTON_4: _bindgen_ty_2 = 191;
+pub const AKEYCODE_BUTTON_5: _bindgen_ty_2 = 192;
+pub const AKEYCODE_BUTTON_6: _bindgen_ty_2 = 193;
+pub const AKEYCODE_BUTTON_7: _bindgen_ty_2 = 194;
+pub const AKEYCODE_BUTTON_8: _bindgen_ty_2 = 195;
+pub const AKEYCODE_BUTTON_9: _bindgen_ty_2 = 196;
+pub const AKEYCODE_BUTTON_10: _bindgen_ty_2 = 197;
+pub const AKEYCODE_BUTTON_11: _bindgen_ty_2 = 198;
+pub const AKEYCODE_BUTTON_12: _bindgen_ty_2 = 199;
+pub const AKEYCODE_BUTTON_13: _bindgen_ty_2 = 200;
+pub const AKEYCODE_BUTTON_14: _bindgen_ty_2 = 201;
+pub const AKEYCODE_BUTTON_15: _bindgen_ty_2 = 202;
+pub const AKEYCODE_BUTTON_16: _bindgen_ty_2 = 203;
+pub const AKEYCODE_LANGUAGE_SWITCH: _bindgen_ty_2 = 204;
+pub const AKEYCODE_MANNER_MODE: _bindgen_ty_2 = 205;
+pub const AKEYCODE_3D_MODE: _bindgen_ty_2 = 206;
+pub const AKEYCODE_CONTACTS: _bindgen_ty_2 = 207;
+pub const AKEYCODE_CALENDAR: _bindgen_ty_2 = 208;
+pub const AKEYCODE_MUSIC: _bindgen_ty_2 = 209;
+pub const AKEYCODE_CALCULATOR: _bindgen_ty_2 = 210;
+pub const AKEYCODE_ZENKAKU_HANKAKU: _bindgen_ty_2 = 211;
+pub const AKEYCODE_EISU: _bindgen_ty_2 = 212;
+pub const AKEYCODE_MUHENKAN: _bindgen_ty_2 = 213;
+pub const AKEYCODE_HENKAN: _bindgen_ty_2 = 214;
+pub const AKEYCODE_KATAKANA_HIRAGANA: _bindgen_ty_2 = 215;
+pub const AKEYCODE_YEN: _bindgen_ty_2 = 216;
+pub const AKEYCODE_RO: _bindgen_ty_2 = 217;
+pub const AKEYCODE_KANA: _bindgen_ty_2 = 218;
+pub const AKEYCODE_ASSIST: _bindgen_ty_2 = 219;
+pub const AKEYCODE_BRIGHTNESS_DOWN: _bindgen_ty_2 = 220;
+pub const AKEYCODE_BRIGHTNESS_UP: _bindgen_ty_2 = 221;
+pub const AKEYCODE_MEDIA_AUDIO_TRACK: _bindgen_ty_2 = 222;
+pub const AKEYCODE_SLEEP: _bindgen_ty_2 = 223;
+pub const AKEYCODE_WAKEUP: _bindgen_ty_2 = 224;
+pub const AKEYCODE_PAIRING: _bindgen_ty_2 = 225;
+pub const AKEYCODE_MEDIA_TOP_MENU: _bindgen_ty_2 = 226;
+pub const AKEYCODE_11: _bindgen_ty_2 = 227;
+pub const AKEYCODE_12: _bindgen_ty_2 = 228;
+pub const AKEYCODE_LAST_CHANNEL: _bindgen_ty_2 = 229;
+pub const AKEYCODE_TV_DATA_SERVICE: _bindgen_ty_2 = 230;
+pub const AKEYCODE_VOICE_ASSIST: _bindgen_ty_2 = 231;
+pub const AKEYCODE_TV_RADIO_SERVICE: _bindgen_ty_2 = 232;
+pub const AKEYCODE_TV_TELETEXT: _bindgen_ty_2 = 233;
+pub const AKEYCODE_TV_NUMBER_ENTRY: _bindgen_ty_2 = 234;
+pub const AKEYCODE_TV_TERRESTRIAL_ANALOG: _bindgen_ty_2 = 235;
+pub const AKEYCODE_TV_TERRESTRIAL_DIGITAL: _bindgen_ty_2 = 236;
+pub const AKEYCODE_TV_SATELLITE: _bindgen_ty_2 = 237;
+pub const AKEYCODE_TV_SATELLITE_BS: _bindgen_ty_2 = 238;
+pub const AKEYCODE_TV_SATELLITE_CS: _bindgen_ty_2 = 239;
+pub const AKEYCODE_TV_SATELLITE_SERVICE: _bindgen_ty_2 = 240;
+pub const AKEYCODE_TV_NETWORK: _bindgen_ty_2 = 241;
+pub const AKEYCODE_TV_ANTENNA_CABLE: _bindgen_ty_2 = 242;
+pub const AKEYCODE_TV_INPUT_HDMI_1: _bindgen_ty_2 = 243;
+pub const AKEYCODE_TV_INPUT_HDMI_2: _bindgen_ty_2 = 244;
+pub const AKEYCODE_TV_INPUT_HDMI_3: _bindgen_ty_2 = 245;
+pub const AKEYCODE_TV_INPUT_HDMI_4: _bindgen_ty_2 = 246;
+pub const AKEYCODE_TV_INPUT_COMPOSITE_1: _bindgen_ty_2 = 247;
+pub const AKEYCODE_TV_INPUT_COMPOSITE_2: _bindgen_ty_2 = 248;
+pub const AKEYCODE_TV_INPUT_COMPONENT_1: _bindgen_ty_2 = 249;
+pub const AKEYCODE_TV_INPUT_COMPONENT_2: _bindgen_ty_2 = 250;
+pub const AKEYCODE_TV_INPUT_VGA_1: _bindgen_ty_2 = 251;
+pub const AKEYCODE_TV_AUDIO_DESCRIPTION: _bindgen_ty_2 = 252;
+pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP: _bindgen_ty_2 = 253;
+pub const AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN: _bindgen_ty_2 = 254;
+pub const AKEYCODE_TV_ZOOM_MODE: _bindgen_ty_2 = 255;
+pub const AKEYCODE_TV_CONTENTS_MENU: _bindgen_ty_2 = 256;
+pub const AKEYCODE_TV_MEDIA_CONTEXT_MENU: _bindgen_ty_2 = 257;
+pub const AKEYCODE_TV_TIMER_PROGRAMMING: _bindgen_ty_2 = 258;
+pub const AKEYCODE_HELP: _bindgen_ty_2 = 259;
+pub const AKEYCODE_NAVIGATE_PREVIOUS: _bindgen_ty_2 = 260;
+pub const AKEYCODE_NAVIGATE_NEXT: _bindgen_ty_2 = 261;
+pub const AKEYCODE_NAVIGATE_IN: _bindgen_ty_2 = 262;
+pub const AKEYCODE_NAVIGATE_OUT: _bindgen_ty_2 = 263;
+pub const AKEYCODE_STEM_PRIMARY: _bindgen_ty_2 = 264;
+pub const AKEYCODE_STEM_1: _bindgen_ty_2 = 265;
+pub const AKEYCODE_STEM_2: _bindgen_ty_2 = 266;
+pub const AKEYCODE_STEM_3: _bindgen_ty_2 = 267;
+pub const AKEYCODE_DPAD_UP_LEFT: _bindgen_ty_2 = 268;
+pub const AKEYCODE_DPAD_DOWN_LEFT: _bindgen_ty_2 = 269;
+pub const AKEYCODE_DPAD_UP_RIGHT: _bindgen_ty_2 = 270;
+pub const AKEYCODE_DPAD_DOWN_RIGHT: _bindgen_ty_2 = 271;
+pub const AKEYCODE_MEDIA_SKIP_FORWARD: _bindgen_ty_2 = 272;
+pub const AKEYCODE_MEDIA_SKIP_BACKWARD: _bindgen_ty_2 = 273;
+pub const AKEYCODE_MEDIA_STEP_FORWARD: _bindgen_ty_2 = 274;
+pub const AKEYCODE_MEDIA_STEP_BACKWARD: _bindgen_ty_2 = 275;
+pub const AKEYCODE_SOFT_SLEEP: _bindgen_ty_2 = 276;
+pub const AKEYCODE_CUT: _bindgen_ty_2 = 277;
+pub const AKEYCODE_COPY: _bindgen_ty_2 = 278;
+pub const AKEYCODE_PASTE: _bindgen_ty_2 = 279;
+pub const AKEYCODE_SYSTEM_NAVIGATION_UP: _bindgen_ty_2 = 280;
+pub const AKEYCODE_SYSTEM_NAVIGATION_DOWN: _bindgen_ty_2 = 281;
+pub const AKEYCODE_SYSTEM_NAVIGATION_LEFT: _bindgen_ty_2 = 282;
+pub const AKEYCODE_SYSTEM_NAVIGATION_RIGHT: _bindgen_ty_2 = 283;
+pub const AKEYCODE_ALL_APPS: _bindgen_ty_2 = 284;
+pub const AKEYCODE_REFRESH: _bindgen_ty_2 = 285;
+pub const AKEYCODE_THUMBS_UP: _bindgen_ty_2 = 286;
+pub const AKEYCODE_THUMBS_DOWN: _bindgen_ty_2 = 287;
+pub const AKEYCODE_PROFILE_SWITCH: _bindgen_ty_2 = 288;
 pub type _bindgen_ty_2 = ::std::os::raw::c_uint;
-pub const ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: ::std::os::raw::c_uint = 1;
+pub const ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: _bindgen_ty_3 = 1;
 pub type _bindgen_ty_3 = ::std::os::raw::c_uint;
-pub const ALOOPER_POLL_WAKE: ::std::os::raw::c_int = -1;
-pub const ALOOPER_POLL_CALLBACK: ::std::os::raw::c_int = -2;
-pub const ALOOPER_POLL_TIMEOUT: ::std::os::raw::c_int = -3;
-pub const ALOOPER_POLL_ERROR: ::std::os::raw::c_int = -4;
+pub const ALOOPER_POLL_WAKE: _bindgen_ty_4 = -1;
+pub const ALOOPER_POLL_CALLBACK: _bindgen_ty_4 = -2;
+pub const ALOOPER_POLL_TIMEOUT: _bindgen_ty_4 = -3;
+pub const ALOOPER_POLL_ERROR: _bindgen_ty_4 = -4;
 pub type _bindgen_ty_4 = ::std::os::raw::c_int;
-pub const ALOOPER_EVENT_INPUT: ::std::os::raw::c_uint = 1;
-pub const ALOOPER_EVENT_OUTPUT: ::std::os::raw::c_uint = 2;
-pub const ALOOPER_EVENT_ERROR: ::std::os::raw::c_uint = 4;
-pub const ALOOPER_EVENT_HANGUP: ::std::os::raw::c_uint = 8;
-pub const ALOOPER_EVENT_INVALID: ::std::os::raw::c_uint = 16;
+pub const ALOOPER_EVENT_INPUT: _bindgen_ty_5 = 1;
+pub const ALOOPER_EVENT_OUTPUT: _bindgen_ty_5 = 2;
+pub const ALOOPER_EVENT_ERROR: _bindgen_ty_5 = 4;
+pub const ALOOPER_EVENT_HANGUP: _bindgen_ty_5 = 8;
+pub const ALOOPER_EVENT_INVALID: _bindgen_ty_5 = 16;
 pub type _bindgen_ty_5 = ::std::os::raw::c_uint;
-pub const AKEY_STATE_UNKNOWN: ::std::os::raw::c_int = -1;
-pub const AKEY_STATE_UP: ::std::os::raw::c_int = 0;
-pub const AKEY_STATE_DOWN: ::std::os::raw::c_int = 1;
-pub const AKEY_STATE_VIRTUAL: ::std::os::raw::c_int = 2;
+pub type va_list = __builtin_va_list;
+pub type __gnuc_va_list = __builtin_va_list;
+#[repr(C)]
+pub struct JavaVMAttachArgs {
+    pub version: jint,
+    pub name: *const ::std::os::raw::c_char,
+    pub group: jobject,
+}
+#[test]
+fn bindgen_test_layout_JavaVMAttachArgs() {
+    const UNINIT: ::std::mem::MaybeUninit<JavaVMAttachArgs> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<JavaVMAttachArgs>(),
+        24usize,
+        concat!("Size of: ", stringify!(JavaVMAttachArgs))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<JavaVMAttachArgs>(),
+        8usize,
+        concat!("Alignment of ", stringify!(JavaVMAttachArgs))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMAttachArgs),
+            "::",
+            stringify!(version)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).name) as usize - ptr as usize },
+        8usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMAttachArgs),
+            "::",
+            stringify!(name)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).group) as usize - ptr as usize },
+        16usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMAttachArgs),
+            "::",
+            stringify!(group)
+        )
+    );
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct JavaVMOption {
+    pub optionString: *const ::std::os::raw::c_char,
+    pub extraInfo: *mut ::std::os::raw::c_void,
+}
+#[test]
+fn bindgen_test_layout_JavaVMOption() {
+    const UNINIT: ::std::mem::MaybeUninit<JavaVMOption> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<JavaVMOption>(),
+        16usize,
+        concat!("Size of: ", stringify!(JavaVMOption))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<JavaVMOption>(),
+        8usize,
+        concat!("Alignment of ", stringify!(JavaVMOption))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).optionString) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMOption),
+            "::",
+            stringify!(optionString)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).extraInfo) as usize - ptr as usize },
+        8usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMOption),
+            "::",
+            stringify!(extraInfo)
+        )
+    );
+}
+#[repr(C)]
+pub struct JavaVMInitArgs {
+    pub version: jint,
+    pub nOptions: jint,
+    pub options: *mut JavaVMOption,
+    pub ignoreUnrecognized: jboolean,
+}
+#[test]
+fn bindgen_test_layout_JavaVMInitArgs() {
+    const UNINIT: ::std::mem::MaybeUninit<JavaVMInitArgs> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<JavaVMInitArgs>(),
+        24usize,
+        concat!("Size of: ", stringify!(JavaVMInitArgs))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<JavaVMInitArgs>(),
+        8usize,
+        concat!("Alignment of ", stringify!(JavaVMInitArgs))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(version)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).nOptions) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(nOptions)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).options) as usize - ptr as usize },
+        8usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(options)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).ignoreUnrecognized) as usize - ptr as usize },
+        16usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(JavaVMInitArgs),
+            "::",
+            stringify!(ignoreUnrecognized)
+        )
+    );
+}
+pub const AKEY_STATE_UNKNOWN: _bindgen_ty_6 = -1;
+pub const AKEY_STATE_UP: _bindgen_ty_6 = 0;
+pub const AKEY_STATE_DOWN: _bindgen_ty_6 = 1;
+pub const AKEY_STATE_VIRTUAL: _bindgen_ty_6 = 2;
 pub type _bindgen_ty_6 = ::std::os::raw::c_int;
-pub const AMETA_NONE: ::std::os::raw::c_uint = 0;
-pub const AMETA_ALT_ON: ::std::os::raw::c_uint = 2;
-pub const AMETA_ALT_LEFT_ON: ::std::os::raw::c_uint = 16;
-pub const AMETA_ALT_RIGHT_ON: ::std::os::raw::c_uint = 32;
-pub const AMETA_SHIFT_ON: ::std::os::raw::c_uint = 1;
-pub const AMETA_SHIFT_LEFT_ON: ::std::os::raw::c_uint = 64;
-pub const AMETA_SHIFT_RIGHT_ON: ::std::os::raw::c_uint = 128;
-pub const AMETA_SYM_ON: ::std::os::raw::c_uint = 4;
-pub const AMETA_FUNCTION_ON: ::std::os::raw::c_uint = 8;
-pub const AMETA_CTRL_ON: ::std::os::raw::c_uint = 4096;
-pub const AMETA_CTRL_LEFT_ON: ::std::os::raw::c_uint = 8192;
-pub const AMETA_CTRL_RIGHT_ON: ::std::os::raw::c_uint = 16384;
-pub const AMETA_META_ON: ::std::os::raw::c_uint = 65536;
-pub const AMETA_META_LEFT_ON: ::std::os::raw::c_uint = 131072;
-pub const AMETA_META_RIGHT_ON: ::std::os::raw::c_uint = 262144;
-pub const AMETA_CAPS_LOCK_ON: ::std::os::raw::c_uint = 1048576;
-pub const AMETA_NUM_LOCK_ON: ::std::os::raw::c_uint = 2097152;
-pub const AMETA_SCROLL_LOCK_ON: ::std::os::raw::c_uint = 4194304;
+pub const AMETA_NONE: _bindgen_ty_7 = 0;
+pub const AMETA_ALT_ON: _bindgen_ty_7 = 2;
+pub const AMETA_ALT_LEFT_ON: _bindgen_ty_7 = 16;
+pub const AMETA_ALT_RIGHT_ON: _bindgen_ty_7 = 32;
+pub const AMETA_SHIFT_ON: _bindgen_ty_7 = 1;
+pub const AMETA_SHIFT_LEFT_ON: _bindgen_ty_7 = 64;
+pub const AMETA_SHIFT_RIGHT_ON: _bindgen_ty_7 = 128;
+pub const AMETA_SYM_ON: _bindgen_ty_7 = 4;
+pub const AMETA_FUNCTION_ON: _bindgen_ty_7 = 8;
+pub const AMETA_CTRL_ON: _bindgen_ty_7 = 4096;
+pub const AMETA_CTRL_LEFT_ON: _bindgen_ty_7 = 8192;
+pub const AMETA_CTRL_RIGHT_ON: _bindgen_ty_7 = 16384;
+pub const AMETA_META_ON: _bindgen_ty_7 = 65536;
+pub const AMETA_META_LEFT_ON: _bindgen_ty_7 = 131072;
+pub const AMETA_META_RIGHT_ON: _bindgen_ty_7 = 262144;
+pub const AMETA_CAPS_LOCK_ON: _bindgen_ty_7 = 1048576;
+pub const AMETA_NUM_LOCK_ON: _bindgen_ty_7 = 2097152;
+pub const AMETA_SCROLL_LOCK_ON: _bindgen_ty_7 = 4194304;
 pub type _bindgen_ty_7 = ::std::os::raw::c_uint;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct AInputEvent {
     _unused: [u8; 0],
 }
-pub const AINPUT_EVENT_TYPE_KEY: ::std::os::raw::c_uint = 1;
-pub const AINPUT_EVENT_TYPE_MOTION: ::std::os::raw::c_uint = 2;
+pub const AINPUT_EVENT_TYPE_KEY: _bindgen_ty_8 = 1;
+pub const AINPUT_EVENT_TYPE_MOTION: _bindgen_ty_8 = 2;
+pub const AINPUT_EVENT_TYPE_FOCUS: _bindgen_ty_8 = 3;
+pub const AINPUT_EVENT_TYPE_CAPTURE: _bindgen_ty_8 = 4;
+pub const AINPUT_EVENT_TYPE_DRAG: _bindgen_ty_8 = 5;
+pub const AINPUT_EVENT_TYPE_TOUCH_MODE: _bindgen_ty_8 = 6;
 pub type _bindgen_ty_8 = ::std::os::raw::c_uint;
-pub const AKEY_EVENT_ACTION_DOWN: ::std::os::raw::c_uint = 0;
-pub const AKEY_EVENT_ACTION_UP: ::std::os::raw::c_uint = 1;
-pub const AKEY_EVENT_ACTION_MULTIPLE: ::std::os::raw::c_uint = 2;
+pub const AKEY_EVENT_ACTION_DOWN: _bindgen_ty_9 = 0;
+pub const AKEY_EVENT_ACTION_UP: _bindgen_ty_9 = 1;
+pub const AKEY_EVENT_ACTION_MULTIPLE: _bindgen_ty_9 = 2;
 pub type _bindgen_ty_9 = ::std::os::raw::c_uint;
-pub const AKEY_EVENT_FLAG_WOKE_HERE: ::std::os::raw::c_uint = 1;
-pub const AKEY_EVENT_FLAG_SOFT_KEYBOARD: ::std::os::raw::c_uint = 2;
-pub const AKEY_EVENT_FLAG_KEEP_TOUCH_MODE: ::std::os::raw::c_uint = 4;
-pub const AKEY_EVENT_FLAG_FROM_SYSTEM: ::std::os::raw::c_uint = 8;
-pub const AKEY_EVENT_FLAG_EDITOR_ACTION: ::std::os::raw::c_uint = 16;
-pub const AKEY_EVENT_FLAG_CANCELED: ::std::os::raw::c_uint = 32;
-pub const AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY: ::std::os::raw::c_uint = 64;
-pub const AKEY_EVENT_FLAG_LONG_PRESS: ::std::os::raw::c_uint = 128;
-pub const AKEY_EVENT_FLAG_CANCELED_LONG_PRESS: ::std::os::raw::c_uint = 256;
-pub const AKEY_EVENT_FLAG_TRACKING: ::std::os::raw::c_uint = 512;
-pub const AKEY_EVENT_FLAG_FALLBACK: ::std::os::raw::c_uint = 1024;
+pub const AKEY_EVENT_FLAG_WOKE_HERE: _bindgen_ty_10 = 1;
+pub const AKEY_EVENT_FLAG_SOFT_KEYBOARD: _bindgen_ty_10 = 2;
+pub const AKEY_EVENT_FLAG_KEEP_TOUCH_MODE: _bindgen_ty_10 = 4;
+pub const AKEY_EVENT_FLAG_FROM_SYSTEM: _bindgen_ty_10 = 8;
+pub const AKEY_EVENT_FLAG_EDITOR_ACTION: _bindgen_ty_10 = 16;
+pub const AKEY_EVENT_FLAG_CANCELED: _bindgen_ty_10 = 32;
+pub const AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY: _bindgen_ty_10 = 64;
+pub const AKEY_EVENT_FLAG_LONG_PRESS: _bindgen_ty_10 = 128;
+pub const AKEY_EVENT_FLAG_CANCELED_LONG_PRESS: _bindgen_ty_10 = 256;
+pub const AKEY_EVENT_FLAG_TRACKING: _bindgen_ty_10 = 512;
+pub const AKEY_EVENT_FLAG_FALLBACK: _bindgen_ty_10 = 1024;
 pub type _bindgen_ty_10 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_ACTION_MASK: ::std::os::raw::c_uint = 255;
-pub const AMOTION_EVENT_ACTION_POINTER_INDEX_MASK: ::std::os::raw::c_uint = 65280;
-pub const AMOTION_EVENT_ACTION_DOWN: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_ACTION_UP: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_ACTION_MOVE: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_ACTION_CANCEL: ::std::os::raw::c_uint = 3;
-pub const AMOTION_EVENT_ACTION_OUTSIDE: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_ACTION_POINTER_DOWN: ::std::os::raw::c_uint = 5;
-pub const AMOTION_EVENT_ACTION_POINTER_UP: ::std::os::raw::c_uint = 6;
-pub const AMOTION_EVENT_ACTION_HOVER_MOVE: ::std::os::raw::c_uint = 7;
-pub const AMOTION_EVENT_ACTION_SCROLL: ::std::os::raw::c_uint = 8;
-pub const AMOTION_EVENT_ACTION_HOVER_ENTER: ::std::os::raw::c_uint = 9;
-pub const AMOTION_EVENT_ACTION_HOVER_EXIT: ::std::os::raw::c_uint = 10;
-pub const AMOTION_EVENT_ACTION_BUTTON_PRESS: ::std::os::raw::c_uint = 11;
-pub const AMOTION_EVENT_ACTION_BUTTON_RELEASE: ::std::os::raw::c_uint = 12;
+pub const AMOTION_EVENT_ACTION_MASK: _bindgen_ty_11 = 255;
+pub const AMOTION_EVENT_ACTION_POINTER_INDEX_MASK: _bindgen_ty_11 = 65280;
+pub const AMOTION_EVENT_ACTION_DOWN: _bindgen_ty_11 = 0;
+pub const AMOTION_EVENT_ACTION_UP: _bindgen_ty_11 = 1;
+pub const AMOTION_EVENT_ACTION_MOVE: _bindgen_ty_11 = 2;
+pub const AMOTION_EVENT_ACTION_CANCEL: _bindgen_ty_11 = 3;
+pub const AMOTION_EVENT_ACTION_OUTSIDE: _bindgen_ty_11 = 4;
+pub const AMOTION_EVENT_ACTION_POINTER_DOWN: _bindgen_ty_11 = 5;
+pub const AMOTION_EVENT_ACTION_POINTER_UP: _bindgen_ty_11 = 6;
+pub const AMOTION_EVENT_ACTION_HOVER_MOVE: _bindgen_ty_11 = 7;
+pub const AMOTION_EVENT_ACTION_SCROLL: _bindgen_ty_11 = 8;
+pub const AMOTION_EVENT_ACTION_HOVER_ENTER: _bindgen_ty_11 = 9;
+pub const AMOTION_EVENT_ACTION_HOVER_EXIT: _bindgen_ty_11 = 10;
+pub const AMOTION_EVENT_ACTION_BUTTON_PRESS: _bindgen_ty_11 = 11;
+pub const AMOTION_EVENT_ACTION_BUTTON_RELEASE: _bindgen_ty_11 = 12;
 pub type _bindgen_ty_11 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED: ::std::os::raw::c_uint = 1;
+pub const AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED: _bindgen_ty_12 = 1;
 pub type _bindgen_ty_12 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_EDGE_FLAG_NONE: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_EDGE_FLAG_TOP: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_EDGE_FLAG_BOTTOM: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_EDGE_FLAG_LEFT: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_EDGE_FLAG_RIGHT: ::std::os::raw::c_uint = 8;
+pub const AMOTION_EVENT_EDGE_FLAG_NONE: _bindgen_ty_13 = 0;
+pub const AMOTION_EVENT_EDGE_FLAG_TOP: _bindgen_ty_13 = 1;
+pub const AMOTION_EVENT_EDGE_FLAG_BOTTOM: _bindgen_ty_13 = 2;
+pub const AMOTION_EVENT_EDGE_FLAG_LEFT: _bindgen_ty_13 = 4;
+pub const AMOTION_EVENT_EDGE_FLAG_RIGHT: _bindgen_ty_13 = 8;
 pub type _bindgen_ty_13 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_AXIS_X: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_AXIS_Y: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_AXIS_PRESSURE: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_AXIS_SIZE: ::std::os::raw::c_uint = 3;
-pub const AMOTION_EVENT_AXIS_TOUCH_MAJOR: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_AXIS_TOUCH_MINOR: ::std::os::raw::c_uint = 5;
-pub const AMOTION_EVENT_AXIS_TOOL_MAJOR: ::std::os::raw::c_uint = 6;
-pub const AMOTION_EVENT_AXIS_TOOL_MINOR: ::std::os::raw::c_uint = 7;
-pub const AMOTION_EVENT_AXIS_ORIENTATION: ::std::os::raw::c_uint = 8;
-pub const AMOTION_EVENT_AXIS_VSCROLL: ::std::os::raw::c_uint = 9;
-pub const AMOTION_EVENT_AXIS_HSCROLL: ::std::os::raw::c_uint = 10;
-pub const AMOTION_EVENT_AXIS_Z: ::std::os::raw::c_uint = 11;
-pub const AMOTION_EVENT_AXIS_RX: ::std::os::raw::c_uint = 12;
-pub const AMOTION_EVENT_AXIS_RY: ::std::os::raw::c_uint = 13;
-pub const AMOTION_EVENT_AXIS_RZ: ::std::os::raw::c_uint = 14;
-pub const AMOTION_EVENT_AXIS_HAT_X: ::std::os::raw::c_uint = 15;
-pub const AMOTION_EVENT_AXIS_HAT_Y: ::std::os::raw::c_uint = 16;
-pub const AMOTION_EVENT_AXIS_LTRIGGER: ::std::os::raw::c_uint = 17;
-pub const AMOTION_EVENT_AXIS_RTRIGGER: ::std::os::raw::c_uint = 18;
-pub const AMOTION_EVENT_AXIS_THROTTLE: ::std::os::raw::c_uint = 19;
-pub const AMOTION_EVENT_AXIS_RUDDER: ::std::os::raw::c_uint = 20;
-pub const AMOTION_EVENT_AXIS_WHEEL: ::std::os::raw::c_uint = 21;
-pub const AMOTION_EVENT_AXIS_GAS: ::std::os::raw::c_uint = 22;
-pub const AMOTION_EVENT_AXIS_BRAKE: ::std::os::raw::c_uint = 23;
-pub const AMOTION_EVENT_AXIS_DISTANCE: ::std::os::raw::c_uint = 24;
-pub const AMOTION_EVENT_AXIS_TILT: ::std::os::raw::c_uint = 25;
-pub const AMOTION_EVENT_AXIS_SCROLL: ::std::os::raw::c_uint = 26;
-pub const AMOTION_EVENT_AXIS_RELATIVE_X: ::std::os::raw::c_uint = 27;
-pub const AMOTION_EVENT_AXIS_RELATIVE_Y: ::std::os::raw::c_uint = 28;
-pub const AMOTION_EVENT_AXIS_GENERIC_1: ::std::os::raw::c_uint = 32;
-pub const AMOTION_EVENT_AXIS_GENERIC_2: ::std::os::raw::c_uint = 33;
-pub const AMOTION_EVENT_AXIS_GENERIC_3: ::std::os::raw::c_uint = 34;
-pub const AMOTION_EVENT_AXIS_GENERIC_4: ::std::os::raw::c_uint = 35;
-pub const AMOTION_EVENT_AXIS_GENERIC_5: ::std::os::raw::c_uint = 36;
-pub const AMOTION_EVENT_AXIS_GENERIC_6: ::std::os::raw::c_uint = 37;
-pub const AMOTION_EVENT_AXIS_GENERIC_7: ::std::os::raw::c_uint = 38;
-pub const AMOTION_EVENT_AXIS_GENERIC_8: ::std::os::raw::c_uint = 39;
-pub const AMOTION_EVENT_AXIS_GENERIC_9: ::std::os::raw::c_uint = 40;
-pub const AMOTION_EVENT_AXIS_GENERIC_10: ::std::os::raw::c_uint = 41;
-pub const AMOTION_EVENT_AXIS_GENERIC_11: ::std::os::raw::c_uint = 42;
-pub const AMOTION_EVENT_AXIS_GENERIC_12: ::std::os::raw::c_uint = 43;
-pub const AMOTION_EVENT_AXIS_GENERIC_13: ::std::os::raw::c_uint = 44;
-pub const AMOTION_EVENT_AXIS_GENERIC_14: ::std::os::raw::c_uint = 45;
-pub const AMOTION_EVENT_AXIS_GENERIC_15: ::std::os::raw::c_uint = 46;
-pub const AMOTION_EVENT_AXIS_GENERIC_16: ::std::os::raw::c_uint = 47;
+pub const AMOTION_EVENT_AXIS_X: _bindgen_ty_14 = 0;
+pub const AMOTION_EVENT_AXIS_Y: _bindgen_ty_14 = 1;
+pub const AMOTION_EVENT_AXIS_PRESSURE: _bindgen_ty_14 = 2;
+pub const AMOTION_EVENT_AXIS_SIZE: _bindgen_ty_14 = 3;
+pub const AMOTION_EVENT_AXIS_TOUCH_MAJOR: _bindgen_ty_14 = 4;
+pub const AMOTION_EVENT_AXIS_TOUCH_MINOR: _bindgen_ty_14 = 5;
+pub const AMOTION_EVENT_AXIS_TOOL_MAJOR: _bindgen_ty_14 = 6;
+pub const AMOTION_EVENT_AXIS_TOOL_MINOR: _bindgen_ty_14 = 7;
+pub const AMOTION_EVENT_AXIS_ORIENTATION: _bindgen_ty_14 = 8;
+pub const AMOTION_EVENT_AXIS_VSCROLL: _bindgen_ty_14 = 9;
+pub const AMOTION_EVENT_AXIS_HSCROLL: _bindgen_ty_14 = 10;
+pub const AMOTION_EVENT_AXIS_Z: _bindgen_ty_14 = 11;
+pub const AMOTION_EVENT_AXIS_RX: _bindgen_ty_14 = 12;
+pub const AMOTION_EVENT_AXIS_RY: _bindgen_ty_14 = 13;
+pub const AMOTION_EVENT_AXIS_RZ: _bindgen_ty_14 = 14;
+pub const AMOTION_EVENT_AXIS_HAT_X: _bindgen_ty_14 = 15;
+pub const AMOTION_EVENT_AXIS_HAT_Y: _bindgen_ty_14 = 16;
+pub const AMOTION_EVENT_AXIS_LTRIGGER: _bindgen_ty_14 = 17;
+pub const AMOTION_EVENT_AXIS_RTRIGGER: _bindgen_ty_14 = 18;
+pub const AMOTION_EVENT_AXIS_THROTTLE: _bindgen_ty_14 = 19;
+pub const AMOTION_EVENT_AXIS_RUDDER: _bindgen_ty_14 = 20;
+pub const AMOTION_EVENT_AXIS_WHEEL: _bindgen_ty_14 = 21;
+pub const AMOTION_EVENT_AXIS_GAS: _bindgen_ty_14 = 22;
+pub const AMOTION_EVENT_AXIS_BRAKE: _bindgen_ty_14 = 23;
+pub const AMOTION_EVENT_AXIS_DISTANCE: _bindgen_ty_14 = 24;
+pub const AMOTION_EVENT_AXIS_TILT: _bindgen_ty_14 = 25;
+pub const AMOTION_EVENT_AXIS_SCROLL: _bindgen_ty_14 = 26;
+pub const AMOTION_EVENT_AXIS_RELATIVE_X: _bindgen_ty_14 = 27;
+pub const AMOTION_EVENT_AXIS_RELATIVE_Y: _bindgen_ty_14 = 28;
+pub const AMOTION_EVENT_AXIS_GENERIC_1: _bindgen_ty_14 = 32;
+pub const AMOTION_EVENT_AXIS_GENERIC_2: _bindgen_ty_14 = 33;
+pub const AMOTION_EVENT_AXIS_GENERIC_3: _bindgen_ty_14 = 34;
+pub const AMOTION_EVENT_AXIS_GENERIC_4: _bindgen_ty_14 = 35;
+pub const AMOTION_EVENT_AXIS_GENERIC_5: _bindgen_ty_14 = 36;
+pub const AMOTION_EVENT_AXIS_GENERIC_6: _bindgen_ty_14 = 37;
+pub const AMOTION_EVENT_AXIS_GENERIC_7: _bindgen_ty_14 = 38;
+pub const AMOTION_EVENT_AXIS_GENERIC_8: _bindgen_ty_14 = 39;
+pub const AMOTION_EVENT_AXIS_GENERIC_9: _bindgen_ty_14 = 40;
+pub const AMOTION_EVENT_AXIS_GENERIC_10: _bindgen_ty_14 = 41;
+pub const AMOTION_EVENT_AXIS_GENERIC_11: _bindgen_ty_14 = 42;
+pub const AMOTION_EVENT_AXIS_GENERIC_12: _bindgen_ty_14 = 43;
+pub const AMOTION_EVENT_AXIS_GENERIC_13: _bindgen_ty_14 = 44;
+pub const AMOTION_EVENT_AXIS_GENERIC_14: _bindgen_ty_14 = 45;
+pub const AMOTION_EVENT_AXIS_GENERIC_15: _bindgen_ty_14 = 46;
+pub const AMOTION_EVENT_AXIS_GENERIC_16: _bindgen_ty_14 = 47;
 pub type _bindgen_ty_14 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_BUTTON_PRIMARY: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_BUTTON_SECONDARY: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_BUTTON_TERTIARY: ::std::os::raw::c_uint = 4;
-pub const AMOTION_EVENT_BUTTON_BACK: ::std::os::raw::c_uint = 8;
-pub const AMOTION_EVENT_BUTTON_FORWARD: ::std::os::raw::c_uint = 16;
-pub const AMOTION_EVENT_BUTTON_STYLUS_PRIMARY: ::std::os::raw::c_uint = 32;
-pub const AMOTION_EVENT_BUTTON_STYLUS_SECONDARY: ::std::os::raw::c_uint = 64;
+pub const AMOTION_EVENT_BUTTON_PRIMARY: _bindgen_ty_15 = 1;
+pub const AMOTION_EVENT_BUTTON_SECONDARY: _bindgen_ty_15 = 2;
+pub const AMOTION_EVENT_BUTTON_TERTIARY: _bindgen_ty_15 = 4;
+pub const AMOTION_EVENT_BUTTON_BACK: _bindgen_ty_15 = 8;
+pub const AMOTION_EVENT_BUTTON_FORWARD: _bindgen_ty_15 = 16;
+pub const AMOTION_EVENT_BUTTON_STYLUS_PRIMARY: _bindgen_ty_15 = 32;
+pub const AMOTION_EVENT_BUTTON_STYLUS_SECONDARY: _bindgen_ty_15 = 64;
 pub type _bindgen_ty_15 = ::std::os::raw::c_uint;
-pub const AMOTION_EVENT_TOOL_TYPE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AMOTION_EVENT_TOOL_TYPE_FINGER: ::std::os::raw::c_uint = 1;
-pub const AMOTION_EVENT_TOOL_TYPE_STYLUS: ::std::os::raw::c_uint = 2;
-pub const AMOTION_EVENT_TOOL_TYPE_MOUSE: ::std::os::raw::c_uint = 3;
-pub const AMOTION_EVENT_TOOL_TYPE_ERASER: ::std::os::raw::c_uint = 4;
+pub const AMOTION_EVENT_TOOL_TYPE_UNKNOWN: _bindgen_ty_16 = 0;
+pub const AMOTION_EVENT_TOOL_TYPE_FINGER: _bindgen_ty_16 = 1;
+pub const AMOTION_EVENT_TOOL_TYPE_STYLUS: _bindgen_ty_16 = 2;
+pub const AMOTION_EVENT_TOOL_TYPE_MOUSE: _bindgen_ty_16 = 3;
+pub const AMOTION_EVENT_TOOL_TYPE_ERASER: _bindgen_ty_16 = 4;
+pub const AMOTION_EVENT_TOOL_TYPE_PALM: _bindgen_ty_16 = 5;
 pub type _bindgen_ty_16 = ::std::os::raw::c_uint;
-pub const AINPUT_SOURCE_CLASS_MASK: ::std::os::raw::c_uint = 255;
-pub const AINPUT_SOURCE_CLASS_NONE: ::std::os::raw::c_uint = 0;
-pub const AINPUT_SOURCE_CLASS_BUTTON: ::std::os::raw::c_uint = 1;
-pub const AINPUT_SOURCE_CLASS_POINTER: ::std::os::raw::c_uint = 2;
-pub const AINPUT_SOURCE_CLASS_NAVIGATION: ::std::os::raw::c_uint = 4;
-pub const AINPUT_SOURCE_CLASS_POSITION: ::std::os::raw::c_uint = 8;
-pub const AINPUT_SOURCE_CLASS_JOYSTICK: ::std::os::raw::c_uint = 16;
+pub const AMotionClassification_AMOTION_EVENT_CLASSIFICATION_NONE: AMotionClassification = 0;
+pub const AMotionClassification_AMOTION_EVENT_CLASSIFICATION_AMBIGUOUS_GESTURE:
+    AMotionClassification = 1;
+pub const AMotionClassification_AMOTION_EVENT_CLASSIFICATION_DEEP_PRESS: AMotionClassification = 2;
+pub type AMotionClassification = u32;
+pub const AINPUT_SOURCE_CLASS_MASK: _bindgen_ty_17 = 255;
+pub const AINPUT_SOURCE_CLASS_NONE: _bindgen_ty_17 = 0;
+pub const AINPUT_SOURCE_CLASS_BUTTON: _bindgen_ty_17 = 1;
+pub const AINPUT_SOURCE_CLASS_POINTER: _bindgen_ty_17 = 2;
+pub const AINPUT_SOURCE_CLASS_NAVIGATION: _bindgen_ty_17 = 4;
+pub const AINPUT_SOURCE_CLASS_POSITION: _bindgen_ty_17 = 8;
+pub const AINPUT_SOURCE_CLASS_JOYSTICK: _bindgen_ty_17 = 16;
 pub type _bindgen_ty_17 = ::std::os::raw::c_uint;
-pub const AINPUT_SOURCE_UNKNOWN: ::std::os::raw::c_uint = 0;
-pub const AINPUT_SOURCE_KEYBOARD: ::std::os::raw::c_uint = 257;
-pub const AINPUT_SOURCE_DPAD: ::std::os::raw::c_uint = 513;
-pub const AINPUT_SOURCE_GAMEPAD: ::std::os::raw::c_uint = 1025;
-pub const AINPUT_SOURCE_TOUCHSCREEN: ::std::os::raw::c_uint = 4098;
-pub const AINPUT_SOURCE_MOUSE: ::std::os::raw::c_uint = 8194;
-pub const AINPUT_SOURCE_STYLUS: ::std::os::raw::c_uint = 16386;
-pub const AINPUT_SOURCE_BLUETOOTH_STYLUS: ::std::os::raw::c_uint = 49154;
-pub const AINPUT_SOURCE_TRACKBALL: ::std::os::raw::c_uint = 65540;
-pub const AINPUT_SOURCE_MOUSE_RELATIVE: ::std::os::raw::c_uint = 131076;
-pub const AINPUT_SOURCE_TOUCHPAD: ::std::os::raw::c_uint = 1048584;
-pub const AINPUT_SOURCE_TOUCH_NAVIGATION: ::std::os::raw::c_uint = 2097152;
-pub const AINPUT_SOURCE_JOYSTICK: ::std::os::raw::c_uint = 16777232;
-pub const AINPUT_SOURCE_ROTARY_ENCODER: ::std::os::raw::c_uint = 4194304;
-pub const AINPUT_SOURCE_ANY: ::std::os::raw::c_uint = 4294967040;
+pub const AINPUT_SOURCE_UNKNOWN: _bindgen_ty_18 = 0;
+pub const AINPUT_SOURCE_KEYBOARD: _bindgen_ty_18 = 257;
+pub const AINPUT_SOURCE_DPAD: _bindgen_ty_18 = 513;
+pub const AINPUT_SOURCE_GAMEPAD: _bindgen_ty_18 = 1025;
+pub const AINPUT_SOURCE_TOUCHSCREEN: _bindgen_ty_18 = 4098;
+pub const AINPUT_SOURCE_MOUSE: _bindgen_ty_18 = 8194;
+pub const AINPUT_SOURCE_STYLUS: _bindgen_ty_18 = 16386;
+pub const AINPUT_SOURCE_BLUETOOTH_STYLUS: _bindgen_ty_18 = 49154;
+pub const AINPUT_SOURCE_TRACKBALL: _bindgen_ty_18 = 65540;
+pub const AINPUT_SOURCE_MOUSE_RELATIVE: _bindgen_ty_18 = 131076;
+pub const AINPUT_SOURCE_TOUCHPAD: _bindgen_ty_18 = 1048584;
+pub const AINPUT_SOURCE_TOUCH_NAVIGATION: _bindgen_ty_18 = 2097152;
+pub const AINPUT_SOURCE_JOYSTICK: _bindgen_ty_18 = 16777232;
+pub const AINPUT_SOURCE_HDMI: _bindgen_ty_18 = 33554433;
+pub const AINPUT_SOURCE_SENSOR: _bindgen_ty_18 = 67108864;
+pub const AINPUT_SOURCE_ROTARY_ENCODER: _bindgen_ty_18 = 4194304;
+pub const AINPUT_SOURCE_ANY: _bindgen_ty_18 = 4294967040;
 pub type _bindgen_ty_18 = ::std::os::raw::c_uint;
-pub const AINPUT_KEYBOARD_TYPE_NONE: ::std::os::raw::c_uint = 0;
-pub const AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC: ::std::os::raw::c_uint = 1;
-pub const AINPUT_KEYBOARD_TYPE_ALPHABETIC: ::std::os::raw::c_uint = 2;
+pub const AINPUT_KEYBOARD_TYPE_NONE: _bindgen_ty_19 = 0;
+pub const AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC: _bindgen_ty_19 = 1;
+pub const AINPUT_KEYBOARD_TYPE_ALPHABETIC: _bindgen_ty_19 = 2;
 pub type _bindgen_ty_19 = ::std::os::raw::c_uint;
-pub const AINPUT_MOTION_RANGE_X: ::std::os::raw::c_uint = 0;
-pub const AINPUT_MOTION_RANGE_Y: ::std::os::raw::c_uint = 1;
-pub const AINPUT_MOTION_RANGE_PRESSURE: ::std::os::raw::c_uint = 2;
-pub const AINPUT_MOTION_RANGE_SIZE: ::std::os::raw::c_uint = 3;
-pub const AINPUT_MOTION_RANGE_TOUCH_MAJOR: ::std::os::raw::c_uint = 4;
-pub const AINPUT_MOTION_RANGE_TOUCH_MINOR: ::std::os::raw::c_uint = 5;
-pub const AINPUT_MOTION_RANGE_TOOL_MAJOR: ::std::os::raw::c_uint = 6;
-pub const AINPUT_MOTION_RANGE_TOOL_MINOR: ::std::os::raw::c_uint = 7;
-pub const AINPUT_MOTION_RANGE_ORIENTATION: ::std::os::raw::c_uint = 8;
+pub const AINPUT_MOTION_RANGE_X: _bindgen_ty_20 = 0;
+pub const AINPUT_MOTION_RANGE_Y: _bindgen_ty_20 = 1;
+pub const AINPUT_MOTION_RANGE_PRESSURE: _bindgen_ty_20 = 2;
+pub const AINPUT_MOTION_RANGE_SIZE: _bindgen_ty_20 = 3;
+pub const AINPUT_MOTION_RANGE_TOUCH_MAJOR: _bindgen_ty_20 = 4;
+pub const AINPUT_MOTION_RANGE_TOUCH_MINOR: _bindgen_ty_20 = 5;
+pub const AINPUT_MOTION_RANGE_TOOL_MAJOR: _bindgen_ty_20 = 6;
+pub const AINPUT_MOTION_RANGE_TOOL_MINOR: _bindgen_ty_20 = 7;
+pub const AINPUT_MOTION_RANGE_ORIENTATION: _bindgen_ty_20 = 8;
 pub type _bindgen_ty_20 = ::std::os::raw::c_uint;
 extern "C" {
     pub fn AInputEvent_getType(event: *const AInputEvent) -> i32;
@@ -1357,6 +1545,9 @@ extern "C" {
 extern "C" {
     pub fn AInputEvent_getSource(event: *const AInputEvent) -> i32;
 }
+extern "C" {
+    pub fn AInputEvent_release(event: *const AInputEvent);
+}
 extern "C" {
     pub fn AKeyEvent_getAction(key_event: *const AInputEvent) -> i32;
 }
@@ -1381,6 +1572,9 @@ extern "C" {
 extern "C" {
     pub fn AKeyEvent_getEventTime(key_event: *const AInputEvent) -> i64;
 }
+extern "C" {
+    pub fn AKeyEvent_fromJava(env: *mut JNIEnv, keyEvent: jobject) -> *const AInputEvent;
+}
 extern "C" {
     pub fn AMotionEvent_getAction(motion_event: *const AInputEvent) -> i32;
 }
@@ -1415,168 +1609,169 @@ extern "C" {
     pub fn AMotionEvent_getYPrecision(motion_event: *const AInputEvent) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getPointerCount(motion_event: *const AInputEvent) -> size_t;
+    pub fn AMotionEvent_getPointerCount(motion_event: *const AInputEvent) -> usize;
 }
 extern "C" {
-    pub fn AMotionEvent_getPointerId(
-        motion_event: *const AInputEvent,
-        pointer_index: size_t,
-    ) -> i32;
+    pub fn AMotionEvent_getPointerId(motion_event: *const AInputEvent, pointer_index: usize)
+        -> i32;
 }
 extern "C" {
-    pub fn AMotionEvent_getToolType(motion_event: *const AInputEvent, pointer_index: size_t)
-        -> i32;
+    pub fn AMotionEvent_getToolType(motion_event: *const AInputEvent, pointer_index: usize) -> i32;
 }
 extern "C" {
-    pub fn AMotionEvent_getRawX(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getRawX(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getRawY(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getRawY(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getX(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getX(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getY(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getY(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getPressure(motion_event: *const AInputEvent, pointer_index: size_t)
-        -> f32;
+    pub fn AMotionEvent_getPressure(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getSize(motion_event: *const AInputEvent, pointer_index: size_t) -> f32;
+    pub fn AMotionEvent_getSize(motion_event: *const AInputEvent, pointer_index: usize) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getTouchMajor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getTouchMinor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getToolMajor(
-        motion_event: *const AInputEvent,
-        pointer_index: size_t,
-    ) -> f32;
+    pub fn AMotionEvent_getToolMajor(motion_event: *const AInputEvent, pointer_index: usize)
+        -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getToolMinor(
-        motion_event: *const AInputEvent,
-        pointer_index: size_t,
-    ) -> f32;
+    pub fn AMotionEvent_getToolMinor(motion_event: *const AInputEvent, pointer_index: usize)
+        -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getOrientation(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getAxisValue(
         motion_event: *const AInputEvent,
         axis: i32,
-        pointer_index: size_t,
+        pointer_index: usize,
     ) -> f32;
 }
 extern "C" {
-    pub fn AMotionEvent_getHistorySize(motion_event: *const AInputEvent) -> size_t;
+    pub fn AMotionEvent_getHistorySize(motion_event: *const AInputEvent) -> usize;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalEventTime(
         motion_event: *const AInputEvent,
-        history_index: size_t,
+        history_index: usize,
     ) -> i64;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalRawX(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalRawY(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalX(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalY(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalPressure(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalSize(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalTouchMajor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalTouchMinor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalToolMajor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalToolMinor(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalOrientation(
         motion_event: *const AInputEvent,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
 extern "C" {
     pub fn AMotionEvent_getHistoricalAxisValue(
         motion_event: *const AInputEvent,
         axis: i32,
-        pointer_index: size_t,
-        history_index: size_t,
+        pointer_index: usize,
+        history_index: usize,
     ) -> f32;
 }
+extern "C" {
+    pub fn AMotionEvent_getActionButton(motion_event: *const AInputEvent) -> i32;
+}
+extern "C" {
+    pub fn AMotionEvent_getClassification(motion_event: *const AInputEvent) -> i32;
+}
+extern "C" {
+    pub fn AMotionEvent_fromJava(env: *mut JNIEnv, motionEvent: jobject) -> *const AInputEvent;
+}
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct AInputQueue {
@@ -1610,6 +1805,9 @@ extern "C" {
         handled: ::std::os::raw::c_int,
     );
 }
+extern "C" {
+    pub fn AInputQueue_fromJava(env: *mut JNIEnv, inputQueue: jobject) -> *mut AInputQueue;
+}
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct imaxdiv_t {
@@ -1618,6 +1816,8 @@ pub struct imaxdiv_t {
 }
 #[test]
 fn bindgen_test_layout_imaxdiv_t() {
+    const UNINIT: ::std::mem::MaybeUninit<imaxdiv_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<imaxdiv_t>(),
         16usize,
@@ -1629,7 +1829,7 @@ fn bindgen_test_layout_imaxdiv_t() {
         concat!("Alignment of ", stringify!(imaxdiv_t))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<imaxdiv_t>())).quot as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).quot) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1639,7 +1839,7 @@ fn bindgen_test_layout_imaxdiv_t() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<imaxdiv_t>())).rem as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rem) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -1684,11 +1884,52 @@ extern "C" {
     ) -> uintmax_t;
 }
 pub const ADataSpace_ADATASPACE_UNKNOWN: ADataSpace = 0;
+pub const ADataSpace_STANDARD_MASK: ADataSpace = 4128768;
+pub const ADataSpace_STANDARD_UNSPECIFIED: ADataSpace = 0;
+pub const ADataSpace_STANDARD_BT709: ADataSpace = 65536;
+pub const ADataSpace_STANDARD_BT601_625: ADataSpace = 131072;
+pub const ADataSpace_STANDARD_BT601_625_UNADJUSTED: ADataSpace = 196608;
+pub const ADataSpace_STANDARD_BT601_525: ADataSpace = 262144;
+pub const ADataSpace_STANDARD_BT601_525_UNADJUSTED: ADataSpace = 327680;
+pub const ADataSpace_STANDARD_BT2020: ADataSpace = 393216;
+pub const ADataSpace_STANDARD_BT2020_CONSTANT_LUMINANCE: ADataSpace = 458752;
+pub const ADataSpace_STANDARD_BT470M: ADataSpace = 524288;
+pub const ADataSpace_STANDARD_FILM: ADataSpace = 589824;
+pub const ADataSpace_STANDARD_DCI_P3: ADataSpace = 655360;
+pub const ADataSpace_STANDARD_ADOBE_RGB: ADataSpace = 720896;
+pub const ADataSpace_TRANSFER_MASK: ADataSpace = 130023424;
+pub const ADataSpace_TRANSFER_UNSPECIFIED: ADataSpace = 0;
+pub const ADataSpace_TRANSFER_LINEAR: ADataSpace = 4194304;
+pub const ADataSpace_TRANSFER_SRGB: ADataSpace = 8388608;
+pub const ADataSpace_TRANSFER_SMPTE_170M: ADataSpace = 12582912;
+pub const ADataSpace_TRANSFER_GAMMA2_2: ADataSpace = 16777216;
+pub const ADataSpace_TRANSFER_GAMMA2_6: ADataSpace = 20971520;
+pub const ADataSpace_TRANSFER_GAMMA2_8: ADataSpace = 25165824;
+pub const ADataSpace_TRANSFER_ST2084: ADataSpace = 29360128;
+pub const ADataSpace_TRANSFER_HLG: ADataSpace = 33554432;
+pub const ADataSpace_RANGE_MASK: ADataSpace = 939524096;
+pub const ADataSpace_RANGE_UNSPECIFIED: ADataSpace = 0;
+pub const ADataSpace_RANGE_FULL: ADataSpace = 134217728;
+pub const ADataSpace_RANGE_LIMITED: ADataSpace = 268435456;
+pub const ADataSpace_RANGE_EXTENDED: ADataSpace = 402653184;
 pub const ADataSpace_ADATASPACE_SCRGB_LINEAR: ADataSpace = 406913024;
 pub const ADataSpace_ADATASPACE_SRGB: ADataSpace = 142671872;
 pub const ADataSpace_ADATASPACE_SCRGB: ADataSpace = 411107328;
 pub const ADataSpace_ADATASPACE_DISPLAY_P3: ADataSpace = 143261696;
 pub const ADataSpace_ADATASPACE_BT2020_PQ: ADataSpace = 163971072;
+pub const ADataSpace_ADATASPACE_BT2020_ITU_PQ: ADataSpace = 298188800;
+pub const ADataSpace_ADATASPACE_ADOBE_RGB: ADataSpace = 151715840;
+pub const ADataSpace_ADATASPACE_JFIF: ADataSpace = 146931712;
+pub const ADataSpace_ADATASPACE_BT601_625: ADataSpace = 281149440;
+pub const ADataSpace_ADATASPACE_BT601_525: ADataSpace = 281280512;
+pub const ADataSpace_ADATASPACE_BT2020: ADataSpace = 147193856;
+pub const ADataSpace_ADATASPACE_BT709: ADataSpace = 281083904;
+pub const ADataSpace_ADATASPACE_DCI_P3: ADataSpace = 155844608;
+pub const ADataSpace_ADATASPACE_SRGB_LINEAR: ADataSpace = 138477568;
+pub const ADataSpace_ADATASPACE_BT2020_HLG: ADataSpace = 168165376;
+pub const ADataSpace_ADATASPACE_BT2020_ITU_HLG: ADataSpace = 302383104;
+pub const ADataSpace_DEPTH: ADataSpace = 4096;
+pub const ADataSpace_DYNAMIC_DEPTH: ADataSpace = 4098;
 pub type ADataSpace = ::std::os::raw::c_uint;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM: AHardwareBuffer_Format = 1;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM: AHardwareBuffer_Format = 2;
@@ -1708,6 +1949,8 @@ pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT: AHard
     52;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer_Format = 53;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = 35;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_YCbCr_P010: AHardwareBuffer_Format = 54;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8_UNORM: AHardwareBuffer_Format = 56;
 pub type AHardwareBuffer_Format = ::std::os::raw::c_uint;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_NEVER:
     AHardwareBuffer_UsageFlags = 0;
@@ -1800,6 +2043,8 @@ pub struct AHardwareBuffer_Desc {
 }
 #[test]
 fn bindgen_test_layout_AHardwareBuffer_Desc() {
+    const UNINIT: ::std::mem::MaybeUninit<AHardwareBuffer_Desc> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Desc>(),
         40usize,
@@ -1811,7 +2056,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         concat!("Alignment of ", stringify!(AHardwareBuffer_Desc))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).width as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).width) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1821,7 +2066,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).height as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).height) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -1831,7 +2076,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).layers as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).layers) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -1841,7 +2086,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).format as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).format) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -1851,7 +2096,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).usage as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).usage) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -1861,7 +2106,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).stride as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).stride) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -1871,7 +2116,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).rfu0 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rfu0) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -1881,7 +2126,7 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Desc>())).rfu1 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rfu1) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -1900,6 +2145,9 @@ pub struct AHardwareBuffer_Plane {
 }
 #[test]
 fn bindgen_test_layout_AHardwareBuffer_Plane() {
+    const UNINIT: ::std::mem::MaybeUninit<AHardwareBuffer_Plane> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Plane>(),
         16usize,
@@ -1911,7 +2159,7 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
         concat!("Alignment of ", stringify!(AHardwareBuffer_Plane))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Plane>())).data as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1921,9 +2169,7 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<AHardwareBuffer_Plane>())).pixelStride as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).pixelStride) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -1933,7 +2179,7 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Plane>())).rowStride as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rowStride) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -1951,6 +2197,9 @@ pub struct AHardwareBuffer_Planes {
 }
 #[test]
 fn bindgen_test_layout_AHardwareBuffer_Planes() {
+    const UNINIT: ::std::mem::MaybeUninit<AHardwareBuffer_Planes> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Planes>(),
         72usize,
@@ -1962,9 +2211,7 @@ fn bindgen_test_layout_AHardwareBuffer_Planes() {
         concat!("Alignment of ", stringify!(AHardwareBuffer_Planes))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<AHardwareBuffer_Planes>())).planeCount as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).planeCount) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1974,7 +2221,7 @@ fn bindgen_test_layout_AHardwareBuffer_Planes() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<AHardwareBuffer_Planes>())).planes as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).planes) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -2016,15 +2263,6 @@ extern "C" {
         outVirtualAddress: *mut *mut ::std::os::raw::c_void,
     ) -> ::std::os::raw::c_int;
 }
-extern "C" {
-    pub fn AHardwareBuffer_lockPlanes(
-        buffer: *mut AHardwareBuffer,
-        usage: u64,
-        fence: i32,
-        rect: *const ARect,
-        outPlanes: *mut AHardwareBuffer_Planes,
-    ) -> ::std::os::raw::c_int;
-}
 extern "C" {
     pub fn AHardwareBuffer_unlock(
         buffer: *mut AHardwareBuffer,
@@ -2043,6 +2281,15 @@ extern "C" {
         outBuffer: *mut *mut AHardwareBuffer,
     ) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn AHardwareBuffer_lockPlanes(
+        buffer: *mut AHardwareBuffer,
+        usage: u64,
+        fence: i32,
+        rect: *const ARect,
+        outPlanes: *mut AHardwareBuffer_Planes,
+    ) -> ::std::os::raw::c_int;
+}
 extern "C" {
     pub fn AHardwareBuffer_isSupported(desc: *const AHardwareBuffer_Desc) -> ::std::os::raw::c_int;
 }
@@ -2057,1183 +2304,892 @@ extern "C" {
         outBytesPerStride: *mut i32,
     ) -> ::std::os::raw::c_int;
 }
-pub type va_list = __builtin_va_list;
-pub type __gnuc_va_list = __builtin_va_list;
+extern "C" {
+    pub fn AHardwareBuffer_getId(
+        buffer: *const AHardwareBuffer,
+        outId: *mut u64,
+    ) -> ::std::os::raw::c_int;
+}
+#[doc = " \\brief Describe information about a pointer, found in a\n GameActivityMotionEvent.\n\n You can read values directly from this structure, or use helper functions\n (`GameActivityPointerAxes_getX`, `GameActivityPointerAxes_getY` and\n `GameActivityPointerAxes_getAxisValue`).\n\n The X axis and Y axis are enabled by default but any other axis that you want\n to read **must** be enabled first, using\n `GameActivityPointerAxes_enableAxis`.\n\n \\see GameActivityMotionEvent"]
 #[repr(C)]
-pub struct JavaVMAttachArgs {
-    pub version: jint,
-    pub name: *const ::std::os::raw::c_char,
-    pub group: jobject,
+#[derive(Debug, Copy, Clone)]
+pub struct GameActivityPointerAxes {
+    pub id: i32,
+    pub toolType: i32,
+    pub axisValues: [f32; 48usize],
+    pub rawX: f32,
+    pub rawY: f32,
 }
 #[test]
-fn bindgen_test_layout_JavaVMAttachArgs() {
+fn bindgen_test_layout_GameActivityPointerAxes() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityPointerAxes> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<JavaVMAttachArgs>(),
-        24usize,
-        concat!("Size of: ", stringify!(JavaVMAttachArgs))
+        ::std::mem::size_of::<GameActivityPointerAxes>(),
+        208usize,
+        concat!("Size of: ", stringify!(GameActivityPointerAxes))
     );
     assert_eq!(
-        ::std::mem::align_of::<JavaVMAttachArgs>(),
-        8usize,
-        concat!("Alignment of ", stringify!(JavaVMAttachArgs))
+        ::std::mem::align_of::<GameActivityPointerAxes>(),
+        4usize,
+        concat!("Alignment of ", stringify!(GameActivityPointerAxes))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMAttachArgs>())).version as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(version)
+            stringify!(id)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMAttachArgs>())).name as *const _ as usize },
-        8usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).toolType) as usize - ptr as usize },
+        4usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(name)
+            stringify!(toolType)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMAttachArgs>())).group as *const _ as usize },
-        16usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).axisValues) as usize - ptr as usize },
+        8usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
+            stringify!(GameActivityPointerAxes),
             "::",
-            stringify!(group)
+            stringify!(axisValues)
         )
     );
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct JavaVMOption {
-    pub optionString: *const ::std::os::raw::c_char,
-    pub extraInfo: *mut ::std::os::raw::c_void,
-}
-#[test]
-fn bindgen_test_layout_JavaVMOption() {
     assert_eq!(
-        ::std::mem::size_of::<JavaVMOption>(),
-        16usize,
-        concat!("Size of: ", stringify!(JavaVMOption))
+        unsafe { ::std::ptr::addr_of!((*ptr).rawX) as usize - ptr as usize },
+        200usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityPointerAxes),
+            "::",
+            stringify!(rawX)
+        )
     );
     assert_eq!(
-        ::std::mem::align_of::<JavaVMOption>(),
+        unsafe { ::std::ptr::addr_of!((*ptr).rawY) as usize - ptr as usize },
+        204usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityPointerAxes),
+            "::",
+            stringify!(rawY)
+        )
+    );
+}
+extern "C" {
+    #[doc = " \\brief Enable the specified axis, so that its value is reported in the\n GameActivityPointerAxes structures stored in a motion event.\n\n You must enable any axis that you want to read, apart from\n `AMOTION_EVENT_AXIS_X` and `AMOTION_EVENT_AXIS_Y` that are enabled by\n default.\n\n If the axis index is out of range, nothing is done."]
+    pub fn GameActivityPointerAxes_enableAxis(axis: i32);
+}
+extern "C" {
+    #[doc = " \\brief Disable the specified axis. Its value won't be reported in the\n GameActivityPointerAxes structures stored in a motion event anymore.\n\n Apart from X and Y, any axis that you want to read **must** be enabled first,\n using `GameActivityPointerAxes_enableAxis`.\n\n If the axis index is out of range, nothing is done."]
+    pub fn GameActivityPointerAxes_disableAxis(axis: i32);
+}
+extern "C" {
+    #[doc = " \\brief Get the value of the requested axis.\n\n Apart from X and Y, any axis that you want to read **must** be enabled first,\n using `GameActivityPointerAxes_enableAxis`.\n\n Find the valid enums for the axis (`AMOTION_EVENT_AXIS_X`,\n `AMOTION_EVENT_AXIS_Y`, `AMOTION_EVENT_AXIS_PRESSURE`...)\n in https://developer.android.com/ndk/reference/group/input.\n\n @param pointerInfo The structure containing information about the pointer,\n obtained from GameActivityMotionEvent.\n @param axis The axis to get the value from\n @return The value of the axis, or 0 if the axis is invalid or was not\n enabled."]
+    pub fn GameActivityPointerAxes_getAxisValue(
+        pointerInfo: *const GameActivityPointerAxes,
+        axis: i32,
+    ) -> f32;
+}
+#[doc = " \\brief Describe a motion event that happened on the GameActivity SurfaceView.\n\n This is 1:1 mapping to the information contained in a Java `MotionEvent`\n (see https://developer.android.com/reference/android/view/MotionEvent)."]
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct GameActivityMotionEvent {
+    pub deviceId: i32,
+    pub source: i32,
+    pub action: i32,
+    pub eventTime: i64,
+    pub downTime: i64,
+    pub flags: i32,
+    pub metaState: i32,
+    pub actionButton: i32,
+    pub buttonState: i32,
+    pub classification: i32,
+    pub edgeFlags: i32,
+    pub pointerCount: u32,
+    pub pointers: [GameActivityPointerAxes; 8usize],
+    pub historySize: ::std::os::raw::c_int,
+    pub historicalEventTimesMillis: *mut i64,
+    pub historicalEventTimesNanos: *mut i64,
+    pub historicalAxisValues: *mut f32,
+    pub precisionX: f32,
+    pub precisionY: f32,
+}
+#[test]
+fn bindgen_test_layout_GameActivityMotionEvent() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityMotionEvent> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<GameActivityMotionEvent>(),
+        1760usize,
+        concat!("Size of: ", stringify!(GameActivityMotionEvent))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<GameActivityMotionEvent>(),
         8usize,
-        concat!("Alignment of ", stringify!(JavaVMOption))
+        concat!("Alignment of ", stringify!(GameActivityMotionEvent))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMOption>())).optionString as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMOption),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(optionString)
+            stringify!(deviceId)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(source)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMOption>())).extraInfo as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMOption),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(extraInfo)
+            stringify!(action)
         )
     );
-}
-#[repr(C)]
-pub struct JavaVMInitArgs {
-    pub version: jint,
-    pub nOptions: jint,
-    pub options: *mut JavaVMOption,
-    pub ignoreUnrecognized: jboolean,
-}
-#[test]
-fn bindgen_test_layout_JavaVMInitArgs() {
     assert_eq!(
-        ::std::mem::size_of::<JavaVMInitArgs>(),
-        24usize,
-        concat!("Size of: ", stringify!(JavaVMInitArgs))
+        unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
+        16usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(eventTime)
+        )
     );
     assert_eq!(
-        ::std::mem::align_of::<JavaVMInitArgs>(),
-        8usize,
-        concat!("Alignment of ", stringify!(JavaVMInitArgs))
+        unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
+        24usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(downTime)
+        )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMInitArgs>())).version as *const _ as usize },
-        0usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
+        32usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMInitArgs),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(version)
+            stringify!(flags)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMInitArgs>())).nOptions as *const _ as usize },
-        4usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
+        36usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMInitArgs),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(nOptions)
+            stringify!(metaState)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<JavaVMInitArgs>())).options as *const _ as usize },
-        8usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).actionButton) as usize - ptr as usize },
+        40usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMInitArgs),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(options)
+            stringify!(actionButton)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<JavaVMInitArgs>())).ignoreUnrecognized as *const _ as usize
-        },
-        16usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).buttonState) as usize - ptr as usize },
+        44usize,
         concat!(
             "Offset of field: ",
-            stringify!(JavaVMInitArgs),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(ignoreUnrecognized)
+            stringify!(buttonState)
         )
     );
-}
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
-    GameCommonInsetsType = 3;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
-#[doc = " The type of a component for which to retrieve insets. See"]
-#[doc = " https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
-pub type GameCommonInsetsType = ::std::os::raw::c_uint;
-#[doc = " This struct holds a span within a region of text from start (inclusive) to"]
-#[doc = " end (exclusive). An empty span or cursor position is specified with"]
-#[doc = " start==end. An undefined span is specified with start = end = SPAN_UNDEFINED."]
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameTextInputSpan {
-    #[doc = " The start of the region (inclusive)."]
-    pub start: i32,
-    #[doc = " The end of the region (exclusive)."]
-    pub end: i32,
-}
-#[test]
-fn bindgen_test_layout_GameTextInputSpan() {
     assert_eq!(
-        ::std::mem::size_of::<GameTextInputSpan>(),
-        8usize,
-        concat!("Size of: ", stringify!(GameTextInputSpan))
+        unsafe { ::std::ptr::addr_of!((*ptr).classification) as usize - ptr as usize },
+        48usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(classification)
+        )
     );
     assert_eq!(
-        ::std::mem::align_of::<GameTextInputSpan>(),
-        4usize,
-        concat!("Alignment of ", stringify!(GameTextInputSpan))
+        unsafe { ::std::ptr::addr_of!((*ptr).edgeFlags) as usize - ptr as usize },
+        52usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(edgeFlags)
+        )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputSpan>())).start as *const _ as usize },
-        0usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pointerCount) as usize - ptr as usize },
+        56usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputSpan),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(start)
+            stringify!(pointerCount)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputSpan>())).end as *const _ as usize },
-        4usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pointers) as usize - ptr as usize },
+        60usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputSpan),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(end)
+            stringify!(pointers)
         )
     );
-}
-pub const GameTextInputSpanFlag_SPAN_UNDEFINED: GameTextInputSpanFlag = -1;
-#[doc = " Values with special meaning in a GameTextInputSpan."]
-pub type GameTextInputSpanFlag = ::std::os::raw::c_int;
-#[doc = " This struct holds the state of an editable section of text."]
-#[doc = " The text can have a selection and a composing region defined on it."]
-#[doc = " A composing region is used by IMEs that allow input using multiple steps to"]
-#[doc = " compose a glyph or word. Use functions GameTextInput_getState and"]
-#[doc = " GameTextInput_setState to read and modify the state that an IME is editing."]
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameTextInputState {
-    #[doc = " Text owned by the state, as a modified UTF-8 string. Null-terminated."]
-    #[doc = " https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8"]
-    pub text_UTF8: *const ::std::os::raw::c_char,
-    #[doc = " Length in bytes of text_UTF8, *not* including the null at end."]
-    pub text_length: i32,
-    #[doc = " A selection defined on the text."]
-    pub selection: GameTextInputSpan,
-    #[doc = " A composing region defined on the text."]
-    pub composingRegion: GameTextInputSpan,
-}
-#[test]
-fn bindgen_test_layout_GameTextInputState() {
     assert_eq!(
-        ::std::mem::size_of::<GameTextInputState>(),
-        32usize,
-        concat!("Size of: ", stringify!(GameTextInputState))
+        unsafe { ::std::ptr::addr_of!((*ptr).historySize) as usize - ptr as usize },
+        1724usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(historySize)
+        )
     );
     assert_eq!(
-        ::std::mem::align_of::<GameTextInputState>(),
-        8usize,
-        concat!("Alignment of ", stringify!(GameTextInputState))
+        unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesMillis) as usize - ptr as usize },
+        1728usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityMotionEvent),
+            "::",
+            stringify!(historicalEventTimesMillis)
+        )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputState>())).text_UTF8 as *const _ as usize },
-        0usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesNanos) as usize - ptr as usize },
+        1736usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputState),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(text_UTF8)
+            stringify!(historicalEventTimesNanos)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputState>())).text_length as *const _ as usize },
-        8usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).historicalAxisValues) as usize - ptr as usize },
+        1744usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputState),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(text_length)
+            stringify!(historicalAxisValues)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameTextInputState>())).selection as *const _ as usize },
-        12usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).precisionX) as usize - ptr as usize },
+        1752usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputState),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(selection)
+            stringify!(precisionX)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameTextInputState>())).composingRegion as *const _ as usize
-        },
-        20usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).precisionY) as usize - ptr as usize },
+        1756usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameTextInputState),
+            stringify!(GameActivityMotionEvent),
             "::",
-            stringify!(composingRegion)
+            stringify!(precisionY)
         )
     );
 }
-#[doc = " A callback called by GameTextInput_getState."]
-#[doc = " @param context User-defined context."]
-#[doc = " @param state State, owned by the library, that will be valid for the duration"]
-#[doc = " of the callback."]
-pub type GameTextInputGetStateCallback = ::std::option::Option<
-    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, state: *const GameTextInputState),
->;
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameTextInput {
-    _unused: [u8; 0],
-}
-extern "C" {
-    #[doc = " Initialize the GameTextInput library."]
-    #[doc = " If called twice without GameTextInput_destroy being called, the same pointer"]
-    #[doc = " will be returned and a warning will be issued."]
-    #[doc = " @param env A JNI env valid on the calling thread."]
-    #[doc = " @param max_string_size The maximum length of a string that can be edited. If"]
-    #[doc = " zero, the maximum defaults to 65536 bytes. A buffer of this size is allocated"]
-    #[doc = " at initialization."]
-    #[doc = " @return A handle to the library."]
-    pub fn GameTextInput_init(env: *mut JNIEnv, max_string_size: u32) -> *mut GameTextInput;
-}
 extern "C" {
-    #[doc = " When using GameTextInput, you need to create a gametextinput.InputConnection"]
-    #[doc = " on the Java side and pass it using this function to the library, unless using"]
-    #[doc = " GameActivity in which case this will be done for you. See the GameActivity"]
-    #[doc = " source code or GameTextInput samples for examples of usage."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param inputConnection A gametextinput.InputConnection object."]
-    pub fn GameTextInput_setInputConnection(input: *mut GameTextInput, inputConnection: jobject);
+    pub fn GameActivityMotionEvent_getHistoricalAxisValue(
+        event: *const GameActivityMotionEvent,
+        axis: ::std::os::raw::c_int,
+        pointerIndex: ::std::os::raw::c_int,
+        historyPos: ::std::os::raw::c_int,
+    ) -> f32;
 }
 extern "C" {
-    #[doc = " Unless using GameActivity, it is required to call this function from your"]
-    #[doc = " Java gametextinput.Listener.stateChanged method to convert eventState and"]
-    #[doc = " trigger any event callbacks. When using GameActivity, this does not need to"]
-    #[doc = " be called as event processing is handled by the Activity."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param eventState A Java gametextinput.State object."]
-    pub fn GameTextInput_processEvent(input: *mut GameTextInput, eventState: jobject);
+    #[doc = " \\brief Handle the freeing of the GameActivityMotionEvent struct."]
+    pub fn GameActivityMotionEvent_destroy(c_event: *mut GameActivityMotionEvent);
 }
 extern "C" {
-    #[doc = " Free any resources owned by the GameTextInput library."]
-    #[doc = " Any subsequent calls to the library will fail until GameTextInput_init is"]
-    #[doc = " called again."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    pub fn GameTextInput_destroy(input: *mut GameTextInput);
+    #[doc = " \\brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`.\n\n This is done automatically by the GameActivity: see `onTouchEvent` to set\n a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
+    pub fn GameActivityMotionEvent_fromJava(
+        env: *mut JNIEnv,
+        motionEvent: jobject,
+        out_event: *mut GameActivityMotionEvent,
+    );
 }
-pub const ShowImeFlags_SHOW_IME_UNDEFINED: ShowImeFlags = 0;
-pub const ShowImeFlags_SHOW_IMPLICIT: ShowImeFlags = 1;
-pub const ShowImeFlags_SHOW_FORCED: ShowImeFlags = 2;
-#[doc = " Flags to be passed to GameTextInput_showIme."]
-pub type ShowImeFlags = ::std::os::raw::c_uint;
-extern "C" {
-    #[doc = " Show the IME. Calls InputMethodManager.showSoftInput()."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param flags Defined in ShowImeFlags above. For more information see:"]
-    #[doc = " https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
-    pub fn GameTextInput_showIme(input: *mut GameTextInput, flags: u32);
-}
-pub const HideImeFlags_HIDE_IME_UNDEFINED: HideImeFlags = 0;
-pub const HideImeFlags_HIDE_IMPLICIT_ONLY: HideImeFlags = 1;
-pub const HideImeFlags_HIDE_NOT_ALWAYS: HideImeFlags = 2;
-#[doc = " Flags to be passed to GameTextInput_hideIme."]
-pub type HideImeFlags = ::std::os::raw::c_uint;
-extern "C" {
-    #[doc = " Show the IME. Calls InputMethodManager.hideSoftInputFromWindow()."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param flags Defined in HideImeFlags above. For more information see:"]
-    #[doc = " https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
-    pub fn GameTextInput_hideIme(input: *mut GameTextInput, flags: u32);
-}
-extern "C" {
-    #[doc = " Call a callback with the current GameTextInput state, which may have been"]
-    #[doc = " modified by changes in the IME and calls to GameTextInput_setState. We use a"]
-    #[doc = " callback rather than returning the state in order to simplify ownership of"]
-    #[doc = " text_UTF8 strings. These strings are only valid during the calling of the"]
-    #[doc = " callback."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param callback A function that will be called with valid state."]
-    #[doc = " @param context Context used by the callback."]
-    pub fn GameTextInput_getState(
-        input: *mut GameTextInput,
-        callback: GameTextInputGetStateCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
-}
-extern "C" {
-    #[doc = " Set the current GameTextInput state. This state is reflected to any active"]
-    #[doc = " IME."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param state The state to set. Ownership is maintained by the caller and must"]
-    #[doc = " remain valid for the duration of the call."]
-    pub fn GameTextInput_setState(input: *mut GameTextInput, state: *const GameTextInputState);
-}
-#[doc = " Type of the callback needed by GameTextInput_setEventCallback that will be"]
-#[doc = " called every time the IME state changes."]
-#[doc = " @param context User-defined context set in GameTextInput_setEventCallback."]
-#[doc = " @param current_state Current IME state, owned by the library and valid during"]
-#[doc = " the callback."]
-pub type GameTextInputEventCallback = ::std::option::Option<
-    unsafe extern "C" fn(
-        context: *mut ::std::os::raw::c_void,
-        current_state: *const GameTextInputState,
-    ),
->;
-extern "C" {
-    #[doc = " Optionally set a callback to be called whenever the IME state changes."]
-    #[doc = " Not necessary if you are using GameActivity, which handles these callbacks"]
-    #[doc = " for you."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param callback Called by the library when the IME state changes."]
-    #[doc = " @param context Context passed as first argument to the callback."]
-    pub fn GameTextInput_setEventCallback(
-        input: *mut GameTextInput,
-        callback: GameTextInputEventCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
-}
-#[doc = " Type of the callback needed by GameTextInput_setImeInsetsCallback that will"]
-#[doc = " be called every time the IME window insets change."]
-#[doc = " @param context User-defined context set in"]
-#[doc = " GameTextInput_setImeWIndowInsetsCallback."]
-#[doc = " @param current_insets Current IME insets, owned by the library and valid"]
-#[doc = " during the callback."]
-pub type GameTextInputImeInsetsCallback = ::std::option::Option<
-    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, current_insets: *const ARect),
->;
-extern "C" {
-    #[doc = " Optionally set a callback to be called whenever the IME insets change."]
-    #[doc = " Not necessary if you are using GameActivity, which handles these callbacks"]
-    #[doc = " for you."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param callback Called by the library when the IME insets change."]
-    #[doc = " @param context Context passed as first argument to the callback."]
-    pub fn GameTextInput_setImeInsetsCallback(
-        input: *mut GameTextInput,
-        callback: GameTextInputImeInsetsCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
-}
-extern "C" {
-    #[doc = " Get the current window insets for the IME."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param insets Filled with the current insets by this function."]
-    pub fn GameTextInput_getImeInsets(input: *const GameTextInput, insets: *mut ARect);
-}
-extern "C" {
-    #[doc = " Unless using GameActivity, it is required to call this function from your"]
-    #[doc = " Java gametextinput.Listener.onImeInsetsChanged method to"]
-    #[doc = " trigger any event callbacks. When using GameActivity, this does not need to"]
-    #[doc = " be called as insets processing is handled by the Activity."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param eventState A Java gametextinput.State object."]
-    pub fn GameTextInput_processImeInsets(input: *mut GameTextInput, insets: *const ARect);
-}
-extern "C" {
-    #[doc = " Convert a GameTextInputState struct to a Java gametextinput.State object."]
-    #[doc = " Don't forget to delete the returned Java local ref when you're done."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param state Input state to convert."]
-    #[doc = " @return A Java object of class gametextinput.State. The caller is required to"]
-    #[doc = " delete this local reference."]
-    pub fn GameTextInputState_toJava(
-        input: *const GameTextInput,
-        state: *const GameTextInputState,
-    ) -> jobject;
-}
-extern "C" {
-    #[doc = " Convert from a Java gametextinput.State object into a C GameTextInputState"]
-    #[doc = " struct."]
-    #[doc = " @param input A valid GameTextInput library handle."]
-    #[doc = " @param state A Java gametextinput.State object."]
-    #[doc = " @param callback A function called with the C struct, valid for the duration"]
-    #[doc = " of the call."]
-    #[doc = " @param context Context passed to the callback."]
-    pub fn GameTextInputState_fromJava(
-        input: *const GameTextInput,
-        state: jobject,
-        callback: GameTextInputGetStateCallback,
-        context: *mut ::std::os::raw::c_void,
-    );
-}
-#[doc = " This structure defines the native side of an android.app.GameActivity."]
-#[doc = " It is created by the framework, and handed to the application's native"]
-#[doc = " code as it is being launched."]
+#[doc = " \\brief Describe a key event that happened on the GameActivity SurfaceView.\n\n This is 1:1 mapping to the information contained in a Java `KeyEvent`\n (see https://developer.android.com/reference/android/view/KeyEvent).\n The only exception is the event times, which are reported as\n nanoseconds in this struct."]
 #[repr(C)]
-pub struct GameActivity {
-    #[doc = " Pointer to the callback function table of the native application."]
-    #[doc = " You can set the functions here to your own callbacks.  The callbacks"]
-    #[doc = " pointer itself here should not be changed; it is allocated and managed"]
-    #[doc = " for you by the framework."]
-    pub callbacks: *mut GameActivityCallbacks,
-    #[doc = " The global handle on the process's Java VM."]
-    pub vm: *mut JavaVM,
-    #[doc = " JNI context for the main thread of the app.  Note that this field"]
-    #[doc = " can ONLY be used from the main thread of the process; that is, the"]
-    #[doc = " thread that calls into the GameActivityCallbacks."]
-    pub env: *mut JNIEnv,
-    #[doc = " The GameActivity object handle."]
-    pub javaGameActivity: jobject,
-    #[doc = " Path to this application's internal data directory."]
-    pub internalDataPath: *const ::std::os::raw::c_char,
-    #[doc = " Path to this application's external (removable/mountable) data directory."]
-    pub externalDataPath: *const ::std::os::raw::c_char,
-    #[doc = " The platform's SDK version code."]
-    pub sdkVersion: i32,
-    #[doc = " This is the native instance of the application.  It is not used by"]
-    #[doc = " the framework, but can be set by the application to its own instance"]
-    #[doc = " state."]
-    pub instance: *mut ::std::os::raw::c_void,
-    #[doc = " Pointer to the Asset Manager instance for the application.  The"]
-    #[doc = " application uses this to access binary assets bundled inside its own .apk"]
-    #[doc = " file."]
-    pub assetManager: *mut AAssetManager,
-    #[doc = " Available starting with Honeycomb: path to the directory containing"]
-    #[doc = " the application's OBB files (if any).  If the app doesn't have any"]
-    #[doc = " OBB files, this directory may not exist."]
-    pub obbPath: *const ::std::os::raw::c_char,
+#[derive(Debug, Copy, Clone)]
+pub struct GameActivityKeyEvent {
+    pub deviceId: i32,
+    pub source: i32,
+    pub action: i32,
+    pub eventTime: i64,
+    pub downTime: i64,
+    pub flags: i32,
+    pub metaState: i32,
+    pub modifiers: i32,
+    pub repeatCount: i32,
+    pub keyCode: i32,
+    pub scanCode: i32,
+    pub unicodeChar: i32,
 }
 #[test]
-fn bindgen_test_layout_GameActivity() {
+fn bindgen_test_layout_GameActivityKeyEvent() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityKeyEvent> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<GameActivity>(),
-        80usize,
-        concat!("Size of: ", stringify!(GameActivity))
+        ::std::mem::size_of::<GameActivityKeyEvent>(),
+        64usize,
+        concat!("Size of: ", stringify!(GameActivityKeyEvent))
     );
     assert_eq!(
-        ::std::mem::align_of::<GameActivity>(),
+        ::std::mem::align_of::<GameActivityKeyEvent>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameActivity))
+        concat!("Alignment of ", stringify!(GameActivityKeyEvent))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).callbacks as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(callbacks)
+            stringify!(deviceId)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityKeyEvent),
+            "::",
+            stringify!(source)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).vm as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(vm)
+            stringify!(action)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).env as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(env)
+            stringify!(eventTime)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).javaGameActivity as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(javaGameActivity)
+            stringify!(downTime)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).internalDataPath as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(internalDataPath)
+            stringify!(flags)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
+        36usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityKeyEvent),
+            "::",
+            stringify!(metaState)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).externalDataPath as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).modifiers) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(externalDataPath)
+            stringify!(modifiers)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).sdkVersion as *const _ as usize },
-        48usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).repeatCount) as usize - ptr as usize },
+        44usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(sdkVersion)
+            stringify!(repeatCount)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).instance as *const _ as usize },
-        56usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyCode) as usize - ptr as usize },
+        48usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(instance)
+            stringify!(keyCode)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).assetManager as *const _ as usize },
-        64usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).scanCode) as usize - ptr as usize },
+        52usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(assetManager)
+            stringify!(scanCode)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivity>())).obbPath as *const _ as usize },
-        72usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).unicodeChar) as usize - ptr as usize },
+        56usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivity),
+            stringify!(GameActivityKeyEvent),
             "::",
-            stringify!(obbPath)
+            stringify!(unicodeChar)
         )
     );
 }
-#[doc = " \\brief Describe information about a pointer, found in a"]
-#[doc = " GameActivityMotionEvent."]
-#[doc = ""]
-#[doc = " You can read values directly from this structure, or use helper functions"]
-#[doc = " (`GameActivityPointerAxes_getX`, `GameActivityPointerAxes_getY` and"]
-#[doc = " `GameActivityPointerAxes_getAxisValue`)."]
-#[doc = ""]
-#[doc = " The X axis and Y axis are enabled by default but any other axis that you want"]
-#[doc = " to read **must** be enabled first, using"]
-#[doc = " `GameActivityPointerAxes_enableAxis`."]
-#[doc = ""]
-#[doc = " \\see GameActivityMotionEvent"]
+extern "C" {
+    #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.\n\n This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`\n to set a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
+    pub fn GameActivityKeyEvent_fromJava(
+        env: *mut JNIEnv,
+        motionEvent: jobject,
+        out_event: *mut GameActivityKeyEvent,
+    );
+}
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
+    GameCommonInsetsType = 3;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
+#[doc = " The type of a component for which to retrieve insets. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
+pub type GameCommonInsetsType = ::std::os::raw::c_uint;
+#[doc = " This struct holds a span within a region of text from start (inclusive) to\n end (exclusive). An empty span or cursor position is specified with\n start==end. An undefined span is specified with start = end = SPAN_UNDEFINED."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct GameActivityPointerAxes {
-    pub id: i32,
-    pub toolType: i32,
-    pub axisValues: [f32; 48usize],
-    pub rawX: f32,
-    pub rawY: f32,
+pub struct GameTextInputSpan {
+    #[doc = " The start of the region (inclusive)."]
+    pub start: i32,
+    #[doc = " The end of the region (exclusive)."]
+    pub end: i32,
 }
 #[test]
-fn bindgen_test_layout_GameActivityPointerAxes() {
+fn bindgen_test_layout_GameTextInputSpan() {
+    const UNINIT: ::std::mem::MaybeUninit<GameTextInputSpan> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<GameActivityPointerAxes>(),
-        208usize,
-        concat!("Size of: ", stringify!(GameActivityPointerAxes))
+        ::std::mem::size_of::<GameTextInputSpan>(),
+        8usize,
+        concat!("Size of: ", stringify!(GameTextInputSpan))
     );
     assert_eq!(
-        ::std::mem::align_of::<GameActivityPointerAxes>(),
+        ::std::mem::align_of::<GameTextInputSpan>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameActivityPointerAxes))
+        concat!("Alignment of ", stringify!(GameTextInputSpan))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityPointerAxes>())).id as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).start) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameTextInputSpan),
             "::",
-            stringify!(id)
+            stringify!(start)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityPointerAxes>())).toolType as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).end) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameTextInputSpan),
             "::",
-            stringify!(toolType)
+            stringify!(end)
         )
     );
+}
+pub const GameTextInputSpanFlag_SPAN_UNDEFINED: GameTextInputSpanFlag = -1;
+#[doc = " Values with special meaning in a GameTextInputSpan."]
+pub type GameTextInputSpanFlag = ::std::os::raw::c_int;
+#[doc = " This struct holds the state of an editable section of text.\n The text can have a selection and a composing region defined on it.\n A composing region is used by IMEs that allow input using multiple steps to\n compose a glyph or word. Use functions GameTextInput_getState and\n GameTextInput_setState to read and modify the state that an IME is editing."]
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct GameTextInputState {
+    #[doc = " Text owned by the state, as a modified UTF-8 string. Null-terminated.\n https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8"]
+    pub text_UTF8: *const ::std::os::raw::c_char,
+    #[doc = " Length in bytes of text_UTF8, *not* including the null at end."]
+    pub text_length: i32,
+    #[doc = " A selection defined on the text."]
+    pub selection: GameTextInputSpan,
+    #[doc = " A composing region defined on the text."]
+    pub composingRegion: GameTextInputSpan,
+}
+#[test]
+fn bindgen_test_layout_GameTextInputState() {
+    const UNINIT: ::std::mem::MaybeUninit<GameTextInputState> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<GameTextInputState>(),
+        32usize,
+        concat!("Size of: ", stringify!(GameTextInputState))
+    );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityPointerAxes>())).axisValues as *const _ as usize
-        },
+        ::std::mem::align_of::<GameTextInputState>(),
         8usize,
+        concat!("Alignment of ", stringify!(GameTextInputState))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).text_UTF8) as usize - ptr as usize },
+        0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(axisValues)
+            stringify!(text_UTF8)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityPointerAxes>())).rawX as *const _ as usize },
-        200usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).text_length) as usize - ptr as usize },
+        8usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(rawX)
+            stringify!(text_length)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityPointerAxes>())).rawY as *const _ as usize },
-        204usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(rawY)
-        )
-    );
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameActivityHistoricalPointerAxes {
-    pub eventTime: i64,
-    pub axisValues: [f32; 48usize],
-}
-#[test]
-fn bindgen_test_layout_GameActivityHistoricalPointerAxes() {
-    assert_eq!(
-        ::std::mem::size_of::<GameActivityHistoricalPointerAxes>(),
-        200usize,
-        concat!("Size of: ", stringify!(GameActivityHistoricalPointerAxes))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<GameActivityHistoricalPointerAxes>(),
-        8usize,
-        concat!(
-            "Alignment of ",
-            stringify!(GameActivityHistoricalPointerAxes)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityHistoricalPointerAxes>())).eventTime as *const _
-                as usize
-        },
-        0usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).selection) as usize - ptr as usize },
+        12usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityHistoricalPointerAxes),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(eventTime)
+            stringify!(selection)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityHistoricalPointerAxes>())).axisValues as *const _
-                as usize
-        },
-        8usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).composingRegion) as usize - ptr as usize },
+        20usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityHistoricalPointerAxes),
+            stringify!(GameTextInputState),
             "::",
-            stringify!(axisValues)
+            stringify!(composingRegion)
         )
     );
 }
+#[doc = " A callback called by GameTextInput_getState.\n @param context User-defined context.\n @param state State, owned by the library, that will be valid for the duration\n of the callback."]
+pub type GameTextInputGetStateCallback = ::std::option::Option<
+    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, state: *const GameTextInputState),
+>;
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct GameTextInput {
+    _unused: [u8; 0],
+}
 extern "C" {
-    #[doc = " \\brief Enable the specified axis, so that its value is reported in the"]
-    #[doc = " GameActivityPointerAxes structures stored in a motion event."]
-    #[doc = ""]
-    #[doc = " You must enable any axis that you want to read, apart from"]
-    #[doc = " `AMOTION_EVENT_AXIS_X` and `AMOTION_EVENT_AXIS_Y` that are enabled by"]
-    #[doc = " default."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityPointerAxes_enableAxis(axis: i32);
+    #[doc = " Initialize the GameTextInput library.\n If called twice without GameTextInput_destroy being called, the same pointer\n will be returned and a warning will be issued.\n @param env A JNI env valid on the calling thread.\n @param max_string_size The maximum length of a string that can be edited. If\n zero, the maximum defaults to 65536 bytes. A buffer of this size is allocated\n at initialization.\n @return A handle to the library."]
+    pub fn GameTextInput_init(env: *mut JNIEnv, max_string_size: u32) -> *mut GameTextInput;
 }
 extern "C" {
-    #[doc = " \\brief Disable the specified axis. Its value won't be reported in the"]
-    #[doc = " GameActivityPointerAxes structures stored in a motion event anymore."]
-    #[doc = ""]
-    #[doc = " Apart from X and Y, any axis that you want to read **must** be enabled first,"]
-    #[doc = " using `GameActivityPointerAxes_enableAxis`."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityPointerAxes_disableAxis(axis: i32);
+    #[doc = " When using GameTextInput, you need to create a gametextinput.InputConnection\n on the Java side and pass it using this function to the library, unless using\n GameActivity in which case this will be done for you. See the GameActivity\n source code or GameTextInput samples for examples of usage.\n @param input A valid GameTextInput library handle.\n @param inputConnection A gametextinput.InputConnection object."]
+    pub fn GameTextInput_setInputConnection(input: *mut GameTextInput, inputConnection: jobject);
 }
 extern "C" {
-    #[doc = " \\brief Enable the specified axis, so that its value is reported in the"]
-    #[doc = " GameActivityHistoricalPointerAxes structures associated with a motion event."]
-    #[doc = ""]
-    #[doc = " You must enable any axis that you want to read (no axes are enabled by"]
-    #[doc = " default)."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityHistoricalPointerAxes_enableAxis(axis: i32);
+    #[doc = " Unless using GameActivity, it is required to call this function from your\n Java gametextinput.Listener.stateChanged method to convert eventState and\n trigger any event callbacks. When using GameActivity, this does not need to\n be called as event processing is handled by the Activity.\n @param input A valid GameTextInput library handle.\n @param eventState A Java gametextinput.State object."]
+    pub fn GameTextInput_processEvent(input: *mut GameTextInput, eventState: jobject);
 }
 extern "C" {
-    #[doc = " \\brief Disable the specified axis. Its value won't be reported in the"]
-    #[doc = " GameActivityHistoricalPointerAxes structures associated with motion events"]
-    #[doc = " anymore."]
-    #[doc = ""]
-    #[doc = " If the axis index is out of range, nothing is done."]
-    pub fn GameActivityHistoricalPointerAxes_disableAxis(axis: i32);
+    #[doc = " Free any resources owned by the GameTextInput library.\n Any subsequent calls to the library will fail until GameTextInput_init is\n called again.\n @param input A valid GameTextInput library handle."]
+    pub fn GameTextInput_destroy(input: *mut GameTextInput);
 }
-#[doc = " \\brief Describe a motion event that happened on the GameActivity SurfaceView."]
-#[doc = ""]
-#[doc = " This is 1:1 mapping to the information contained in a Java `MotionEvent`"]
-#[doc = " (see https://developer.android.com/reference/android/view/MotionEvent)."]
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameActivityMotionEvent {
-    pub deviceId: i32,
-    pub source: i32,
-    pub action: i32,
-    pub eventTime: i64,
-    pub downTime: i64,
-    pub flags: i32,
-    pub metaState: i32,
-    pub actionButton: i32,
-    pub buttonState: i32,
-    pub classification: i32,
-    pub edgeFlags: i32,
-    pub pointerCount: u32,
-    pub pointers: [GameActivityPointerAxes; 8usize],
-    pub precisionX: f32,
-    pub precisionY: f32,
-    pub historicalStart: i16,
-    pub historicalCount: i16,
+pub const ShowImeFlags_SHOW_IME_UNDEFINED: ShowImeFlags = 0;
+pub const ShowImeFlags_SHOW_IMPLICIT: ShowImeFlags = 1;
+pub const ShowImeFlags_SHOW_FORCED: ShowImeFlags = 2;
+#[doc = " Flags to be passed to GameTextInput_showIme."]
+pub type ShowImeFlags = ::std::os::raw::c_uint;
+extern "C" {
+    #[doc = " Show the IME. Calls InputMethodManager.showSoftInput().\n @param input A valid GameTextInput library handle.\n @param flags Defined in ShowImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
+    pub fn GameTextInput_showIme(input: *mut GameTextInput, flags: u32);
 }
-#[test]
-fn bindgen_test_layout_GameActivityMotionEvent() {
-    assert_eq!(
-        ::std::mem::size_of::<GameActivityMotionEvent>(),
-        1736usize,
-        concat!("Size of: ", stringify!(GameActivityMotionEvent))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<GameActivityMotionEvent>(),
-        8usize,
-        concat!("Alignment of ", stringify!(GameActivityMotionEvent))
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).deviceId as *const _ as usize
-        },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(deviceId)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityMotionEvent>())).source as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(source)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityMotionEvent>())).action as *const _ as usize },
-        8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(action)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).eventTime as *const _ as usize
-        },
-        16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(eventTime)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).downTime as *const _ as usize
-        },
-        24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(downTime)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityMotionEvent>())).flags as *const _ as usize },
-        32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(flags)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).metaState as *const _ as usize
-        },
-        36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(metaState)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).actionButton as *const _ as usize
-        },
-        40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(actionButton)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).buttonState as *const _ as usize
-        },
-        44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(buttonState)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).classification as *const _ as usize
-        },
-        48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(classification)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).edgeFlags as *const _ as usize
-        },
-        52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(edgeFlags)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).pointerCount as *const _ as usize
-        },
-        56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(pointerCount)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).pointers as *const _ as usize
-        },
-        60usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(pointers)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).precisionX as *const _ as usize
-        },
-        1724usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(precisionX)
-        )
+pub const HideImeFlags_HIDE_IME_UNDEFINED: HideImeFlags = 0;
+pub const HideImeFlags_HIDE_IMPLICIT_ONLY: HideImeFlags = 1;
+pub const HideImeFlags_HIDE_NOT_ALWAYS: HideImeFlags = 2;
+#[doc = " Flags to be passed to GameTextInput_hideIme."]
+pub type HideImeFlags = ::std::os::raw::c_uint;
+extern "C" {
+    #[doc = " Show the IME. Calls InputMethodManager.hideSoftInputFromWindow().\n @param input A valid GameTextInput library handle.\n @param flags Defined in HideImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
+    pub fn GameTextInput_hideIme(input: *mut GameTextInput, flags: u32);
+}
+extern "C" {
+    #[doc = " Restarts the input method. Calls InputMethodManager.restartInput().\n @param input A valid GameTextInput library handle."]
+    pub fn GameTextInput_restartInput(input: *mut GameTextInput);
+}
+extern "C" {
+    #[doc = " Call a callback with the current GameTextInput state, which may have been\n modified by changes in the IME and calls to GameTextInput_setState. We use a\n callback rather than returning the state in order to simplify ownership of\n text_UTF8 strings. These strings are only valid during the calling of the\n callback.\n @param input A valid GameTextInput library handle.\n @param callback A function that will be called with valid state.\n @param context Context used by the callback."]
+    pub fn GameTextInput_getState(
+        input: *mut GameTextInput,
+        callback: GameTextInputGetStateCallback,
+        context: *mut ::std::os::raw::c_void,
     );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).precisionY as *const _ as usize
-        },
-        1728usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(precisionY)
-        )
+}
+extern "C" {
+    #[doc = " Set the current GameTextInput state. This state is reflected to any active\n IME.\n @param input A valid GameTextInput library handle.\n @param state The state to set. Ownership is maintained by the caller and must\n remain valid for the duration of the call."]
+    pub fn GameTextInput_setState(input: *mut GameTextInput, state: *const GameTextInputState);
+}
+#[doc = " Type of the callback needed by GameTextInput_setEventCallback that will be\n called every time the IME state changes.\n @param context User-defined context set in GameTextInput_setEventCallback.\n @param current_state Current IME state, owned by the library and valid during\n the callback."]
+pub type GameTextInputEventCallback = ::std::option::Option<
+    unsafe extern "C" fn(
+        context: *mut ::std::os::raw::c_void,
+        current_state: *const GameTextInputState,
+    ),
+>;
+extern "C" {
+    #[doc = " Optionally set a callback to be called whenever the IME state changes.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME state changes.\n @param context Context passed as first argument to the callback."]
+    pub fn GameTextInput_setEventCallback(
+        input: *mut GameTextInput,
+        callback: GameTextInputEventCallback,
+        context: *mut ::std::os::raw::c_void,
     );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).historicalStart as *const _ as usize
-        },
-        1732usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalStart)
-        )
+}
+#[doc = " Type of the callback needed by GameTextInput_setImeInsetsCallback that will\n be called every time the IME window insets change.\n @param context User-defined context set in\n GameTextInput_setImeWIndowInsetsCallback.\n @param current_insets Current IME insets, owned by the library and valid\n during the callback."]
+pub type GameTextInputImeInsetsCallback = ::std::option::Option<
+    unsafe extern "C" fn(context: *mut ::std::os::raw::c_void, current_insets: *const ARect),
+>;
+extern "C" {
+    #[doc = " Optionally set a callback to be called whenever the IME insets change.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME insets change.\n @param context Context passed as first argument to the callback."]
+    pub fn GameTextInput_setImeInsetsCallback(
+        input: *mut GameTextInput,
+        callback: GameTextInputImeInsetsCallback,
+        context: *mut ::std::os::raw::c_void,
     );
-    assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityMotionEvent>())).historicalCount as *const _ as usize
-        },
-        1734usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalCount)
-        )
+}
+extern "C" {
+    #[doc = " Get the current window insets for the IME.\n @param input A valid GameTextInput library handle.\n @param insets Filled with the current insets by this function."]
+    pub fn GameTextInput_getImeInsets(input: *const GameTextInput, insets: *mut ARect);
+}
+extern "C" {
+    #[doc = " Unless using GameActivity, it is required to call this function from your\n Java gametextinput.Listener.onImeInsetsChanged method to\n trigger any event callbacks. When using GameActivity, this does not need to\n be called as insets processing is handled by the Activity.\n @param input A valid GameTextInput library handle.\n @param eventState A Java gametextinput.State object."]
+    pub fn GameTextInput_processImeInsets(input: *mut GameTextInput, insets: *const ARect);
+}
+extern "C" {
+    #[doc = " Convert a GameTextInputState struct to a Java gametextinput.State object.\n Don't forget to delete the returned Java local ref when you're done.\n @param input A valid GameTextInput library handle.\n @param state Input state to convert.\n @return A Java object of class gametextinput.State. The caller is required to\n delete this local reference."]
+    pub fn GameTextInputState_toJava(
+        input: *const GameTextInput,
+        state: *const GameTextInputState,
+    ) -> jobject;
+}
+extern "C" {
+    #[doc = " Convert from a Java gametextinput.State object into a C GameTextInputState\n struct.\n @param input A valid GameTextInput library handle.\n @param state A Java gametextinput.State object.\n @param callback A function called with the C struct, valid for the duration\n of the call.\n @param context Context passed to the callback."]
+    pub fn GameTextInputState_fromJava(
+        input: *const GameTextInput,
+        state: jobject,
+        callback: GameTextInputGetStateCallback,
+        context: *mut ::std::os::raw::c_void,
     );
 }
-#[doc = " \\brief Describe a key event that happened on the GameActivity SurfaceView."]
-#[doc = ""]
-#[doc = " This is 1:1 mapping to the information contained in a Java `KeyEvent`"]
-#[doc = " (see https://developer.android.com/reference/android/view/KeyEvent)."]
+#[doc = " This structure defines the native side of an android.app.GameActivity.\n It is created by the framework, and handed to the application's native\n code as it is being launched."]
 #[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct GameActivityKeyEvent {
-    pub deviceId: i32,
-    pub source: i32,
-    pub action: i32,
-    pub eventTime: i64,
-    pub downTime: i64,
-    pub flags: i32,
-    pub metaState: i32,
-    pub modifiers: i32,
-    pub repeatCount: i32,
-    pub keyCode: i32,
-    pub scanCode: i32,
+pub struct GameActivity {
+    #[doc = " Pointer to the callback function table of the native application.\n You can set the functions here to your own callbacks.  The callbacks\n pointer itself here should not be changed; it is allocated and managed\n for you by the framework."]
+    pub callbacks: *mut GameActivityCallbacks,
+    #[doc = " The global handle on the process's Java VM."]
+    pub vm: *mut JavaVM,
+    #[doc = " JNI context for the main thread of the app.  Note that this field\n can ONLY be used from the main thread of the process; that is, the\n thread that calls into the GameActivityCallbacks."]
+    pub env: *mut JNIEnv,
+    #[doc = " The GameActivity object handle."]
+    pub javaGameActivity: jobject,
+    #[doc = " Path to this application's internal data directory."]
+    pub internalDataPath: *const ::std::os::raw::c_char,
+    #[doc = " Path to this application's external (removable/mountable) data directory."]
+    pub externalDataPath: *const ::std::os::raw::c_char,
+    #[doc = " The platform's SDK version code."]
+    pub sdkVersion: i32,
+    #[doc = " This is the native instance of the application.  It is not used by\n the framework, but can be set by the application to its own instance\n state."]
+    pub instance: *mut ::std::os::raw::c_void,
+    #[doc = " Pointer to the Asset Manager instance for the application.  The\n application uses this to access binary assets bundled inside its own .apk\n file."]
+    pub assetManager: *mut AAssetManager,
+    #[doc = " Available starting with Honeycomb: path to the directory containing\n the application's OBB files (if any).  If the app doesn't have any\n OBB files, this directory may not exist."]
+    pub obbPath: *const ::std::os::raw::c_char,
 }
 #[test]
-fn bindgen_test_layout_GameActivityKeyEvent() {
+fn bindgen_test_layout_GameActivity() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivity> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<GameActivityKeyEvent>(),
-        56usize,
-        concat!("Size of: ", stringify!(GameActivityKeyEvent))
+        ::std::mem::size_of::<GameActivity>(),
+        80usize,
+        concat!("Size of: ", stringify!(GameActivity))
     );
     assert_eq!(
-        ::std::mem::align_of::<GameActivityKeyEvent>(),
+        ::std::mem::align_of::<GameActivity>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameActivityKeyEvent))
+        concat!("Alignment of ", stringify!(GameActivity))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).deviceId as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).callbacks) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(deviceId)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).source as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(source)
+            stringify!(callbacks)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).action as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).vm) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(action)
+            stringify!(vm)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).eventTime as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).env) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(eventTime)
+            stringify!(env)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).downTime as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).javaGameActivity) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(downTime)
+            stringify!(javaGameActivity)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).internalDataPath) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(flags)
+            stringify!(internalDataPath)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).metaState as *const _ as usize },
-        36usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).externalDataPath) as usize - ptr as usize },
+        40usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(metaState)
+            stringify!(externalDataPath)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).modifiers as *const _ as usize },
-        40usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).sdkVersion) as usize - ptr as usize },
+        48usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(modifiers)
+            stringify!(sdkVersion)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityKeyEvent>())).repeatCount as *const _ as usize
-        },
-        44usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).instance) as usize - ptr as usize },
+        56usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(repeatCount)
+            stringify!(instance)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).keyCode as *const _ as usize },
-        48usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).assetManager) as usize - ptr as usize },
+        64usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(keyCode)
+            stringify!(assetManager)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityKeyEvent>())).scanCode as *const _ as usize },
-        52usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).obbPath) as usize - ptr as usize },
+        72usize,
         concat!(
             "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
+            stringify!(GameActivity),
             "::",
-            stringify!(scanCode)
+            stringify!(obbPath)
         )
     );
 }
-#[doc = " A function the user should call from their callback with the data, its length"]
-#[doc = " and the library- supplied context."]
+#[doc = " A function the user should call from their callback with the data, its length\n and the library- supplied context."]
 pub type SaveInstanceStateRecallback = ::std::option::Option<
     unsafe extern "C" fn(
         bytes: *const ::std::os::raw::c_char,
@@ -3245,18 +3201,11 @@ pub type SaveInstanceStateRecallback = ::std::option::Option<
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct GameActivityCallbacks {
-    #[doc = " GameActivity has started.  See Java documentation for Activity.onStart()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has started.  See Java documentation for Activity.onStart()\n for more information."]
     pub onStart: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " GameActivity has resumed.  See Java documentation for Activity.onResume()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has resumed.  See Java documentation for Activity.onResume()\n for more information."]
     pub onResume: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " The framework is asking GameActivity to save its current instance state."]
-    #[doc = " See the Java documentation for Activity.onSaveInstanceState() for more"]
-    #[doc = " information. The user should call the recallback with their data, its"]
-    #[doc = " length and the provided context; they retain ownership of the data. Note"]
-    #[doc = " that the saved state will be persisted, so it can not contain any active"]
-    #[doc = " entities (pointers to memory, file descriptors, etc)."]
+    #[doc = " The framework is asking GameActivity to save its current instance state.\n See the Java documentation for Activity.onSaveInstanceState() for more\n information. The user should call the recallback with their data, its\n length and the provided context; they retain ownership of the data. Note\n that the saved state will be persisted, so it can not contain any active\n entities (pointers to memory, file descriptors, etc)."]
     pub onSaveInstanceState: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
@@ -3264,27 +3213,20 @@ pub struct GameActivityCallbacks {
             context: *mut ::std::os::raw::c_void,
         ),
     >,
-    #[doc = " GameActivity has paused.  See Java documentation for Activity.onPause()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has paused.  See Java documentation for Activity.onPause()\n for more information."]
     pub onPause: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " GameActivity has stopped.  See Java documentation for Activity.onStop()"]
-    #[doc = " for more information."]
+    #[doc = " GameActivity has stopped.  See Java documentation for Activity.onStop()\n for more information."]
     pub onStop: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " GameActivity is being destroyed.  See Java documentation for"]
-    #[doc = " Activity.onDestroy() for more information."]
+    #[doc = " GameActivity is being destroyed.  See Java documentation for\n Activity.onDestroy() for more information."]
     pub onDestroy: ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " Focus has changed in this GameActivity's window.  This is often used,"]
-    #[doc = " for example, to pause a game when it loses input focus."]
+    #[doc = " Focus has changed in this GameActivity's window.  This is often used,\n for example, to pause a game when it loses input focus."]
     pub onWindowFocusChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity, hasFocus: bool)>,
-    #[doc = " The drawing window for this native activity has been created.  You"]
-    #[doc = " can use the given native window object to start drawing."]
+    #[doc = " The drawing window for this native activity has been created.  You\n can use the given native window object to start drawing."]
     pub onNativeWindowCreated: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The drawing window for this native activity has been resized.  You should"]
-    #[doc = " retrieve the new size from the window and ensure that your rendering in"]
-    #[doc = " it now matches."]
+    #[doc = " The drawing window for this native activity has been resized.  You should\n retrieve the new size from the window and ensure that your rendering in\n it now matches."]
     pub onNativeWindowResized: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
@@ -3293,77 +3235,62 @@ pub struct GameActivityCallbacks {
             newHeight: i32,
         ),
     >,
-    #[doc = " The drawing window for this native activity needs to be redrawn.  To"]
-    #[doc = " avoid transient artifacts during screen changes (such resizing after"]
-    #[doc = " rotation), applications should not return from this function until they"]
-    #[doc = " have finished drawing their window in its current state."]
+    #[doc = " The drawing window for this native activity needs to be redrawn.  To\n avoid transient artifacts during screen changes (such resizing after\n rotation), applications should not return from this function until they\n have finished drawing their window in its current state."]
     pub onNativeWindowRedrawNeeded: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The drawing window for this native activity is going to be destroyed."]
-    #[doc = " You MUST ensure that you do not touch the window object after returning"]
-    #[doc = " from this function: in the common case of drawing to the window from"]
-    #[doc = " another thread, that means the implementation of this callback must"]
-    #[doc = " properly synchronize with the other thread to stop its drawing before"]
-    #[doc = " returning from here."]
+    #[doc = " The drawing window for this native activity is going to be destroyed.\n You MUST ensure that you do not touch the window object after returning\n from this function: in the common case of drawing to the window from\n another thread, that means the implementation of this callback must\n properly synchronize with the other thread to stop its drawing before\n returning from here."]
     pub onNativeWindowDestroyed: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The current device AConfiguration has changed.  The new configuration can"]
-    #[doc = " be retrieved from assetManager."]
+    #[doc = " The current device AConfiguration has changed.  The new configuration can\n be retrieved from assetManager."]
     pub onConfigurationChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
-    #[doc = " The system is running low on memory.  Use this callback to release"]
-    #[doc = " resources you do not need, to help the system avoid killing more"]
-    #[doc = " important processes."]
+    #[doc = " The system is running low on memory.  Use this callback to release\n resources you do not need, to help the system avoid killing more\n important processes."]
     pub onTrimMemory: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, level: ::std::os::raw::c_int),
     >,
-    #[doc = " Callback called for every MotionEvent done on the GameActivity"]
-    #[doc = " SurfaceView. Ownership of `event` is maintained by the library and it is"]
-    #[doc = " only valid during the callback."]
+    #[doc = " Callback called for every MotionEvent done on the GameActivity\n SurfaceView. Ownership of `event` is maintained by the library and it is\n only valid during the callback."]
     pub onTouchEvent: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
             event: *const GameActivityMotionEvent,
-            historical: *const GameActivityHistoricalPointerAxes,
-            historicalLen: ::std::os::raw::c_int,
         ) -> bool,
     >,
-    #[doc = " Callback called for every key down event on the GameActivity SurfaceView."]
-    #[doc = " Ownership of `event` is maintained by the library and it is only valid"]
-    #[doc = " during the callback."]
+    #[doc = " Callback called for every key down event on the GameActivity SurfaceView.\n Ownership of `event` is maintained by the library and it is only valid\n during the callback."]
     pub onKeyDown: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
             event: *const GameActivityKeyEvent,
         ) -> bool,
     >,
-    #[doc = " Callback called for every key up event on the GameActivity SurfaceView."]
-    #[doc = " Ownership of `event` is maintained by the library and it is only valid"]
-    #[doc = " during the callback."]
+    #[doc = " Callback called for every key up event on the GameActivity SurfaceView.\n Ownership of `event` is maintained by the library and it is only valid\n during the callback."]
     pub onKeyUp: ::std::option::Option<
         unsafe extern "C" fn(
             activity: *mut GameActivity,
             event: *const GameActivityKeyEvent,
         ) -> bool,
     >,
-    #[doc = " Callback called for every soft-keyboard text input event."]
-    #[doc = " Ownership of `state` is maintained by the library and it is only valid"]
-    #[doc = " during the callback."]
+    #[doc = " Callback called for every soft-keyboard text input event.\n Ownership of `state` is maintained by the library and it is only valid\n during the callback."]
     pub onTextInputEvent: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, state: *const GameTextInputState),
     >,
-    #[doc = " Callback called when WindowInsets of the main app window have changed."]
-    #[doc = " Call GameActivity_getWindowInsets to retrieve the insets themselves."]
+    #[doc = " Callback called when WindowInsets of the main app window have changed.\n Call GameActivity_getWindowInsets to retrieve the insets themselves."]
     pub onWindowInsetsChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
+    #[doc = " Callback called when the rectangle in the window where the content\n should be placed has changed."]
+    pub onContentRectChanged: ::std::option::Option<
+        unsafe extern "C" fn(activity: *mut GameActivity, rect: *const ARect),
+    >,
 }
 #[test]
 fn bindgen_test_layout_GameActivityCallbacks() {
+    const UNINIT: ::std::mem::MaybeUninit<GameActivityCallbacks> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<GameActivityCallbacks>(),
-        144usize,
+        152usize,
         concat!("Size of: ", stringify!(GameActivityCallbacks))
     );
     assert_eq!(
@@ -3372,7 +3299,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         concat!("Alignment of ", stringify!(GameActivityCallbacks))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onStart as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onStart) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -3382,7 +3309,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onResume as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onResume) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -3392,10 +3319,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onSaveInstanceState as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onSaveInstanceState) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -3405,7 +3329,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onPause as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onPause) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -3415,7 +3339,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onStop as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onStop) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -3425,7 +3349,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onDestroy as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onDestroy) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -3435,10 +3359,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onWindowFocusChanged as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onWindowFocusChanged) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -3448,10 +3369,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowCreated as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowCreated) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -3461,10 +3379,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowResized as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowResized) as usize - ptr as usize },
         64usize,
         concat!(
             "Offset of field: ",
@@ -3474,10 +3389,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowRedrawNeeded as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowRedrawNeeded) as usize - ptr as usize },
         72usize,
         concat!(
             "Offset of field: ",
@@ -3487,10 +3399,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onNativeWindowDestroyed as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowDestroyed) as usize - ptr as usize },
         80usize,
         concat!(
             "Offset of field: ",
@@ -3500,10 +3409,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onConfigurationChanged as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onConfigurationChanged) as usize - ptr as usize },
         88usize,
         concat!(
             "Offset of field: ",
@@ -3513,9 +3419,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onTrimMemory as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onTrimMemory) as usize - ptr as usize },
         96usize,
         concat!(
             "Offset of field: ",
@@ -3525,9 +3429,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onTouchEvent as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onTouchEvent) as usize - ptr as usize },
         104usize,
         concat!(
             "Offset of field: ",
@@ -3537,7 +3439,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onKeyDown as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onKeyDown) as usize - ptr as usize },
         112usize,
         concat!(
             "Offset of field: ",
@@ -3547,7 +3449,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<GameActivityCallbacks>())).onKeyUp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onKeyUp) as usize - ptr as usize },
         120usize,
         concat!(
             "Offset of field: ",
@@ -3557,9 +3459,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onTextInputEvent as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onTextInputEvent) as usize - ptr as usize },
         128usize,
         concat!(
             "Offset of field: ",
@@ -3569,10 +3469,7 @@ fn bindgen_test_layout_GameActivityCallbacks() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<GameActivityCallbacks>())).onWindowInsetsChanged as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).onWindowInsetsChanged) as usize - ptr as usize },
         136usize,
         concat!(
             "Offset of field: ",
@@ -3581,269 +3478,124 @@ fn bindgen_test_layout_GameActivityCallbacks() {
             stringify!(onWindowInsetsChanged)
         )
     );
-}
-extern "C" {
-    #[doc = " \\brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`."]
-    #[doc = ""]
-    #[doc = " This is done automatically by the GameActivity: see `onTouchEvent` to set"]
-    #[doc = " a callback to consume the received events."]
-    #[doc = " This function can be used if you re-implement events handling in your own"]
-    #[doc = " activity. On return, the out_event->historicalStart will be zero, and should"]
-    #[doc = " be updated to index into whatever buffer out_historical is copied."]
-    #[doc = " On return the length of out_historical is"]
-    #[doc = " (out_event->pointerCount x out_event->historicalCount) and is in a"]
-    #[doc = " pointer-major order (i.e. all axis for a pointer are contiguous)"]
-    #[doc = " Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityMotionEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityMotionEvent,
-        out_historical: *mut GameActivityHistoricalPointerAxes,
-    ) -> ::std::os::raw::c_int;
-}
-extern "C" {
-    #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`."]
-    #[doc = ""]
-    #[doc = " This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`"]
-    #[doc = " to set a callback to consume the received events."]
-    #[doc = " This function can be used if you re-implement events handling in your own"]
-    #[doc = " activity."]
-    #[doc = " Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityKeyEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityKeyEvent,
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).onContentRectChanged) as usize - ptr as usize },
+        144usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(GameActivityCallbacks),
+            "::",
+            stringify!(onContentRectChanged)
+        )
     );
 }
-#[doc = " This is the function that must be in the native code to instantiate the"]
-#[doc = " application's native activity.  It is called with the activity instance (see"]
-#[doc = " above); if the code is being instantiated from a previously saved instance,"]
-#[doc = " the savedState will be non-NULL and point to the saved data.  You must make"]
-#[doc = " any copy of this data you need -- it will be released after you return from"]
-#[doc = " this function."]
+#[doc = " This is the function that must be in the native code to instantiate the\n application's native activity.  It is called with the activity instance (see\n above); if the code is being instantiated from a previously saved instance,\n the savedState will be non-NULL and point to the saved data.  You must make\n any copy of this data you need -- it will be released after you return from\n this function."]
 pub type GameActivity_createFunc = ::std::option::Option<
     unsafe extern "C" fn(
         activity: *mut GameActivity,
         savedState: *mut ::std::os::raw::c_void,
-        savedStateSize: size_t,
+        savedStateSize: usize,
     ),
 >;
 extern "C" {
-    #[doc = " Finish the given activity.  Its finish() method will be called, causing it"]
-    #[doc = " to be stopped and destroyed.  Note that this method can be called from"]
-    #[doc = " *any* thread; it will send a message to the main thread of the process"]
-    #[doc = " where the Java finish call will take place."]
+    #[doc = " Finish the given activity.  Its finish() method will be called, causing it\n to be stopped and destroyed.  Note that this method can be called from\n *any* thread; it will send a message to the main thread of the process\n where the Java finish call will take place."]
     pub fn GameActivity_finish(activity: *mut GameActivity);
 }
-#[doc = " As long as this window is visible to the user, allow the lock"]
-#[doc = " screen to activate while the screen is on.  This can be used"]
-#[doc = " independently, or in combination with {@link"]
-#[doc = " GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} and/or {@link"]
-#[doc = " GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}"]
+#[doc = " As long as this window is visible to the user, allow the lock\n screen to activate while the screen is on.  This can be used\n independently, or in combination with {@link\n GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} and/or {@link\n GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}"]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_ALLOW_LOCK_WHILE_SCREEN_ON:
     GameActivitySetWindowFlags = 1;
 #[doc = " Everything behind this window will be dimmed."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DIM_BEHIND: GameActivitySetWindowFlags = 2;
-#[doc = " Blur everything behind this window."]
-#[doc = " @deprecated Blurring is no longer supported."]
+#[doc = " Blur everything behind this window.\n @deprecated Blurring is no longer supported."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_BLUR_BEHIND: GameActivitySetWindowFlags = 4;
-#[doc = " This window won't ever get key input focus, so the"]
-#[doc = " user can not send key or other button events to it.  Those will"]
-#[doc = " instead go to whatever focusable window is behind it.  This flag"]
-#[doc = " will also enable {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL} whether or not"]
-#[doc = " that is explicitly set."]
-#[doc = ""]
-#[doc = " Setting this flag also implies that the window will not need to"]
-#[doc = " interact with"]
-#[doc = " a soft input method, so it will be Z-ordered and positioned"]
-#[doc = " independently of any active input method (typically this means it"]
-#[doc = " gets Z-ordered on top of the input method, so it can use the full"]
-#[doc = " screen for its content and cover the input method if needed.  You"]
-#[doc = " can use {@link GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM} to modify this"]
-#[doc = " behavior."]
+#[doc = " This window won't ever get key input focus, so the\n user can not send key or other button events to it.  Those will\n instead go to whatever focusable window is behind it.  This flag\n will also enable {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL} whether or not\n that is explicitly set.\n\n Setting this flag also implies that the window will not need to\n interact with\n a soft input method, so it will be Z-ordered and positioned\n independently of any active input method (typically this means it\n gets Z-ordered on top of the input method, so it can use the full\n screen for its content and cover the input method if needed.  You\n can use {@link GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM} to modify this\n behavior."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_NOT_FOCUSABLE: GameActivitySetWindowFlags =
     8;
 #[doc = " This window can never receive touch events."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_NOT_TOUCHABLE: GameActivitySetWindowFlags =
     16;
-#[doc = " Even when this window is focusable (its"]
-#[doc = " {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set), allow any pointer"]
-#[doc = " events outside of the window to be sent to the windows behind it."]
-#[doc = " Otherwise it will consume all pointer events itself, regardless of"]
-#[doc = " whether they are inside of the window."]
+#[doc = " Even when this window is focusable (its\n {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set), allow any pointer\n events outside of the window to be sent to the windows behind it.\n Otherwise it will consume all pointer events itself, regardless of\n whether they are inside of the window."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL: GameActivitySetWindowFlags =
     32;
-#[doc = " When set, if the device is asleep when the touch"]
-#[doc = " screen is pressed, you will receive this first touch event.  Usually"]
-#[doc = " the first touch event is consumed by the system since the user can"]
-#[doc = " not see what they are pressing on."]
-#[doc = ""]
-#[doc = " @deprecated This flag has no effect."]
+#[doc = " When set, if the device is asleep when the touch\n screen is pressed, you will receive this first touch event.  Usually\n the first touch event is consumed by the system since the user can\n not see what they are pressing on.\n\n @deprecated This flag has no effect."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_TOUCHABLE_WHEN_WAKING:
     GameActivitySetWindowFlags = 64;
-#[doc = " As long as this window is visible to the user, keep"]
-#[doc = " the device's screen turned on and bright."]
+#[doc = " As long as this window is visible to the user, keep\n the device's screen turned on and bright."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_KEEP_SCREEN_ON: GameActivitySetWindowFlags =
     128;
-#[doc = " Place the window within the entire screen, ignoring"]
-#[doc = " decorations around the border (such as the status bar).  The"]
-#[doc = " window must correctly position its contents to take the screen"]
-#[doc = " decoration into account."]
+#[doc = " Place the window within the entire screen, ignoring\n decorations around the border (such as the status bar).  The\n window must correctly position its contents to take the screen\n decoration into account."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN:
     GameActivitySetWindowFlags = 256;
 #[doc = " Allows the window to extend outside of the screen."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_LAYOUT_NO_LIMITS:
     GameActivitySetWindowFlags = 512;
-#[doc = " Hide all screen decorations (such as the status"]
-#[doc = " bar) while this window is displayed.  This allows the window to"]
-#[doc = " use the entire display space for itself -- the status bar will"]
-#[doc = " be hidden when an app window with this flag set is on the top"]
-#[doc = " layer. A fullscreen window will ignore a value of {@link"]
-#[doc = " GAMEACTIVITY_SOFT_INPUT_ADJUST_RESIZE}; the window will stay"]
-#[doc = " fullscreen and will not resize."]
+#[doc = " Hide all screen decorations (such as the status\n bar) while this window is displayed.  This allows the window to\n use the entire display space for itself -- the status bar will\n be hidden when an app window with this flag set is on the top\n layer. A fullscreen window will ignore a value of {@link\n GAMEACTIVITY_SOFT_INPUT_ADJUST_RESIZE}; the window will stay\n fullscreen and will not resize."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_FULLSCREEN: GameActivitySetWindowFlags =
     1024;
-#[doc = " Override {@link GAMEACTIVITY_FLAG_FULLSCREEN} and force the"]
-#[doc = " screen decorations (such as the status bar) to be shown."]
+#[doc = " Override {@link GAMEACTIVITY_FLAG_FULLSCREEN} and force the\n screen decorations (such as the status bar) to be shown."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_FORCE_NOT_FULLSCREEN:
     GameActivitySetWindowFlags = 2048;
-#[doc = " Turn on dithering when compositing this window to"]
-#[doc = " the screen."]
-#[doc = " @deprecated This flag is no longer used."]
+#[doc = " Turn on dithering when compositing this window to\n the screen.\n @deprecated This flag is no longer used."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DITHER: GameActivitySetWindowFlags = 4096;
-#[doc = " Treat the content of the window as secure, preventing"]
-#[doc = " it from appearing in screenshots or from being viewed on non-secure"]
-#[doc = " displays."]
+#[doc = " Treat the content of the window as secure, preventing\n it from appearing in screenshots or from being viewed on non-secure\n displays."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SECURE: GameActivitySetWindowFlags = 8192;
-#[doc = " A special mode where the layout parameters are used"]
-#[doc = " to perform scaling of the surface when it is composited to the"]
-#[doc = " screen."]
+#[doc = " A special mode where the layout parameters are used\n to perform scaling of the surface when it is composited to the\n screen."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SCALED: GameActivitySetWindowFlags = 16384;
-#[doc = " Intended for windows that will often be used when the user is"]
-#[doc = " holding the screen against their face, it will aggressively"]
-#[doc = " filter the event stream to prevent unintended presses in this"]
-#[doc = " situation that may not be desired for a particular window, when"]
-#[doc = " such an event stream is detected, the application will receive"]
-#[doc = " a {@link AMOTION_EVENT_ACTION_CANCEL} to indicate this so"]
-#[doc = " applications can handle this accordingly by taking no action on"]
-#[doc = " the event until the finger is released."]
+#[doc = " Intended for windows that will often be used when the user is\n holding the screen against their face, it will aggressively\n filter the event stream to prevent unintended presses in this\n situation that may not be desired for a particular window, when\n such an event stream is detected, the application will receive\n a {@link AMOTION_EVENT_ACTION_CANCEL} to indicate this so\n applications can handle this accordingly by taking no action on\n the event until the finger is released."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_IGNORE_CHEEK_PRESSES:
     GameActivitySetWindowFlags = 32768;
-#[doc = " A special option only for use in combination with"]
-#[doc = " {@link GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN}.  When requesting layout in"]
-#[doc = " the screen your window may appear on top of or behind screen decorations"]
-#[doc = " such as the status bar.  By also including this flag, the window"]
-#[doc = " manager will report the inset rectangle needed to ensure your"]
-#[doc = " content is not covered by screen decorations."]
+#[doc = " A special option only for use in combination with\n {@link GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN}.  When requesting layout in\n the screen your window may appear on top of or behind screen decorations\n such as the status bar.  By also including this flag, the window\n manager will report the inset rectangle needed to ensure your\n content is not covered by screen decorations."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_LAYOUT_INSET_DECOR:
     GameActivitySetWindowFlags = 65536;
-#[doc = " Invert the state of {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} with"]
-#[doc = " respect to how this window interacts with the current method."]
-#[doc = " That is, if FLAG_NOT_FOCUSABLE is set and this flag is set,"]
-#[doc = " then the window will behave as if it needs to interact with the"]
-#[doc = " input method and thus be placed behind/away from it; if {@link"]
-#[doc = " GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set and this flag is set,"]
-#[doc = " then the window will behave as if it doesn't need to interact"]
-#[doc = " with the input method and can be placed to use more space and"]
-#[doc = " cover the input method."]
+#[doc = " Invert the state of {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} with\n respect to how this window interacts with the current method.\n That is, if FLAG_NOT_FOCUSABLE is set and this flag is set,\n then the window will behave as if it needs to interact with the\n input method and thus be placed behind/away from it; if {@link\n GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set and this flag is set,\n then the window will behave as if it doesn't need to interact\n with the input method and can be placed to use more space and\n cover the input method."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM:
     GameActivitySetWindowFlags = 131072;
-#[doc = " If you have set {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL}, you"]
-#[doc = " can set this flag to receive a single special MotionEvent with"]
-#[doc = " the action"]
-#[doc = " {@link AMOTION_EVENT_ACTION_OUTSIDE} for"]
-#[doc = " touches that occur outside of your window.  Note that you will not"]
-#[doc = " receive the full down/move/up gesture, only the location of the"]
-#[doc = " first down as an {@link AMOTION_EVENT_ACTION_OUTSIDE}."]
+#[doc = " If you have set {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL}, you\n can set this flag to receive a single special MotionEvent with\n the action\n {@link AMOTION_EVENT_ACTION_OUTSIDE} for\n touches that occur outside of your window.  Note that you will not\n receive the full down/move/up gesture, only the location of the\n first down as an {@link AMOTION_EVENT_ACTION_OUTSIDE}."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_WATCH_OUTSIDE_TOUCH:
     GameActivitySetWindowFlags = 262144;
-#[doc = " Special flag to let windows be shown when the screen"]
-#[doc = " is locked. This will let application windows take precedence over"]
-#[doc = " key guard or any other lock screens. Can be used with"]
-#[doc = " {@link GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} to turn screen on and display"]
-#[doc = " windows directly before showing the key guard window.  Can be used with"]
-#[doc = " {@link GAMEACTIVITY_FLAG_DISMISS_KEYGUARD} to automatically fully"]
-#[doc = " dismisss non-secure keyguards.  This flag only applies to the top-most"]
-#[doc = " full-screen window."]
+#[doc = " Special flag to let windows be shown when the screen\n is locked. This will let application windows take precedence over\n key guard or any other lock screens. Can be used with\n {@link GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} to turn screen on and display\n windows directly before showing the key guard window.  Can be used with\n {@link GAMEACTIVITY_FLAG_DISMISS_KEYGUARD} to automatically fully\n dismisss non-secure keyguards.  This flag only applies to the top-most\n full-screen window."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED:
     GameActivitySetWindowFlags = 524288;
-#[doc = " Ask that the system wallpaper be shown behind"]
-#[doc = " your window.  The window surface must be translucent to be able"]
-#[doc = " to actually see the wallpaper behind it; this flag just ensures"]
-#[doc = " that the wallpaper surface will be there if this window actually"]
-#[doc = " has translucent regions."]
+#[doc = " Ask that the system wallpaper be shown behind\n your window.  The window surface must be translucent to be able\n to actually see the wallpaper behind it; this flag just ensures\n that the wallpaper surface will be there if this window actually\n has translucent regions."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_SHOW_WALLPAPER: GameActivitySetWindowFlags =
     1048576;
-#[doc = " When set as a window is being added or made"]
-#[doc = " visible, once the window has been shown then the system will"]
-#[doc = " poke the power manager's user activity (as if the user had woken"]
-#[doc = " up the device) to turn the screen on."]
+#[doc = " When set as a window is being added or made\n visible, once the window has been shown then the system will\n poke the power manager's user activity (as if the user had woken\n up the device) to turn the screen on."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_TURN_SCREEN_ON: GameActivitySetWindowFlags =
     2097152;
-#[doc = " When set the window will cause the keyguard to"]
-#[doc = " be dismissed, only if it is not a secure lock keyguard.  Because such"]
-#[doc = " a keyguard is not needed for security, it will never re-appear if"]
-#[doc = " the user navigates to another window (in contrast to"]
-#[doc = " {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}, which will only temporarily"]
-#[doc = " hide both secure and non-secure keyguards but ensure they reappear"]
-#[doc = " when the user moves to another UI that doesn't hide them)."]
-#[doc = " If the keyguard is currently active and is secure (requires an"]
-#[doc = " unlock pattern) than the user will still need to confirm it before"]
-#[doc = " seeing this window, unless {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED} has"]
-#[doc = " also been set."]
+#[doc = " When set the window will cause the keyguard to\n be dismissed, only if it is not a secure lock keyguard.  Because such\n a keyguard is not needed for security, it will never re-appear if\n the user navigates to another window (in contrast to\n {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}, which will only temporarily\n hide both secure and non-secure keyguards but ensure they reappear\n when the user moves to another UI that doesn't hide them).\n If the keyguard is currently active and is secure (requires an\n unlock pattern) than the user will still need to confirm it before\n seeing this window, unless {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED} has\n also been set."]
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DISMISS_KEYGUARD:
     GameActivitySetWindowFlags = 4194304;
-#[doc = " Flags for GameActivity_setWindowFlags,"]
-#[doc = " as per the Java API at android.view.WindowManager.LayoutParams."]
+#[doc = " Flags for GameActivity_setWindowFlags,\n as per the Java API at android.view.WindowManager.LayoutParams."]
 pub type GameActivitySetWindowFlags = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Change the window flags of the given activity.  Calls getWindow().setFlags()"]
-    #[doc = " of the given activity."]
-    #[doc = " Note that some flags must be set before the window decoration is created,"]
-    #[doc = " see"]
-    #[doc = " https://developer.android.com/reference/android/view/Window#setFlags(int,%20int)."]
-    #[doc = " Note also that this method can be called from"]
-    #[doc = " *any* thread; it will send a message to the main thread of the process"]
-    #[doc = " where the Java finish call will take place."]
+    #[doc = " Change the window flags of the given activity.  Calls getWindow().setFlags()\n of the given activity.\n Note that some flags must be set before the window decoration is created,\n see\n https://developer.android.com/reference/android/view/Window#setFlags(int,%20int).\n Note also that this method can be called from\n *any* thread; it will send a message to the main thread of the process\n where the Java finish call will take place."]
     pub fn GameActivity_setWindowFlags(
         activity: *mut GameActivity,
         addFlags: u32,
         removeFlags: u32,
     );
 }
-#[doc = " Implicit request to show the input window, not as the result"]
-#[doc = " of a direct request by the user."]
+#[doc = " Implicit request to show the input window, not as the result\n of a direct request by the user."]
 pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT:
     GameActivityShowSoftInputFlags = 1;
-#[doc = " The user has forced the input method open (such as by"]
-#[doc = " long-pressing menu) so it should not be closed until they"]
-#[doc = " explicitly do so."]
+#[doc = " The user has forced the input method open (such as by\n long-pressing menu) so it should not be closed until they\n explicitly do so."]
 pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED:
     GameActivityShowSoftInputFlags = 2;
-#[doc = " Flags for GameActivity_showSoftInput; see the Java InputMethodManager"]
-#[doc = " API for documentation."]
+#[doc = " Flags for GameActivity_showSoftInput; see the Java InputMethodManager\n API for documentation."]
 pub type GameActivityShowSoftInputFlags = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Show the IME while in the given activity.  Calls"]
-    #[doc = " InputMethodManager.showSoftInput() for the given activity.  Note that this"]
-    #[doc = " method can be called from *any* thread; it will send a message to the main"]
-    #[doc = " thread of the process where the Java call will take place."]
+    #[doc = " Show the IME while in the given activity.  Calls\n InputMethodManager.showSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java call will take place."]
     pub fn GameActivity_showSoftInput(activity: *mut GameActivity, flags: u32);
 }
 extern "C" {
-    #[doc = " Set the text entry state (see documentation of the GameTextInputState struct"]
-    #[doc = " in the Game Text Input library reference)."]
-    #[doc = ""]
-    #[doc = " Ownership of the state is maintained by the caller."]
+    #[doc = " Set the text entry state (see documentation of the GameTextInputState struct\n in the Game Text Input library reference).\n\n Ownership of the state is maintained by the caller."]
     pub fn GameActivity_setTextInputState(
         activity: *mut GameActivity,
         state: *const GameTextInputState,
     );
 }
 extern "C" {
-    #[doc = " Get the last-received text entry state (see documentation of the"]
-    #[doc = " GameTextInputState struct in the Game Text Input library reference)."]
-    #[doc = ""]
+    #[doc = " Get the last-received text entry state (see documentation of the\n GameTextInputState struct in the Game Text Input library reference).\n"]
     pub fn GameActivity_getTextInputState(
         activity: *mut GameActivity,
         callback: GameTextInputGetStateCallback,
@@ -3854,29 +3606,20 @@ extern "C" {
     #[doc = " Get a pointer to the GameTextInput library instance."]
     pub fn GameActivity_getTextInput(activity: *const GameActivity) -> *mut GameTextInput;
 }
-#[doc = " The soft input window should only be hidden if it was not"]
-#[doc = " explicitly shown by the user."]
+#[doc = " The soft input window should only be hidden if it was not\n explicitly shown by the user."]
 pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_ONLY:
     GameActivityHideSoftInputFlags = 1;
-#[doc = " The soft input window should normally be hidden, unless it was"]
-#[doc = " originally shown with {@link GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED}."]
+#[doc = " The soft input window should normally be hidden, unless it was\n originally shown with {@link GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED}."]
 pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS:
     GameActivityHideSoftInputFlags = 2;
-#[doc = " Flags for GameActivity_hideSoftInput; see the Java InputMethodManager"]
-#[doc = " API for documentation."]
+#[doc = " Flags for GameActivity_hideSoftInput; see the Java InputMethodManager\n API for documentation."]
 pub type GameActivityHideSoftInputFlags = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Hide the IME while in the given activity.  Calls"]
-    #[doc = " InputMethodManager.hideSoftInput() for the given activity.  Note that this"]
-    #[doc = " method can be called from *any* thread; it will send a message to the main"]
-    #[doc = " thread of the process where the Java finish call will take place."]
+    #[doc = " Hide the IME while in the given activity.  Calls\n InputMethodManager.hideSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java finish call will take place."]
     pub fn GameActivity_hideSoftInput(activity: *mut GameActivity, flags: u32);
 }
 extern "C" {
-    #[doc = " Get the current window insets of the particular component. See"]
-    #[doc = " https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
-    #[doc = " for more details."]
-    #[doc = " You can use these insets to influence what you show on the screen."]
+    #[doc = " Get the current window insets of the particular component. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type\n for more details.\n You can use these insets to influence what you show on the screen."]
     pub fn GameActivity_getWindowInsets(
         activity: *mut GameActivity,
         type_: GameCommonInsetsType,
@@ -3884,14 +3627,7 @@ extern "C" {
     );
 }
 extern "C" {
-    #[doc = " Set options on how the IME behaves when it is requested for text input."]
-    #[doc = " See"]
-    #[doc = " https://developer.android.com/reference/android/view/inputmethod/EditorInfo"]
-    #[doc = " for the meaning of inputType, actionId and imeOptions."]
-    #[doc = ""]
-    #[doc = " Note that this function will attach the current thread to the JVM if it is"]
-    #[doc = " not already attached, so the caller must detach the thread from the JVM"]
-    #[doc = " before the thread is destroyed using DetachCurrentThread."]
+    #[doc = " Set options on how the IME behaves when it is requested for text input.\n See\n https://developer.android.com/reference/android/view/inputmethod/EditorInfo\n for the meaning of inputType, actionId and imeOptions.\n\n Note that this function will attach the current thread to the JVM if it is\n not already attached, so the caller must detach the thread from the JVM\n before the thread is destroyed using DetachCurrentThread."]
     pub fn GameActivity_setImeEditorInfo(
         activity: *mut GameActivity,
         inputType: ::std::os::raw::c_int,
@@ -3899,92 +3635,152 @@ extern "C" {
         imeOptions: ::std::os::raw::c_int,
     );
 }
-pub const ACONFIGURATION_ORIENTATION_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_ORIENTATION_PORT: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_ORIENTATION_LAND: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_ORIENTATION_SQUARE: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_TOUCHSCREEN_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_TOUCHSCREEN_NOTOUCH: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_TOUCHSCREEN_STYLUS: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_TOUCHSCREEN_FINGER: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_DENSITY_DEFAULT: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_DENSITY_LOW: ::std::os::raw::c_uint = 120;
-pub const ACONFIGURATION_DENSITY_MEDIUM: ::std::os::raw::c_uint = 160;
-pub const ACONFIGURATION_DENSITY_TV: ::std::os::raw::c_uint = 213;
-pub const ACONFIGURATION_DENSITY_HIGH: ::std::os::raw::c_uint = 240;
-pub const ACONFIGURATION_DENSITY_XHIGH: ::std::os::raw::c_uint = 320;
-pub const ACONFIGURATION_DENSITY_XXHIGH: ::std::os::raw::c_uint = 480;
-pub const ACONFIGURATION_DENSITY_XXXHIGH: ::std::os::raw::c_uint = 640;
-pub const ACONFIGURATION_DENSITY_ANY: ::std::os::raw::c_uint = 65534;
-pub const ACONFIGURATION_DENSITY_NONE: ::std::os::raw::c_uint = 65535;
-pub const ACONFIGURATION_KEYBOARD_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_KEYBOARD_NOKEYS: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_KEYBOARD_QWERTY: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_KEYBOARD_12KEY: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_NAVIGATION_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_NAVIGATION_NONAV: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_NAVIGATION_DPAD: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_NAVIGATION_TRACKBALL: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_NAVIGATION_WHEEL: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_KEYSHIDDEN_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_KEYSHIDDEN_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_KEYSHIDDEN_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_KEYSHIDDEN_SOFT: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_NAVHIDDEN_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_NAVHIDDEN_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_NAVHIDDEN_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREENSIZE_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREENSIZE_SMALL: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_SCREENSIZE_NORMAL: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREENSIZE_LARGE: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_SCREENSIZE_XLARGE: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_SCREENLONG_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREENLONG_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_SCREENLONG_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREENROUND_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREENROUND_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_SCREENROUND_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_WIDE_COLOR_GAMUT_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_WIDE_COLOR_GAMUT_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_WIDE_COLOR_GAMUT_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_HDR_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_HDR_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_HDR_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_UI_MODE_TYPE_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_UI_MODE_TYPE_NORMAL: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_UI_MODE_TYPE_DESK: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_UI_MODE_TYPE_CAR: ::std::os::raw::c_uint = 3;
-pub const ACONFIGURATION_UI_MODE_TYPE_TELEVISION: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_UI_MODE_TYPE_APPLIANCE: ::std::os::raw::c_uint = 5;
-pub const ACONFIGURATION_UI_MODE_TYPE_WATCH: ::std::os::raw::c_uint = 6;
-pub const ACONFIGURATION_UI_MODE_TYPE_VR_HEADSET: ::std::os::raw::c_uint = 7;
-pub const ACONFIGURATION_UI_MODE_NIGHT_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_UI_MODE_NIGHT_NO: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_UI_MODE_NIGHT_YES: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_SCREEN_WIDTH_DP_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SCREEN_HEIGHT_DP_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_LAYOUTDIR_ANY: ::std::os::raw::c_uint = 0;
-pub const ACONFIGURATION_LAYOUTDIR_LTR: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_LAYOUTDIR_RTL: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_MCC: ::std::os::raw::c_uint = 1;
-pub const ACONFIGURATION_MNC: ::std::os::raw::c_uint = 2;
-pub const ACONFIGURATION_LOCALE: ::std::os::raw::c_uint = 4;
-pub const ACONFIGURATION_TOUCHSCREEN: ::std::os::raw::c_uint = 8;
-pub const ACONFIGURATION_KEYBOARD: ::std::os::raw::c_uint = 16;
-pub const ACONFIGURATION_KEYBOARD_HIDDEN: ::std::os::raw::c_uint = 32;
-pub const ACONFIGURATION_NAVIGATION: ::std::os::raw::c_uint = 64;
-pub const ACONFIGURATION_ORIENTATION: ::std::os::raw::c_uint = 128;
-pub const ACONFIGURATION_DENSITY: ::std::os::raw::c_uint = 256;
-pub const ACONFIGURATION_SCREEN_SIZE: ::std::os::raw::c_uint = 512;
-pub const ACONFIGURATION_VERSION: ::std::os::raw::c_uint = 1024;
-pub const ACONFIGURATION_SCREEN_LAYOUT: ::std::os::raw::c_uint = 2048;
-pub const ACONFIGURATION_UI_MODE: ::std::os::raw::c_uint = 4096;
-pub const ACONFIGURATION_SMALLEST_SCREEN_SIZE: ::std::os::raw::c_uint = 8192;
-pub const ACONFIGURATION_LAYOUTDIR: ::std::os::raw::c_uint = 16384;
-pub const ACONFIGURATION_SCREEN_ROUND: ::std::os::raw::c_uint = 32768;
-pub const ACONFIGURATION_COLOR_MODE: ::std::os::raw::c_uint = 65536;
-pub const ACONFIGURATION_MNC_ZERO: ::std::os::raw::c_uint = 65535;
+extern "C" {
+    #[doc = " These are getters for Configuration class members. They may be called from\n any thread."]
+    pub fn GameActivity_getOrientation(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getColorMode(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getDensityDpi(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getFontScale(activity: *mut GameActivity) -> f32;
+}
+extern "C" {
+    pub fn GameActivity_getFontWeightAdjustment(
+        activity: *mut GameActivity,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getHardKeyboardHidden(activity: *mut GameActivity)
+        -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getKeyboard(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getKeyboardHidden(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getMcc(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getMnc(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getNavigation(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getNavigationHidden(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getScreenHeightDp(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getScreenLayout(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getScreenWidthDp(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getSmallestScreenWidthDp(
+        activity: *mut GameActivity,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getTouchscreen(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getUIMode(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
+pub const ACONFIGURATION_ORIENTATION_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_ORIENTATION_PORT: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_ORIENTATION_LAND: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_ORIENTATION_SQUARE: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_TOUCHSCREEN_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_TOUCHSCREEN_NOTOUCH: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_TOUCHSCREEN_STYLUS: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_TOUCHSCREEN_FINGER: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_DENSITY_DEFAULT: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_DENSITY_LOW: _bindgen_ty_21 = 120;
+pub const ACONFIGURATION_DENSITY_MEDIUM: _bindgen_ty_21 = 160;
+pub const ACONFIGURATION_DENSITY_TV: _bindgen_ty_21 = 213;
+pub const ACONFIGURATION_DENSITY_HIGH: _bindgen_ty_21 = 240;
+pub const ACONFIGURATION_DENSITY_XHIGH: _bindgen_ty_21 = 320;
+pub const ACONFIGURATION_DENSITY_XXHIGH: _bindgen_ty_21 = 480;
+pub const ACONFIGURATION_DENSITY_XXXHIGH: _bindgen_ty_21 = 640;
+pub const ACONFIGURATION_DENSITY_ANY: _bindgen_ty_21 = 65534;
+pub const ACONFIGURATION_DENSITY_NONE: _bindgen_ty_21 = 65535;
+pub const ACONFIGURATION_KEYBOARD_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_KEYBOARD_NOKEYS: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_KEYBOARD_QWERTY: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_KEYBOARD_12KEY: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_NAVIGATION_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_NAVIGATION_NONAV: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_NAVIGATION_DPAD: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_NAVIGATION_TRACKBALL: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_NAVIGATION_WHEEL: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_KEYSHIDDEN_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_KEYSHIDDEN_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_KEYSHIDDEN_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_KEYSHIDDEN_SOFT: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_NAVHIDDEN_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_NAVHIDDEN_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_NAVHIDDEN_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREENSIZE_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREENSIZE_SMALL: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_SCREENSIZE_NORMAL: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREENSIZE_LARGE: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_SCREENSIZE_XLARGE: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_SCREENLONG_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREENLONG_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_SCREENLONG_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREENROUND_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREENROUND_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_SCREENROUND_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_WIDE_COLOR_GAMUT_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_WIDE_COLOR_GAMUT_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_WIDE_COLOR_GAMUT_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_HDR_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_HDR_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_HDR_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_UI_MODE_TYPE_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_UI_MODE_TYPE_NORMAL: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_UI_MODE_TYPE_DESK: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_UI_MODE_TYPE_CAR: _bindgen_ty_21 = 3;
+pub const ACONFIGURATION_UI_MODE_TYPE_TELEVISION: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_UI_MODE_TYPE_APPLIANCE: _bindgen_ty_21 = 5;
+pub const ACONFIGURATION_UI_MODE_TYPE_WATCH: _bindgen_ty_21 = 6;
+pub const ACONFIGURATION_UI_MODE_TYPE_VR_HEADSET: _bindgen_ty_21 = 7;
+pub const ACONFIGURATION_UI_MODE_NIGHT_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_UI_MODE_NIGHT_NO: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_UI_MODE_NIGHT_YES: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_SCREEN_WIDTH_DP_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SCREEN_HEIGHT_DP_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_LAYOUTDIR_ANY: _bindgen_ty_21 = 0;
+pub const ACONFIGURATION_LAYOUTDIR_LTR: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_LAYOUTDIR_RTL: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_MCC: _bindgen_ty_21 = 1;
+pub const ACONFIGURATION_MNC: _bindgen_ty_21 = 2;
+pub const ACONFIGURATION_LOCALE: _bindgen_ty_21 = 4;
+pub const ACONFIGURATION_TOUCHSCREEN: _bindgen_ty_21 = 8;
+pub const ACONFIGURATION_KEYBOARD: _bindgen_ty_21 = 16;
+pub const ACONFIGURATION_KEYBOARD_HIDDEN: _bindgen_ty_21 = 32;
+pub const ACONFIGURATION_NAVIGATION: _bindgen_ty_21 = 64;
+pub const ACONFIGURATION_ORIENTATION: _bindgen_ty_21 = 128;
+pub const ACONFIGURATION_DENSITY: _bindgen_ty_21 = 256;
+pub const ACONFIGURATION_SCREEN_SIZE: _bindgen_ty_21 = 512;
+pub const ACONFIGURATION_VERSION: _bindgen_ty_21 = 1024;
+pub const ACONFIGURATION_SCREEN_LAYOUT: _bindgen_ty_21 = 2048;
+pub const ACONFIGURATION_UI_MODE: _bindgen_ty_21 = 4096;
+pub const ACONFIGURATION_SMALLEST_SCREEN_SIZE: _bindgen_ty_21 = 8192;
+pub const ACONFIGURATION_LAYOUTDIR: _bindgen_ty_21 = 16384;
+pub const ACONFIGURATION_SCREEN_ROUND: _bindgen_ty_21 = 32768;
+pub const ACONFIGURATION_COLOR_MODE: _bindgen_ty_21 = 65536;
+pub const ACONFIGURATION_MNC_ZERO: _bindgen_ty_21 = 65535;
 pub type _bindgen_ty_21 = ::std::os::raw::c_uint;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -3995,6 +3791,8 @@ pub struct pollfd {
 }
 #[test]
 fn bindgen_test_layout_pollfd() {
+    const UNINIT: ::std::mem::MaybeUninit<pollfd> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<pollfd>(),
         8usize,
@@ -4006,7 +3804,7 @@ fn bindgen_test_layout_pollfd() {
         concat!("Alignment of ", stringify!(pollfd))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<pollfd>())).fd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4016,7 +3814,7 @@ fn bindgen_test_layout_pollfd() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<pollfd>())).events as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).events) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4026,7 +3824,7 @@ fn bindgen_test_layout_pollfd() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<pollfd>())).revents as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).revents) as usize - ptr as usize },
         6usize,
         concat!(
             "Offset of field: ",
@@ -4047,6 +3845,8 @@ pub struct _fpx_sw_bytes {
 }
 #[test]
 fn bindgen_test_layout__fpx_sw_bytes() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpx_sw_bytes> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpx_sw_bytes>(),
         48usize,
@@ -4058,7 +3858,7 @@ fn bindgen_test_layout__fpx_sw_bytes() {
         concat!("Alignment of ", stringify!(_fpx_sw_bytes))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpx_sw_bytes>())).magic1 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).magic1) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4068,7 +3868,7 @@ fn bindgen_test_layout__fpx_sw_bytes() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpx_sw_bytes>())).extended_size as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).extended_size) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4078,7 +3878,7 @@ fn bindgen_test_layout__fpx_sw_bytes() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpx_sw_bytes>())).xfeatures as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xfeatures) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4088,7 +3888,7 @@ fn bindgen_test_layout__fpx_sw_bytes() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpx_sw_bytes>())).xstate_size as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xstate_size) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4098,7 +3898,7 @@ fn bindgen_test_layout__fpx_sw_bytes() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpx_sw_bytes>())).padding as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -4116,6 +3916,8 @@ pub struct _fpreg {
 }
 #[test]
 fn bindgen_test_layout__fpreg() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpreg> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpreg>(),
         10usize,
@@ -4127,7 +3929,7 @@ fn bindgen_test_layout__fpreg() {
         concat!("Alignment of ", stringify!(_fpreg))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpreg>())).significand as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).significand) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4137,7 +3939,7 @@ fn bindgen_test_layout__fpreg() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpreg>())).exponent as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).exponent) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4156,6 +3958,8 @@ pub struct _fpxreg {
 }
 #[test]
 fn bindgen_test_layout__fpxreg() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpxreg> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpxreg>(),
         16usize,
@@ -4167,7 +3971,7 @@ fn bindgen_test_layout__fpxreg() {
         concat!("Alignment of ", stringify!(_fpxreg))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpxreg>())).significand as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).significand) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4177,7 +3981,7 @@ fn bindgen_test_layout__fpxreg() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpxreg>())).exponent as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).exponent) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4187,7 +3991,7 @@ fn bindgen_test_layout__fpxreg() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpxreg>())).padding as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         10usize,
         concat!(
             "Offset of field: ",
@@ -4204,6 +4008,8 @@ pub struct _xmmreg {
 }
 #[test]
 fn bindgen_test_layout__xmmreg() {
+    const UNINIT: ::std::mem::MaybeUninit<_xmmreg> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_xmmreg>(),
         16usize,
@@ -4215,7 +4021,7 @@ fn bindgen_test_layout__xmmreg() {
         concat!("Alignment of ", stringify!(_xmmreg))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_xmmreg>())).element as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).element) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4254,6 +4060,9 @@ pub union _fpstate_32__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout__fpstate_32__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpstate_32__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpstate_32__bindgen_ty_1>(),
         176usize,
@@ -4265,9 +4074,7 @@ fn bindgen_test_layout__fpstate_32__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(_fpstate_32__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<_fpstate_32__bindgen_ty_1>())).padding1 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).padding1) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4277,9 +4084,7 @@ fn bindgen_test_layout__fpstate_32__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<_fpstate_32__bindgen_ty_1>())).padding as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4297,6 +4102,9 @@ pub union _fpstate_32__bindgen_ty_2 {
 }
 #[test]
 fn bindgen_test_layout__fpstate_32__bindgen_ty_2() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpstate_32__bindgen_ty_2> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpstate_32__bindgen_ty_2>(),
         48usize,
@@ -4308,9 +4116,7 @@ fn bindgen_test_layout__fpstate_32__bindgen_ty_2() {
         concat!("Alignment of ", stringify!(_fpstate_32__bindgen_ty_2))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<_fpstate_32__bindgen_ty_2>())).padding2 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).padding2) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4320,9 +4126,7 @@ fn bindgen_test_layout__fpstate_32__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<_fpstate_32__bindgen_ty_2>())).sw_reserved as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sw_reserved) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4334,6 +4138,8 @@ fn bindgen_test_layout__fpstate_32__bindgen_ty_2() {
 }
 #[test]
 fn bindgen_test_layout__fpstate_32() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpstate_32> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpstate_32>(),
         624usize,
@@ -4345,7 +4151,7 @@ fn bindgen_test_layout__fpstate_32() {
         concat!("Alignment of ", stringify!(_fpstate_32))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).cw as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cw) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4355,7 +4161,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).sw as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sw) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4365,7 +4171,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).tag as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tag) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4375,7 +4181,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).ipoff as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ipoff) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -4385,7 +4191,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).cssel as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cssel) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4395,7 +4201,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).dataoff as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).dataoff) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -4405,7 +4211,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).datasel as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).datasel) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -4415,7 +4221,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>()))._st as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._st) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -4425,7 +4231,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).status as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).status) as usize - ptr as usize },
         108usize,
         concat!(
             "Offset of field: ",
@@ -4435,7 +4241,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).magic as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).magic) as usize - ptr as usize },
         110usize,
         concat!(
             "Offset of field: ",
@@ -4445,7 +4251,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>()))._fxsr_env as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._fxsr_env) as usize - ptr as usize },
         112usize,
         concat!(
             "Offset of field: ",
@@ -4455,7 +4261,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).mxcsr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).mxcsr) as usize - ptr as usize },
         136usize,
         concat!(
             "Offset of field: ",
@@ -4465,7 +4271,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>())).reserved as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved) as usize - ptr as usize },
         140usize,
         concat!(
             "Offset of field: ",
@@ -4475,7 +4281,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>()))._fxsr_st as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._fxsr_st) as usize - ptr as usize },
         144usize,
         concat!(
             "Offset of field: ",
@@ -4485,7 +4291,7 @@ fn bindgen_test_layout__fpstate_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_32>()))._xmm as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._xmm) as usize - ptr as usize },
         272usize,
         concat!(
             "Offset of field: ",
@@ -4519,6 +4325,9 @@ pub union _fpstate_64__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout__fpstate_64__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpstate_64__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpstate_64__bindgen_ty_1>(),
         48usize,
@@ -4530,9 +4339,7 @@ fn bindgen_test_layout__fpstate_64__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(_fpstate_64__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<_fpstate_64__bindgen_ty_1>())).reserved3 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved3) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4542,9 +4349,7 @@ fn bindgen_test_layout__fpstate_64__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<_fpstate_64__bindgen_ty_1>())).sw_reserved as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sw_reserved) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4556,6 +4361,8 @@ fn bindgen_test_layout__fpstate_64__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout__fpstate_64() {
+    const UNINIT: ::std::mem::MaybeUninit<_fpstate_64> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_fpstate_64>(),
         512usize,
@@ -4567,7 +4374,7 @@ fn bindgen_test_layout__fpstate_64() {
         concat!("Alignment of ", stringify!(_fpstate_64))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).cwd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cwd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4577,7 +4384,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).swd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).swd) as usize - ptr as usize },
         2usize,
         concat!(
             "Offset of field: ",
@@ -4587,7 +4394,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).twd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).twd) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4597,7 +4404,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).fop as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fop) as usize - ptr as usize },
         6usize,
         concat!(
             "Offset of field: ",
@@ -4607,7 +4414,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).rip as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rip) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4617,7 +4424,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).rdp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rdp) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4627,7 +4434,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).mxcsr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).mxcsr) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -4637,7 +4444,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).mxcsr_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).mxcsr_mask) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -4647,7 +4454,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).st_space as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).st_space) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -4657,7 +4464,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).xmm_space as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xmm_space) as usize - ptr as usize },
         160usize,
         concat!(
             "Offset of field: ",
@@ -4667,7 +4474,7 @@ fn bindgen_test_layout__fpstate_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_fpstate_64>())).reserved2 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved2) as usize - ptr as usize },
         416usize,
         concat!(
             "Offset of field: ",
@@ -4686,6 +4493,8 @@ pub struct _header {
 }
 #[test]
 fn bindgen_test_layout__header() {
+    const UNINIT: ::std::mem::MaybeUninit<_header> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_header>(),
         64usize,
@@ -4697,7 +4506,7 @@ fn bindgen_test_layout__header() {
         concat!("Alignment of ", stringify!(_header))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_header>())).xfeatures as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xfeatures) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4707,7 +4516,7 @@ fn bindgen_test_layout__header() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_header>())).reserved1 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved1) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4717,7 +4526,7 @@ fn bindgen_test_layout__header() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_header>())).reserved2 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved2) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -4734,6 +4543,8 @@ pub struct _ymmh_state {
 }
 #[test]
 fn bindgen_test_layout__ymmh_state() {
+    const UNINIT: ::std::mem::MaybeUninit<_ymmh_state> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_ymmh_state>(),
         256usize,
@@ -4745,7 +4556,7 @@ fn bindgen_test_layout__ymmh_state() {
         concat!("Alignment of ", stringify!(_ymmh_state))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_ymmh_state>())).ymmh_space as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ymmh_space) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4764,6 +4575,8 @@ pub struct _xstate {
 }
 #[test]
 fn bindgen_test_layout__xstate() {
+    const UNINIT: ::std::mem::MaybeUninit<_xstate> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_xstate>(),
         832usize,
@@ -4775,7 +4588,7 @@ fn bindgen_test_layout__xstate() {
         concat!("Alignment of ", stringify!(_xstate))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_xstate>())).fpstate as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4785,7 +4598,7 @@ fn bindgen_test_layout__xstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_xstate>())).xstate_hdr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xstate_hdr) as usize - ptr as usize },
         512usize,
         concat!(
             "Offset of field: ",
@@ -4795,7 +4608,7 @@ fn bindgen_test_layout__xstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_xstate>())).ymmh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ymmh) as usize - ptr as usize },
         576usize,
         concat!(
             "Offset of field: ",
@@ -4839,6 +4652,8 @@ pub struct sigcontext_32 {
 }
 #[test]
 fn bindgen_test_layout_sigcontext_32() {
+    const UNINIT: ::std::mem::MaybeUninit<sigcontext_32> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigcontext_32>(),
         88usize,
@@ -4850,7 +4665,7 @@ fn bindgen_test_layout_sigcontext_32() {
         concat!("Alignment of ", stringify!(sigcontext_32))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).gs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).gs) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -4860,7 +4675,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).__gsh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__gsh) as usize - ptr as usize },
         2usize,
         concat!(
             "Offset of field: ",
@@ -4870,7 +4685,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).fs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fs) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -4880,7 +4695,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).__fsh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__fsh) as usize - ptr as usize },
         6usize,
         concat!(
             "Offset of field: ",
@@ -4890,7 +4705,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).es as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).es) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -4900,7 +4715,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).__esh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__esh) as usize - ptr as usize },
         10usize,
         concat!(
             "Offset of field: ",
@@ -4910,7 +4725,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).ds as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ds) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -4920,7 +4735,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).__dsh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__dsh) as usize - ptr as usize },
         14usize,
         concat!(
             "Offset of field: ",
@@ -4930,7 +4745,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).di as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).di) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -4940,7 +4755,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).si as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).si) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -4950,7 +4765,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).bp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).bp) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -4960,7 +4775,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).sp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sp) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -4970,7 +4785,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).bx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).bx) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -4980,7 +4795,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).dx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).dx) as usize - ptr as usize },
         36usize,
         concat!(
             "Offset of field: ",
@@ -4990,7 +4805,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).cx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cx) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -5000,7 +4815,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).ax as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ax) as usize - ptr as usize },
         44usize,
         concat!(
             "Offset of field: ",
@@ -5010,7 +4825,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).trapno as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).trapno) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -5020,7 +4835,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).err as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).err) as usize - ptr as usize },
         52usize,
         concat!(
             "Offset of field: ",
@@ -5030,7 +4845,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).ip as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ip) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -5040,7 +4855,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).cs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cs) as usize - ptr as usize },
         60usize,
         concat!(
             "Offset of field: ",
@@ -5050,7 +4865,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).__csh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__csh) as usize - ptr as usize },
         62usize,
         concat!(
             "Offset of field: ",
@@ -5060,7 +4875,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         64usize,
         concat!(
             "Offset of field: ",
@@ -5070,7 +4885,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).sp_at_signal as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sp_at_signal) as usize - ptr as usize },
         68usize,
         concat!(
             "Offset of field: ",
@@ -5080,7 +4895,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).ss as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss) as usize - ptr as usize },
         72usize,
         concat!(
             "Offset of field: ",
@@ -5090,7 +4905,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).__ssh as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__ssh) as usize - ptr as usize },
         74usize,
         concat!(
             "Offset of field: ",
@@ -5100,7 +4915,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).fpstate as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         76usize,
         concat!(
             "Offset of field: ",
@@ -5110,7 +4925,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).oldmask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         80usize,
         concat!(
             "Offset of field: ",
@@ -5120,7 +4935,7 @@ fn bindgen_test_layout_sigcontext_32() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_32>())).cr2 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cr2) as usize - ptr as usize },
         84usize,
         concat!(
             "Offset of field: ",
@@ -5164,6 +4979,8 @@ pub struct sigcontext_64 {
 }
 #[test]
 fn bindgen_test_layout_sigcontext_64() {
+    const UNINIT: ::std::mem::MaybeUninit<sigcontext_64> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigcontext_64>(),
         256usize,
@@ -5175,7 +4992,7 @@ fn bindgen_test_layout_sigcontext_64() {
         concat!("Alignment of ", stringify!(sigcontext_64))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r8 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r8) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5185,7 +5002,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r9 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r9) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5195,7 +5012,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r10 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r10) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -5205,7 +5022,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r11 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r11) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -5215,7 +5032,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r12 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r12) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -5225,7 +5042,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r13 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r13) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -5235,7 +5052,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r14 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r14) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -5245,7 +5062,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).r15 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r15) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -5255,7 +5072,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).di as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).di) as usize - ptr as usize },
         64usize,
         concat!(
             "Offset of field: ",
@@ -5265,7 +5082,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).si as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).si) as usize - ptr as usize },
         72usize,
         concat!(
             "Offset of field: ",
@@ -5275,7 +5092,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).bp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).bp) as usize - ptr as usize },
         80usize,
         concat!(
             "Offset of field: ",
@@ -5285,7 +5102,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).bx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).bx) as usize - ptr as usize },
         88usize,
         concat!(
             "Offset of field: ",
@@ -5295,7 +5112,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).dx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).dx) as usize - ptr as usize },
         96usize,
         concat!(
             "Offset of field: ",
@@ -5305,7 +5122,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).ax as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ax) as usize - ptr as usize },
         104usize,
         concat!(
             "Offset of field: ",
@@ -5315,7 +5132,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).cx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cx) as usize - ptr as usize },
         112usize,
         concat!(
             "Offset of field: ",
@@ -5325,7 +5142,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).sp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sp) as usize - ptr as usize },
         120usize,
         concat!(
             "Offset of field: ",
@@ -5335,7 +5152,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).ip as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ip) as usize - ptr as usize },
         128usize,
         concat!(
             "Offset of field: ",
@@ -5345,7 +5162,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         136usize,
         concat!(
             "Offset of field: ",
@@ -5355,7 +5172,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).cs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cs) as usize - ptr as usize },
         144usize,
         concat!(
             "Offset of field: ",
@@ -5365,7 +5182,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).gs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).gs) as usize - ptr as usize },
         146usize,
         concat!(
             "Offset of field: ",
@@ -5375,7 +5192,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).fs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fs) as usize - ptr as usize },
         148usize,
         concat!(
             "Offset of field: ",
@@ -5385,7 +5202,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).ss as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss) as usize - ptr as usize },
         150usize,
         concat!(
             "Offset of field: ",
@@ -5395,7 +5212,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).err as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).err) as usize - ptr as usize },
         152usize,
         concat!(
             "Offset of field: ",
@@ -5405,7 +5222,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).trapno as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).trapno) as usize - ptr as usize },
         160usize,
         concat!(
             "Offset of field: ",
@@ -5415,7 +5232,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).oldmask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         168usize,
         concat!(
             "Offset of field: ",
@@ -5425,7 +5242,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).cr2 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cr2) as usize - ptr as usize },
         176usize,
         concat!(
             "Offset of field: ",
@@ -5435,7 +5252,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).fpstate as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         184usize,
         concat!(
             "Offset of field: ",
@@ -5445,7 +5262,7 @@ fn bindgen_test_layout_sigcontext_64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext_64>())).reserved1 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved1) as usize - ptr as usize },
         192usize,
         concat!(
             "Offset of field: ",
@@ -5495,6 +5312,9 @@ pub union sigcontext__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_sigcontext__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigcontext__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigcontext__bindgen_ty_1>(),
         2usize,
@@ -5506,7 +5326,7 @@ fn bindgen_test_layout_sigcontext__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(sigcontext__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext__bindgen_ty_1>())).ss as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5516,7 +5336,7 @@ fn bindgen_test_layout_sigcontext__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext__bindgen_ty_1>())).__pad0 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__pad0) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5528,6 +5348,8 @@ fn bindgen_test_layout_sigcontext__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigcontext() {
+    const UNINIT: ::std::mem::MaybeUninit<sigcontext> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigcontext>(),
         256usize,
@@ -5539,7 +5361,7 @@ fn bindgen_test_layout_sigcontext() {
         concat!("Alignment of ", stringify!(sigcontext))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).r8 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r8) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5549,7 +5371,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).r9 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r9) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5559,7 +5381,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).r10 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r10) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -5569,7 +5391,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).r11 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r11) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -5579,7 +5401,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).r12 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r12) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -5589,7 +5411,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).r13 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r13) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -5599,7 +5421,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).r14 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r14) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -5609,7 +5431,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).r15 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r15) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -5619,7 +5441,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).rdi as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rdi) as usize - ptr as usize },
         64usize,
         concat!(
             "Offset of field: ",
@@ -5629,7 +5451,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).rsi as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rsi) as usize - ptr as usize },
         72usize,
         concat!(
             "Offset of field: ",
@@ -5639,7 +5461,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).rbp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rbp) as usize - ptr as usize },
         80usize,
         concat!(
             "Offset of field: ",
@@ -5649,7 +5471,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).rbx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rbx) as usize - ptr as usize },
         88usize,
         concat!(
             "Offset of field: ",
@@ -5659,7 +5481,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).rdx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rdx) as usize - ptr as usize },
         96usize,
         concat!(
             "Offset of field: ",
@@ -5669,7 +5491,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).rax as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rax) as usize - ptr as usize },
         104usize,
         concat!(
             "Offset of field: ",
@@ -5679,7 +5501,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).rcx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rcx) as usize - ptr as usize },
         112usize,
         concat!(
             "Offset of field: ",
@@ -5689,7 +5511,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).rsp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rsp) as usize - ptr as usize },
         120usize,
         concat!(
             "Offset of field: ",
@@ -5699,7 +5521,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).rip as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rip) as usize - ptr as usize },
         128usize,
         concat!(
             "Offset of field: ",
@@ -5709,7 +5531,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).eflags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).eflags) as usize - ptr as usize },
         136usize,
         concat!(
             "Offset of field: ",
@@ -5719,7 +5541,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).cs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cs) as usize - ptr as usize },
         144usize,
         concat!(
             "Offset of field: ",
@@ -5729,7 +5551,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).gs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).gs) as usize - ptr as usize },
         146usize,
         concat!(
             "Offset of field: ",
@@ -5739,7 +5561,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).fs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fs) as usize - ptr as usize },
         148usize,
         concat!(
             "Offset of field: ",
@@ -5749,7 +5571,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).err as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).err) as usize - ptr as usize },
         152usize,
         concat!(
             "Offset of field: ",
@@ -5759,7 +5581,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).trapno as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).trapno) as usize - ptr as usize },
         160usize,
         concat!(
             "Offset of field: ",
@@ -5769,7 +5591,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).oldmask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         168usize,
         concat!(
             "Offset of field: ",
@@ -5779,7 +5601,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).cr2 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cr2) as usize - ptr as usize },
         176usize,
         concat!(
             "Offset of field: ",
@@ -5789,7 +5611,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).fpstate as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         184usize,
         concat!(
             "Offset of field: ",
@@ -5799,7 +5621,7 @@ fn bindgen_test_layout_sigcontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigcontext>())).reserved1 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved1) as usize - ptr as usize },
         192usize,
         concat!(
             "Offset of field: ",
@@ -5817,6 +5639,8 @@ pub struct __kernel_timespec {
 }
 #[test]
 fn bindgen_test_layout___kernel_timespec() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_timespec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_timespec>(),
         16usize,
@@ -5828,7 +5652,7 @@ fn bindgen_test_layout___kernel_timespec() {
         concat!("Alignment of ", stringify!(__kernel_timespec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_timespec>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5838,7 +5662,7 @@ fn bindgen_test_layout___kernel_timespec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_timespec>())).tv_nsec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5856,6 +5680,8 @@ pub struct __kernel_itimerspec {
 }
 #[test]
 fn bindgen_test_layout___kernel_itimerspec() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_itimerspec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_itimerspec>(),
         32usize,
@@ -5867,7 +5693,7 @@ fn bindgen_test_layout___kernel_itimerspec() {
         concat!("Alignment of ", stringify!(__kernel_itimerspec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_itimerspec>())).it_interval as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5877,7 +5703,7 @@ fn bindgen_test_layout___kernel_itimerspec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_itimerspec>())).it_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -5889,40 +5715,43 @@ fn bindgen_test_layout___kernel_itimerspec() {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct __kernel_old_timeval {
-    pub tv_sec: __kernel_long_t,
-    pub tv_usec: __kernel_long_t,
+pub struct __kernel_old_timespec {
+    pub tv_sec: __kernel_old_time_t,
+    pub tv_nsec: ::std::os::raw::c_long,
 }
 #[test]
-fn bindgen_test_layout___kernel_old_timeval() {
+fn bindgen_test_layout___kernel_old_timespec() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_old_timespec> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
-        ::std::mem::size_of::<__kernel_old_timeval>(),
+        ::std::mem::size_of::<__kernel_old_timespec>(),
         16usize,
-        concat!("Size of: ", stringify!(__kernel_old_timeval))
+        concat!("Size of: ", stringify!(__kernel_old_timespec))
     );
     assert_eq!(
-        ::std::mem::align_of::<__kernel_old_timeval>(),
+        ::std::mem::align_of::<__kernel_old_timespec>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_old_timeval))
+        concat!("Alignment of ", stringify!(__kernel_old_timespec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_old_timeval>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
-            stringify!(__kernel_old_timeval),
+            stringify!(__kernel_old_timespec),
             "::",
             stringify!(tv_sec)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_old_timeval>())).tv_usec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
-            stringify!(__kernel_old_timeval),
+            stringify!(__kernel_old_timespec),
             "::",
-            stringify!(tv_usec)
+            stringify!(tv_nsec)
         )
     );
 }
@@ -5934,6 +5763,9 @@ pub struct __kernel_sock_timeval {
 }
 #[test]
 fn bindgen_test_layout___kernel_sock_timeval() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_sock_timeval> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_sock_timeval>(),
         16usize,
@@ -5945,7 +5777,7 @@ fn bindgen_test_layout___kernel_sock_timeval() {
         concat!("Alignment of ", stringify!(__kernel_sock_timeval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sock_timeval>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5955,7 +5787,7 @@ fn bindgen_test_layout___kernel_sock_timeval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sock_timeval>())).tv_usec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -5968,11 +5800,13 @@ fn bindgen_test_layout___kernel_sock_timeval() {
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct timespec {
-    pub tv_sec: __kernel_time_t,
+    pub tv_sec: __kernel_old_time_t,
     pub tv_nsec: ::std::os::raw::c_long,
 }
 #[test]
 fn bindgen_test_layout_timespec() {
+    const UNINIT: ::std::mem::MaybeUninit<timespec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<timespec>(),
         16usize,
@@ -5984,7 +5818,7 @@ fn bindgen_test_layout_timespec() {
         concat!("Alignment of ", stringify!(timespec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timespec>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -5994,7 +5828,7 @@ fn bindgen_test_layout_timespec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timespec>())).tv_nsec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6007,11 +5841,13 @@ fn bindgen_test_layout_timespec() {
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct timeval {
-    pub tv_sec: __kernel_time_t,
+    pub tv_sec: __kernel_old_time_t,
     pub tv_usec: __kernel_suseconds_t,
 }
 #[test]
 fn bindgen_test_layout_timeval() {
+    const UNINIT: ::std::mem::MaybeUninit<timeval> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<timeval>(),
         16usize,
@@ -6023,7 +5859,7 @@ fn bindgen_test_layout_timeval() {
         concat!("Alignment of ", stringify!(timeval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timeval>())).tv_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6033,7 +5869,7 @@ fn bindgen_test_layout_timeval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timeval>())).tv_usec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6045,51 +5881,14 @@ fn bindgen_test_layout_timeval() {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct timezone {
-    pub tz_minuteswest: ::std::os::raw::c_int,
-    pub tz_dsttime: ::std::os::raw::c_int,
-}
-#[test]
-fn bindgen_test_layout_timezone() {
-    assert_eq!(
-        ::std::mem::size_of::<timezone>(),
-        8usize,
-        concat!("Size of: ", stringify!(timezone))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<timezone>(),
-        4usize,
-        concat!("Alignment of ", stringify!(timezone))
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timezone>())).tz_minuteswest as *const _ as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_minuteswest)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<timezone>())).tz_dsttime as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_dsttime)
-        )
-    );
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
 pub struct itimerspec {
     pub it_interval: timespec,
     pub it_value: timespec,
 }
 #[test]
 fn bindgen_test_layout_itimerspec() {
+    const UNINIT: ::std::mem::MaybeUninit<itimerspec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<itimerspec>(),
         32usize,
@@ -6101,7 +5900,7 @@ fn bindgen_test_layout_itimerspec() {
         concat!("Alignment of ", stringify!(itimerspec))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerspec>())).it_interval as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6111,7 +5910,7 @@ fn bindgen_test_layout_itimerspec() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerspec>())).it_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -6129,6 +5928,8 @@ pub struct itimerval {
 }
 #[test]
 fn bindgen_test_layout_itimerval() {
+    const UNINIT: ::std::mem::MaybeUninit<itimerval> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<itimerval>(),
         32usize,
@@ -6140,7 +5941,7 @@ fn bindgen_test_layout_itimerval() {
         concat!("Alignment of ", stringify!(itimerval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerval>())).it_interval as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6150,7 +5951,7 @@ fn bindgen_test_layout_itimerval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<itimerval>())).it_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -6160,6 +5961,47 @@ fn bindgen_test_layout_itimerval() {
         )
     );
 }
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct timezone {
+    pub tz_minuteswest: ::std::os::raw::c_int,
+    pub tz_dsttime: ::std::os::raw::c_int,
+}
+#[test]
+fn bindgen_test_layout_timezone() {
+    const UNINIT: ::std::mem::MaybeUninit<timezone> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<timezone>(),
+        8usize,
+        concat!("Size of: ", stringify!(timezone))
+    );
+    assert_eq!(
+        ::std::mem::align_of::<timezone>(),
+        4usize,
+        concat!("Alignment of ", stringify!(timezone))
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).tz_minuteswest) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(timezone),
+            "::",
+            stringify!(tz_minuteswest)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).tz_dsttime) as usize - ptr as usize },
+        4usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(timezone),
+            "::",
+            stringify!(tz_dsttime)
+        )
+    );
+}
 pub type sigset_t = ::std::os::raw::c_ulong;
 pub type __signalfn_t = ::std::option::Option<unsafe extern "C" fn(arg1: ::std::os::raw::c_int)>;
 pub type __sighandler_t = __signalfn_t;
@@ -6175,6 +6017,8 @@ pub struct __kernel_sigaction {
 }
 #[test]
 fn bindgen_test_layout___kernel_sigaction() {
+    const UNINIT: ::std::mem::MaybeUninit<__kernel_sigaction> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__kernel_sigaction>(),
         32usize,
@@ -6186,7 +6030,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         concat!("Alignment of ", stringify!(__kernel_sigaction))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>())).sa_handler as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6196,7 +6040,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>())).sa_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6206,7 +6050,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>())).sa_restorer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -6216,7 +6060,7 @@ fn bindgen_test_layout___kernel_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__kernel_sigaction>())).sa_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -6227,13 +6071,16 @@ fn bindgen_test_layout___kernel_sigaction() {
     );
 }
 #[repr(C)]
+#[derive(Debug, Copy, Clone)]
 pub struct sigaltstack {
     pub ss_sp: *mut ::std::os::raw::c_void,
     pub ss_flags: ::std::os::raw::c_int,
-    pub ss_size: size_t,
+    pub ss_size: __kernel_size_t,
 }
 #[test]
 fn bindgen_test_layout_sigaltstack() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaltstack> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaltstack>(),
         24usize,
@@ -6245,7 +6092,7 @@ fn bindgen_test_layout_sigaltstack() {
         concat!("Alignment of ", stringify!(sigaltstack))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaltstack>())).ss_sp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss_sp) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6255,7 +6102,7 @@ fn bindgen_test_layout_sigaltstack() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaltstack>())).ss_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss_flags) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6265,7 +6112,7 @@ fn bindgen_test_layout_sigaltstack() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaltstack>())).ss_size as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss_size) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -6284,6 +6131,8 @@ pub union sigval {
 }
 #[test]
 fn bindgen_test_layout_sigval() {
+    const UNINIT: ::std::mem::MaybeUninit<sigval> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigval>(),
         8usize,
@@ -6295,7 +6144,7 @@ fn bindgen_test_layout_sigval() {
         concat!("Alignment of ", stringify!(sigval))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigval>())).sival_int as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sival_int) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6305,7 +6154,7 @@ fn bindgen_test_layout_sigval() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigval>())).sival_ptr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sival_ptr) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6335,6 +6184,9 @@ pub struct __sifields__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_1>(),
         8usize,
@@ -6346,7 +6198,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_1>()))._pid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6356,7 +6208,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_1>()))._uid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6376,6 +6228,9 @@ pub struct __sifields__bindgen_ty_2 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_2() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_2> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_2>(),
         24usize,
@@ -6387,7 +6242,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_2))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6397,9 +6252,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._overrun as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._overrun) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6409,9 +6262,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._sigval as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6421,9 +6272,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_2>()))._sys_private as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sys_private) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -6442,6 +6291,9 @@ pub struct __sifields__bindgen_ty_3 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_3() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_3> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_3>(),
         16usize,
@@ -6453,7 +6305,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_3))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_3>()))._pid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6463,7 +6315,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_3>()))._uid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6473,9 +6325,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_3>()))._sigval as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6496,6 +6346,9 @@ pub struct __sifields__bindgen_ty_4 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_4() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_4> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_4>(),
         32usize,
@@ -6507,7 +6360,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_4))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._pid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6517,7 +6370,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._uid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -6527,9 +6380,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._status as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._status) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6539,7 +6390,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._utime as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._utime) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -6549,7 +6400,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_4>()))._stime as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._stime) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -6568,9 +6419,11 @@ pub struct __sifields__bindgen_ty_5 {
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub union __sifields__bindgen_ty_5__bindgen_ty_1 {
+    pub _trapno: ::std::os::raw::c_int,
     pub _addr_lsb: ::std::os::raw::c_short,
     pub _addr_bnd: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1,
     pub _addr_pkey: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2,
+    pub _perf: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -6581,6 +6434,9 @@ pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>(),
         24usize,
@@ -6598,10 +6454,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>()))
-                ._dummy_bnd as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._dummy_bnd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6611,10 +6464,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>()))._lower
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._lower) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6624,10 +6474,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>()))._upper
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._upper) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -6645,6 +6492,9 @@ pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>(),
         12usize,
@@ -6662,10 +6512,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>()))
-                ._dummy_pkey as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._dummy_pkey) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6675,10 +6522,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>()))._pkey
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pkey) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6688,8 +6532,59 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
         )
     );
 }
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3 {
+    pub _data: ::std::os::raw::c_ulong,
+    pub _type: __u32,
+}
+#[test]
+fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
+        16usize,
+        concat!(
+            "Size of: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
+        )
+    );
+    assert_eq!(
+        ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
+        8usize,
+        concat!(
+            "Alignment of ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._data) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
+            "::",
+            stringify!(_data)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._type) as usize - ptr as usize },
+        8usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
+            "::",
+            stringify!(_type)
+        )
+    );
+}
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1>(),
         24usize,
@@ -6707,10 +6602,17 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1>()))._addr_lsb as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._trapno) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
+            "::",
+            stringify!(_trapno)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr_lsb) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6720,10 +6622,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1>()))._addr_bnd as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr_bnd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6733,10 +6632,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_5__bindgen_ty_1>()))._addr_pkey
-                as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr_pkey) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6745,9 +6641,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
             stringify!(_addr_pkey)
         )
     );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._perf) as usize - ptr as usize },
+        0usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
+            "::",
+            stringify!(_perf)
+        )
+    );
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_5> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5>(),
         32usize,
@@ -6759,7 +6668,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_5))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_5>()))._addr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._addr) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6777,6 +6686,9 @@ pub struct __sifields__bindgen_ty_6 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_6() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_6> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_6>(),
         16usize,
@@ -6788,7 +6700,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_6() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_6))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_6>()))._band as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._band) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6798,7 +6710,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_6() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_6>()))._fd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._fd) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6817,6 +6729,9 @@ pub struct __sifields__bindgen_ty_7 {
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_7() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields__bindgen_ty_7> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_7>(),
         16usize,
@@ -6828,9 +6743,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
         concat!("Alignment of ", stringify!(__sifields__bindgen_ty_7))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_7>()))._call_addr as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._call_addr) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6840,9 +6753,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__sifields__bindgen_ty_7>()))._syscall as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._syscall) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -6852,7 +6763,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields__bindgen_ty_7>()))._arch as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._arch) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -6864,6 +6775,8 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
 }
 #[test]
 fn bindgen_test_layout___sifields() {
+    const UNINIT: ::std::mem::MaybeUninit<__sifields> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields>(),
         32usize,
@@ -6875,7 +6788,7 @@ fn bindgen_test_layout___sifields() {
         concat!("Alignment of ", stringify!(__sifields))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._kill as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._kill) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6885,7 +6798,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._timer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._timer) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6895,7 +6808,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._rt as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._rt) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6905,7 +6818,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigchld as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigchld) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6915,7 +6828,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigfault as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigfault) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6925,7 +6838,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigpoll as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigpoll) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6935,7 +6848,7 @@ fn bindgen_test_layout___sifields() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__sifields>()))._sigsys as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigsys) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6966,6 +6879,9 @@ pub struct siginfo__bindgen_ty_1__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<siginfo__bindgen_ty_1__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1__bindgen_ty_1>(),
         48usize,
@@ -6980,10 +6896,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>())).si_signo as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).si_signo) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -6993,10 +6906,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>())).si_errno as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).si_errno) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -7006,10 +6916,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>())).si_code as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).si_code) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7019,10 +6926,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<siginfo__bindgen_ty_1__bindgen_ty_1>()))._sifields as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sifields) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -7034,6 +6938,9 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_siginfo__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<siginfo__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1>(),
         128usize,
@@ -7045,7 +6952,7 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(siginfo__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<siginfo__bindgen_ty_1>()))._si_pad as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._si_pad) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7092,6 +6999,9 @@ pub struct sigevent__bindgen_ty_1__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigevent__bindgen_ty_1__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1__bindgen_ty_1>(),
         16usize,
@@ -7109,10 +7019,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigevent__bindgen_ty_1__bindgen_ty_1>()))._function as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._function) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7122,10 +7029,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigevent__bindgen_ty_1__bindgen_ty_1>()))._attribute as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._attribute) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7137,6 +7041,9 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigevent__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigevent__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1>(),
         48usize,
@@ -7148,7 +7055,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(sigevent__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent__bindgen_ty_1>()))._pad as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._pad) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7158,7 +7065,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent__bindgen_ty_1>()))._tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7168,9 +7075,7 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigevent__bindgen_ty_1>()))._sigev_thread as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigev_thread) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7182,6 +7087,8 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigevent() {
+    const UNINIT: ::std::mem::MaybeUninit<sigevent> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigevent>(),
         64usize,
@@ -7193,7 +7100,7 @@ fn bindgen_test_layout_sigevent() {
         concat!("Alignment of ", stringify!(sigevent))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>())).sigev_value as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sigev_value) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7203,7 +7110,7 @@ fn bindgen_test_layout_sigevent() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>())).sigev_signo as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sigev_signo) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7213,7 +7120,7 @@ fn bindgen_test_layout_sigevent() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>())).sigev_notify as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sigev_notify) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -7223,7 +7130,7 @@ fn bindgen_test_layout_sigevent() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigevent>()))._sigev_un as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._sigev_un) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -7260,6 +7167,9 @@ pub union sigaction__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_sigaction__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction__bindgen_ty_1>(),
         8usize,
@@ -7271,9 +7181,7 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(sigaction__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction__bindgen_ty_1>())).sa_handler as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7283,9 +7191,7 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction__bindgen_ty_1>())).sa_sigaction as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7297,6 +7203,8 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigaction() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction>(),
         32usize,
@@ -7308,7 +7216,7 @@ fn bindgen_test_layout_sigaction() {
         concat!("Alignment of ", stringify!(sigaction))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction>())).sa_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7318,7 +7226,7 @@ fn bindgen_test_layout_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction>())).sa_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -7328,7 +7236,7 @@ fn bindgen_test_layout_sigaction() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction>())).sa_restorer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -7360,6 +7268,9 @@ pub union sigaction64__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction64__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction64__bindgen_ty_1>(),
         8usize,
@@ -7371,9 +7282,7 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(sigaction64__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction64__bindgen_ty_1>())).sa_handler as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7383,9 +7292,7 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sigaction64__bindgen_ty_1>())).sa_sigaction as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7397,6 +7304,8 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_sigaction64() {
+    const UNINIT: ::std::mem::MaybeUninit<sigaction64> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sigaction64>(),
         32usize,
@@ -7408,7 +7317,7 @@ fn bindgen_test_layout_sigaction64() {
         concat!("Alignment of ", stringify!(sigaction64))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction64>())).sa_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7418,7 +7327,7 @@ fn bindgen_test_layout_sigaction64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction64>())).sa_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -7428,7 +7337,7 @@ fn bindgen_test_layout_sigaction64() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sigaction64>())).sa_restorer as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -7455,6 +7364,8 @@ pub struct user_fpregs_struct {
 }
 #[test]
 fn bindgen_test_layout_user_fpregs_struct() {
+    const UNINIT: ::std::mem::MaybeUninit<user_fpregs_struct> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<user_fpregs_struct>(),
         512usize,
@@ -7466,7 +7377,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         concat!("Alignment of ", stringify!(user_fpregs_struct))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).cwd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cwd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7476,7 +7387,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).swd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).swd) as usize - ptr as usize },
         2usize,
         concat!(
             "Offset of field: ",
@@ -7486,7 +7397,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).ftw as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ftw) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -7496,7 +7407,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).fop as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fop) as usize - ptr as usize },
         6usize,
         concat!(
             "Offset of field: ",
@@ -7506,7 +7417,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).rip as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rip) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7516,7 +7427,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).rdp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rdp) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -7526,7 +7437,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).mxcsr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).mxcsr) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -7536,7 +7447,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).mxcr_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).mxcr_mask) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -7546,7 +7457,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).st_space as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).st_space) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -7556,7 +7467,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).xmm_space as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).xmm_space) as usize - ptr as usize },
         160usize,
         concat!(
             "Offset of field: ",
@@ -7566,7 +7477,7 @@ fn bindgen_test_layout_user_fpregs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_fpregs_struct>())).padding as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         416usize,
         concat!(
             "Offset of field: ",
@@ -7609,6 +7520,8 @@ pub struct user_regs_struct {
 }
 #[test]
 fn bindgen_test_layout_user_regs_struct() {
+    const UNINIT: ::std::mem::MaybeUninit<user_regs_struct> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<user_regs_struct>(),
         216usize,
@@ -7620,7 +7533,7 @@ fn bindgen_test_layout_user_regs_struct() {
         concat!("Alignment of ", stringify!(user_regs_struct))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).r15 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r15) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7630,7 +7543,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).r14 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r14) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -7640,7 +7553,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).r13 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r13) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -7650,7 +7563,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).r12 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r12) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -7660,7 +7573,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).rbp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rbp) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -7670,7 +7583,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).rbx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rbx) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -7680,7 +7593,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).r11 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r11) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -7690,7 +7603,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).r10 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r10) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -7700,7 +7613,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).r9 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r9) as usize - ptr as usize },
         64usize,
         concat!(
             "Offset of field: ",
@@ -7710,7 +7623,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).r8 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).r8) as usize - ptr as usize },
         72usize,
         concat!(
             "Offset of field: ",
@@ -7720,7 +7633,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).rax as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rax) as usize - ptr as usize },
         80usize,
         concat!(
             "Offset of field: ",
@@ -7730,7 +7643,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).rcx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rcx) as usize - ptr as usize },
         88usize,
         concat!(
             "Offset of field: ",
@@ -7740,7 +7653,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).rdx as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rdx) as usize - ptr as usize },
         96usize,
         concat!(
             "Offset of field: ",
@@ -7750,7 +7663,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).rsi as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rsi) as usize - ptr as usize },
         104usize,
         concat!(
             "Offset of field: ",
@@ -7760,7 +7673,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).rdi as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rdi) as usize - ptr as usize },
         112usize,
         concat!(
             "Offset of field: ",
@@ -7770,7 +7683,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).orig_rax as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).orig_rax) as usize - ptr as usize },
         120usize,
         concat!(
             "Offset of field: ",
@@ -7780,7 +7693,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).rip as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rip) as usize - ptr as usize },
         128usize,
         concat!(
             "Offset of field: ",
@@ -7790,7 +7703,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).cs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cs) as usize - ptr as usize },
         136usize,
         concat!(
             "Offset of field: ",
@@ -7800,7 +7713,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).eflags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).eflags) as usize - ptr as usize },
         144usize,
         concat!(
             "Offset of field: ",
@@ -7810,7 +7723,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).rsp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rsp) as usize - ptr as usize },
         152usize,
         concat!(
             "Offset of field: ",
@@ -7820,7 +7733,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).ss as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ss) as usize - ptr as usize },
         160usize,
         concat!(
             "Offset of field: ",
@@ -7830,7 +7743,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).fs_base as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fs_base) as usize - ptr as usize },
         168usize,
         concat!(
             "Offset of field: ",
@@ -7840,7 +7753,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).gs_base as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).gs_base) as usize - ptr as usize },
         176usize,
         concat!(
             "Offset of field: ",
@@ -7850,7 +7763,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).ds as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ds) as usize - ptr as usize },
         184usize,
         concat!(
             "Offset of field: ",
@@ -7860,7 +7773,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).es as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).es) as usize - ptr as usize },
         192usize,
         concat!(
             "Offset of field: ",
@@ -7870,7 +7783,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).fs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fs) as usize - ptr as usize },
         200usize,
         concat!(
             "Offset of field: ",
@@ -7880,7 +7793,7 @@ fn bindgen_test_layout_user_regs_struct() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user_regs_struct>())).gs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).gs) as usize - ptr as usize },
         208usize,
         concat!(
             "Offset of field: ",
@@ -7915,6 +7828,8 @@ pub struct user {
 }
 #[test]
 fn bindgen_test_layout_user() {
+    const UNINIT: ::std::mem::MaybeUninit<user> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<user>(),
         928usize,
@@ -7926,7 +7841,7 @@ fn bindgen_test_layout_user() {
         concat!("Alignment of ", stringify!(user))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).regs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).regs) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -7936,7 +7851,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_fpvalid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_fpvalid) as usize - ptr as usize },
         216usize,
         concat!(
             "Offset of field: ",
@@ -7946,7 +7861,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).pad0 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).pad0) as usize - ptr as usize },
         220usize,
         concat!(
             "Offset of field: ",
@@ -7956,7 +7871,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).i387 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).i387) as usize - ptr as usize },
         224usize,
         concat!(
             "Offset of field: ",
@@ -7966,7 +7881,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_tsize as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_tsize) as usize - ptr as usize },
         736usize,
         concat!(
             "Offset of field: ",
@@ -7976,7 +7891,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_dsize as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_dsize) as usize - ptr as usize },
         744usize,
         concat!(
             "Offset of field: ",
@@ -7986,7 +7901,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_ssize as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_ssize) as usize - ptr as usize },
         752usize,
         concat!(
             "Offset of field: ",
@@ -7996,7 +7911,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).start_code as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).start_code) as usize - ptr as usize },
         760usize,
         concat!(
             "Offset of field: ",
@@ -8006,7 +7921,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).start_stack as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).start_stack) as usize - ptr as usize },
         768usize,
         concat!(
             "Offset of field: ",
@@ -8016,7 +7931,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).signal as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).signal) as usize - ptr as usize },
         776usize,
         concat!(
             "Offset of field: ",
@@ -8026,7 +7941,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).reserved as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reserved) as usize - ptr as usize },
         784usize,
         concat!(
             "Offset of field: ",
@@ -8036,7 +7951,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).pad1 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).pad1) as usize - ptr as usize },
         788usize,
         concat!(
             "Offset of field: ",
@@ -8046,7 +7961,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_ar0 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_ar0) as usize - ptr as usize },
         792usize,
         concat!(
             "Offset of field: ",
@@ -8056,7 +7971,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_fpstate as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_fpstate) as usize - ptr as usize },
         800usize,
         concat!(
             "Offset of field: ",
@@ -8066,7 +7981,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).magic as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).magic) as usize - ptr as usize },
         808usize,
         concat!(
             "Offset of field: ",
@@ -8076,7 +7991,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_comm as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_comm) as usize - ptr as usize },
         816usize,
         concat!(
             "Offset of field: ",
@@ -8086,7 +8001,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).u_debugreg as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).u_debugreg) as usize - ptr as usize },
         848usize,
         concat!(
             "Offset of field: ",
@@ -8096,7 +8011,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).error_code as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).error_code) as usize - ptr as usize },
         912usize,
         concat!(
             "Offset of field: ",
@@ -8106,7 +8021,7 @@ fn bindgen_test_layout_user() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<user>())).fault_address as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fault_address) as usize - ptr as usize },
         920usize,
         concat!(
             "Offset of field: ",
@@ -8116,30 +8031,30 @@ fn bindgen_test_layout_user() {
         )
     );
 }
-pub const REG_R8: ::std::os::raw::c_uint = 0;
-pub const REG_R9: ::std::os::raw::c_uint = 1;
-pub const REG_R10: ::std::os::raw::c_uint = 2;
-pub const REG_R11: ::std::os::raw::c_uint = 3;
-pub const REG_R12: ::std::os::raw::c_uint = 4;
-pub const REG_R13: ::std::os::raw::c_uint = 5;
-pub const REG_R14: ::std::os::raw::c_uint = 6;
-pub const REG_R15: ::std::os::raw::c_uint = 7;
-pub const REG_RDI: ::std::os::raw::c_uint = 8;
-pub const REG_RSI: ::std::os::raw::c_uint = 9;
-pub const REG_RBP: ::std::os::raw::c_uint = 10;
-pub const REG_RBX: ::std::os::raw::c_uint = 11;
-pub const REG_RDX: ::std::os::raw::c_uint = 12;
-pub const REG_RAX: ::std::os::raw::c_uint = 13;
-pub const REG_RCX: ::std::os::raw::c_uint = 14;
-pub const REG_RSP: ::std::os::raw::c_uint = 15;
-pub const REG_RIP: ::std::os::raw::c_uint = 16;
-pub const REG_EFL: ::std::os::raw::c_uint = 17;
-pub const REG_CSGSFS: ::std::os::raw::c_uint = 18;
-pub const REG_ERR: ::std::os::raw::c_uint = 19;
-pub const REG_TRAPNO: ::std::os::raw::c_uint = 20;
-pub const REG_OLDMASK: ::std::os::raw::c_uint = 21;
-pub const REG_CR2: ::std::os::raw::c_uint = 22;
-pub const NGREG: ::std::os::raw::c_uint = 23;
+pub const REG_R8: _bindgen_ty_22 = 0;
+pub const REG_R9: _bindgen_ty_22 = 1;
+pub const REG_R10: _bindgen_ty_22 = 2;
+pub const REG_R11: _bindgen_ty_22 = 3;
+pub const REG_R12: _bindgen_ty_22 = 4;
+pub const REG_R13: _bindgen_ty_22 = 5;
+pub const REG_R14: _bindgen_ty_22 = 6;
+pub const REG_R15: _bindgen_ty_22 = 7;
+pub const REG_RDI: _bindgen_ty_22 = 8;
+pub const REG_RSI: _bindgen_ty_22 = 9;
+pub const REG_RBP: _bindgen_ty_22 = 10;
+pub const REG_RBX: _bindgen_ty_22 = 11;
+pub const REG_RDX: _bindgen_ty_22 = 12;
+pub const REG_RAX: _bindgen_ty_22 = 13;
+pub const REG_RCX: _bindgen_ty_22 = 14;
+pub const REG_RSP: _bindgen_ty_22 = 15;
+pub const REG_RIP: _bindgen_ty_22 = 16;
+pub const REG_EFL: _bindgen_ty_22 = 17;
+pub const REG_CSGSFS: _bindgen_ty_22 = 18;
+pub const REG_ERR: _bindgen_ty_22 = 19;
+pub const REG_TRAPNO: _bindgen_ty_22 = 20;
+pub const REG_OLDMASK: _bindgen_ty_22 = 21;
+pub const REG_CR2: _bindgen_ty_22 = 22;
+pub const NGREG: _bindgen_ty_22 = 23;
 pub type _bindgen_ty_22 = ::std::os::raw::c_uint;
 pub type greg_t = ::std::os::raw::c_long;
 pub type gregset_t = [greg_t; 23usize];
@@ -8152,6 +8067,8 @@ pub struct _libc_fpxreg {
 }
 #[test]
 fn bindgen_test_layout__libc_fpxreg() {
+    const UNINIT: ::std::mem::MaybeUninit<_libc_fpxreg> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_libc_fpxreg>(),
         16usize,
@@ -8163,7 +8080,7 @@ fn bindgen_test_layout__libc_fpxreg() {
         concat!("Alignment of ", stringify!(_libc_fpxreg))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpxreg>())).significand as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).significand) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8173,7 +8090,7 @@ fn bindgen_test_layout__libc_fpxreg() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpxreg>())).exponent as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).exponent) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -8183,7 +8100,7 @@ fn bindgen_test_layout__libc_fpxreg() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpxreg>())).padding as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         10usize,
         concat!(
             "Offset of field: ",
@@ -8200,6 +8117,8 @@ pub struct _libc_xmmreg {
 }
 #[test]
 fn bindgen_test_layout__libc_xmmreg() {
+    const UNINIT: ::std::mem::MaybeUninit<_libc_xmmreg> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_libc_xmmreg>(),
         16usize,
@@ -8211,7 +8130,7 @@ fn bindgen_test_layout__libc_xmmreg() {
         concat!("Alignment of ", stringify!(_libc_xmmreg))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_xmmreg>())).element as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).element) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8238,6 +8157,8 @@ pub struct _libc_fpstate {
 }
 #[test]
 fn bindgen_test_layout__libc_fpstate() {
+    const UNINIT: ::std::mem::MaybeUninit<_libc_fpstate> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<_libc_fpstate>(),
         512usize,
@@ -8249,7 +8170,7 @@ fn bindgen_test_layout__libc_fpstate() {
         concat!("Alignment of ", stringify!(_libc_fpstate))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).cwd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).cwd) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8259,7 +8180,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).swd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).swd) as usize - ptr as usize },
         2usize,
         concat!(
             "Offset of field: ",
@@ -8269,7 +8190,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).ftw as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).ftw) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -8279,7 +8200,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).fop as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fop) as usize - ptr as usize },
         6usize,
         concat!(
             "Offset of field: ",
@@ -8289,7 +8210,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).rip as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rip) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -8299,7 +8220,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).rdp as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).rdp) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -8309,7 +8230,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).mxcsr as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).mxcsr) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -8319,7 +8240,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).mxcr_mask as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).mxcr_mask) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -8329,7 +8250,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>()))._st as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._st) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -8339,7 +8260,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>()))._xmm as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr)._xmm) as usize - ptr as usize },
         160usize,
         concat!(
             "Offset of field: ",
@@ -8349,7 +8270,7 @@ fn bindgen_test_layout__libc_fpstate() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_libc_fpstate>())).padding as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         416usize,
         concat!(
             "Offset of field: ",
@@ -8369,6 +8290,8 @@ pub struct mcontext_t {
 }
 #[test]
 fn bindgen_test_layout_mcontext_t() {
+    const UNINIT: ::std::mem::MaybeUninit<mcontext_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<mcontext_t>(),
         256usize,
@@ -8380,7 +8303,7 @@ fn bindgen_test_layout_mcontext_t() {
         concat!("Alignment of ", stringify!(mcontext_t))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<mcontext_t>())).gregs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).gregs) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8390,7 +8313,7 @@ fn bindgen_test_layout_mcontext_t() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<mcontext_t>())).fpregs as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fpregs) as usize - ptr as usize },
         184usize,
         concat!(
             "Offset of field: ",
@@ -8400,7 +8323,7 @@ fn bindgen_test_layout_mcontext_t() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<mcontext_t>())).__reserved1 as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__reserved1) as usize - ptr as usize },
         192usize,
         concat!(
             "Offset of field: ",
@@ -8411,6 +8334,7 @@ fn bindgen_test_layout_mcontext_t() {
     );
 }
 #[repr(C)]
+#[derive(Copy, Clone)]
 pub struct ucontext {
     pub uc_flags: ::std::os::raw::c_ulong,
     pub uc_link: *mut ucontext,
@@ -8427,6 +8351,9 @@ pub union ucontext__bindgen_ty_1 {
 }
 #[test]
 fn bindgen_test_layout_ucontext__bindgen_ty_1() {
+    const UNINIT: ::std::mem::MaybeUninit<ucontext__bindgen_ty_1> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<ucontext__bindgen_ty_1>(),
         8usize,
@@ -8438,9 +8365,7 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1() {
         concat!("Alignment of ", stringify!(ucontext__bindgen_ty_1))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<ucontext__bindgen_ty_1>())).uc_sigmask as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8450,9 +8375,7 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<ucontext__bindgen_ty_1>())).uc_sigmask64 as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask64) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8464,6 +8387,8 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1() {
 }
 #[test]
 fn bindgen_test_layout_ucontext() {
+    const UNINIT: ::std::mem::MaybeUninit<ucontext> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<ucontext>(),
         816usize,
@@ -8475,7 +8400,7 @@ fn bindgen_test_layout_ucontext() {
         concat!("Alignment of ", stringify!(ucontext))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_flags) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8485,7 +8410,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_link as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_link) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -8495,7 +8420,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_stack as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_stack) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -8505,7 +8430,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).uc_mcontext as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).uc_mcontext) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -8515,7 +8440,7 @@ fn bindgen_test_layout_ucontext() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<ucontext>())).__fpregs_mem as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).__fpregs_mem) as usize - ptr as usize },
         304usize,
         concat!(
             "Offset of field: ",
@@ -8729,6 +8654,8 @@ pub struct fd_set {
 }
 #[test]
 fn bindgen_test_layout_fd_set() {
+    const UNINIT: ::std::mem::MaybeUninit<fd_set> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<fd_set>(),
         128usize,
@@ -8740,7 +8667,7 @@ fn bindgen_test_layout_fd_set() {
         concat!("Alignment of ", stringify!(fd_set))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<fd_set>())).fds_bits as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8751,21 +8678,21 @@ fn bindgen_test_layout_fd_set() {
     );
 }
 extern "C" {
-    pub fn __FD_CLR_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: size_t);
+    pub fn __FD_CLR_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: usize);
 }
 extern "C" {
-    pub fn __FD_SET_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: size_t);
+    pub fn __FD_SET_chk(arg1: ::std::os::raw::c_int, arg2: *mut fd_set, arg3: usize);
 }
 extern "C" {
     pub fn __FD_ISSET_chk(
         arg1: ::std::os::raw::c_int,
         arg2: *const fd_set,
-        arg3: size_t,
+        arg3: usize,
     ) -> ::std::os::raw::c_int;
 }
 extern "C" {
     pub fn select(
-        __fd_count: ::std::os::raw::c_int,
+        __max_fd_plus_one: ::std::os::raw::c_int,
         __read_fds: *mut fd_set,
         __write_fds: *mut fd_set,
         __exception_fds: *mut fd_set,
@@ -8774,7 +8701,7 @@ extern "C" {
 }
 extern "C" {
     pub fn pselect(
-        __fd_count: ::std::os::raw::c_int,
+        __max_fd_plus_one: ::std::os::raw::c_int,
         __read_fds: *mut fd_set,
         __write_fds: *mut fd_set,
         __exception_fds: *mut fd_set,
@@ -8784,7 +8711,7 @@ extern "C" {
 }
 extern "C" {
     pub fn pselect64(
-        __fd_count: ::std::os::raw::c_int,
+        __max_fd_plus_one: ::std::os::raw::c_int,
         __read_fds: *mut fd_set,
         __write_fds: *mut fd_set,
         __exception_fds: *mut fd_set,
@@ -8849,6 +8776,8 @@ pub struct tm {
 }
 #[test]
 fn bindgen_test_layout_tm() {
+    const UNINIT: ::std::mem::MaybeUninit<tm> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<tm>(),
         56usize,
@@ -8860,7 +8789,7 @@ fn bindgen_test_layout_tm() {
         concat!("Alignment of ", stringify!(tm))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_sec as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_sec) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -8870,7 +8799,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_min as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_min) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -8880,7 +8809,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_hour as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_hour) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -8890,7 +8819,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_mday as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_mday) as usize - ptr as usize },
         12usize,
         concat!(
             "Offset of field: ",
@@ -8900,7 +8829,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_mon as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_mon) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -8910,7 +8839,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_year as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_year) as usize - ptr as usize },
         20usize,
         concat!(
             "Offset of field: ",
@@ -8920,7 +8849,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_wday as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_wday) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -8930,7 +8859,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_yday as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_yday) as usize - ptr as usize },
         28usize,
         concat!(
             "Offset of field: ",
@@ -8940,7 +8869,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_isdst as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_isdst) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -8950,7 +8879,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_gmtoff as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_gmtoff) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -8960,7 +8889,7 @@ fn bindgen_test_layout_tm() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<tm>())).tm_zone as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tm_zone) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -9024,19 +8953,19 @@ extern "C" {
 extern "C" {
     pub fn strftime(
         __buf: *mut ::std::os::raw::c_char,
-        __n: size_t,
+        __n: usize,
         __fmt: *const ::std::os::raw::c_char,
         __tm: *const tm,
-    ) -> size_t;
+    ) -> usize;
 }
 extern "C" {
     pub fn strftime_l(
         __buf: *mut ::std::os::raw::c_char,
-        __n: size_t,
+        __n: usize,
         __fmt: *const ::std::os::raw::c_char,
         __tm: *const tm,
         __l: locale_t,
-    ) -> size_t;
+    ) -> usize;
 }
 extern "C" {
     pub fn ctime(__t: *const time_t) -> *mut ::std::os::raw::c_char;
@@ -9144,12 +9073,17 @@ pub struct clone_args {
     pub stack: __u64,
     pub stack_size: __u64,
     pub tls: __u64,
+    pub set_tid: __u64,
+    pub set_tid_size: __u64,
+    pub cgroup: __u64,
 }
 #[test]
 fn bindgen_test_layout_clone_args() {
+    const UNINIT: ::std::mem::MaybeUninit<clone_args> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<clone_args>(),
-        64usize,
+        88usize,
         concat!("Size of: ", stringify!(clone_args))
     );
     assert_eq!(
@@ -9158,7 +9092,7 @@ fn bindgen_test_layout_clone_args() {
         concat!("Alignment of ", stringify!(clone_args))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).flags as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -9168,7 +9102,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).pidfd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).pidfd) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -9178,7 +9112,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).child_tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).child_tid) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -9188,7 +9122,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).parent_tid as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).parent_tid) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -9198,7 +9132,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).exit_signal as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).exit_signal) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -9208,7 +9142,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).stack as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).stack) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -9218,7 +9152,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).stack_size as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).stack_size) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -9228,7 +9162,7 @@ fn bindgen_test_layout_clone_args() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<clone_args>())).tls as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).tls) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -9237,6 +9171,36 @@ fn bindgen_test_layout_clone_args() {
             stringify!(tls)
         )
     );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).set_tid) as usize - ptr as usize },
+        64usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(clone_args),
+            "::",
+            stringify!(set_tid)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).set_tid_size) as usize - ptr as usize },
+        72usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(clone_args),
+            "::",
+            stringify!(set_tid_size)
+        )
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).cgroup) as usize - ptr as usize },
+        80usize,
+        concat!(
+            "Offset of field: ",
+            stringify!(clone_args),
+            "::",
+            stringify!(cgroup)
+        )
+    );
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -9245,6 +9209,8 @@ pub struct sched_param {
 }
 #[test]
 fn bindgen_test_layout_sched_param() {
+    const UNINIT: ::std::mem::MaybeUninit<sched_param> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sched_param>(),
         4usize,
@@ -9256,7 +9222,7 @@ fn bindgen_test_layout_sched_param() {
         concat!("Alignment of ", stringify!(sched_param))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<sched_param>())).sched_priority as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).sched_priority) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -9294,15 +9260,15 @@ extern "C" {
 extern "C" {
     pub fn sched_rr_get_interval(__pid: pid_t, __quantum: *mut timespec) -> ::std::os::raw::c_int;
 }
-pub const PTHREAD_MUTEX_NORMAL: ::std::os::raw::c_uint = 0;
-pub const PTHREAD_MUTEX_RECURSIVE: ::std::os::raw::c_uint = 1;
-pub const PTHREAD_MUTEX_ERRORCHECK: ::std::os::raw::c_uint = 2;
-pub const PTHREAD_MUTEX_ERRORCHECK_NP: ::std::os::raw::c_uint = 2;
-pub const PTHREAD_MUTEX_RECURSIVE_NP: ::std::os::raw::c_uint = 1;
-pub const PTHREAD_MUTEX_DEFAULT: ::std::os::raw::c_uint = 0;
+pub const PTHREAD_MUTEX_NORMAL: _bindgen_ty_23 = 0;
+pub const PTHREAD_MUTEX_RECURSIVE: _bindgen_ty_23 = 1;
+pub const PTHREAD_MUTEX_ERRORCHECK: _bindgen_ty_23 = 2;
+pub const PTHREAD_MUTEX_ERRORCHECK_NP: _bindgen_ty_23 = 2;
+pub const PTHREAD_MUTEX_RECURSIVE_NP: _bindgen_ty_23 = 1;
+pub const PTHREAD_MUTEX_DEFAULT: _bindgen_ty_23 = 0;
 pub type _bindgen_ty_23 = ::std::os::raw::c_uint;
-pub const PTHREAD_RWLOCK_PREFER_READER_NP: ::std::os::raw::c_uint = 0;
-pub const PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP: ::std::os::raw::c_uint = 1;
+pub const PTHREAD_RWLOCK_PREFER_READER_NP: _bindgen_ty_24 = 0;
+pub const PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP: _bindgen_ty_24 = 1;
 pub type _bindgen_ty_24 = ::std::os::raw::c_uint;
 pub type __pthread_cleanup_func_t =
     ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>;
@@ -9315,6 +9281,8 @@ pub struct __pthread_cleanup_t {
 }
 #[test]
 fn bindgen_test_layout___pthread_cleanup_t() {
+    const UNINIT: ::std::mem::MaybeUninit<__pthread_cleanup_t> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__pthread_cleanup_t>(),
         24usize,
@@ -9326,9 +9294,7 @@ fn bindgen_test_layout___pthread_cleanup_t() {
         concat!("Alignment of ", stringify!(__pthread_cleanup_t))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__pthread_cleanup_t>())).__cleanup_prev as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_prev) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -9338,9 +9304,7 @@ fn bindgen_test_layout___pthread_cleanup_t() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__pthread_cleanup_t>())).__cleanup_routine as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_routine) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -9350,9 +9314,7 @@ fn bindgen_test_layout___pthread_cleanup_t() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<__pthread_cleanup_t>())).__cleanup_arg as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_arg) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -9372,24 +9334,23 @@ extern "C" {
 extern "C" {
     pub fn __pthread_cleanup_pop(arg1: *mut __pthread_cleanup_t, arg2: ::std::os::raw::c_int);
 }
-#[doc = " Data associated with an ALooper fd that will be returned as the \"outData\""]
-#[doc = " when that source has data ready."]
+#[doc = " Data associated with an ALooper fd that will be returned as the \"outData\"\n when that source has data ready."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct android_poll_source {
-    #[doc = " The identifier of this source.  May be LOOPER_ID_MAIN or"]
-    #[doc = " LOOPER_ID_INPUT."]
+    #[doc = " The identifier of this source.  May be LOOPER_ID_MAIN or\n LOOPER_ID_INPUT."]
     pub id: i32,
     #[doc = " The android_app this ident is associated with."]
     pub app: *mut android_app,
-    #[doc = " Function to call to perform the standard processing of data from"]
-    #[doc = " this source."]
+    #[doc = " Function to call to perform the standard processing of data from\n this source."]
     pub process: ::std::option::Option<
         unsafe extern "C" fn(app: *mut android_app, source: *mut android_poll_source),
     >,
 }
 #[test]
 fn bindgen_test_layout_android_poll_source() {
+    const UNINIT: ::std::mem::MaybeUninit<android_poll_source> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_poll_source>(),
         24usize,
@@ -9401,7 +9362,7 @@ fn bindgen_test_layout_android_poll_source() {
         concat!("Alignment of ", stringify!(android_poll_source))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_poll_source>())).id as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -9411,7 +9372,7 @@ fn bindgen_test_layout_android_poll_source() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_poll_source>())).app as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).app) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -9421,7 +9382,7 @@ fn bindgen_test_layout_android_poll_source() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_poll_source>())).process as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).process) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -9434,37 +9395,26 @@ fn bindgen_test_layout_android_poll_source() {
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct android_input_buffer {
-    #[doc = " Pointer to a read-only array of pointers to GameActivityMotionEvent."]
-    #[doc = " Only the first motionEventsCount events are valid."]
-    pub motionEvents: [GameActivityMotionEvent; 16usize],
+    #[doc = " Pointer to a read-only array of GameActivityMotionEvent.\n Only the first motionEventsCount events are valid."]
+    pub motionEvents: *mut GameActivityMotionEvent,
     #[doc = " The number of valid motion events in `motionEvents`."]
     pub motionEventsCount: u64,
-    #[doc = " Pointer to a read-only array of pointers to GameActivityHistoricalPointerAxes."]
-    #[doc = ""]
-    #[doc = " Only the first historicalSamplesCount samples are valid."]
-    #[doc = " Refer to event->historicalStart, event->pointerCount and event->historicalCount"]
-    #[doc = " to access the specific samples that relate to an event."]
-    #[doc = ""]
-    #[doc = " Each slice of samples for one event has a length of"]
-    #[doc = " (event->pointerCount and event->historicalCount) and is in pointer-major"]
-    #[doc = " order so the historic samples for each pointer are contiguous."]
-    #[doc = " E.g. you would access historic sample index 3 for pointer 2 of an event with:"]
-    #[doc = ""]
-    #[doc = "   historicalAxisSamples[event->historicalStart + (event->historicalCount * 2) + 3];"]
-    pub historicalAxisSamples: [GameActivityHistoricalPointerAxes; 64usize],
-    #[doc = " The number of valid historical samples in `historicalAxisSamples`."]
-    pub historicalSamplesCount: u64,
-    #[doc = " Pointer to a read-only array of pointers to GameActivityKeyEvent."]
-    #[doc = " Only the first keyEventsCount events are valid."]
-    pub keyEvents: [GameActivityKeyEvent; 4usize],
+    #[doc = " The size of the `motionEvents` buffer."]
+    pub motionEventsBufferSize: u64,
+    #[doc = " Pointer to a read-only array of GameActivityKeyEvent.\n Only the first keyEventsCount events are valid."]
+    pub keyEvents: *mut GameActivityKeyEvent,
     #[doc = " The number of valid \"Key\" events in `keyEvents`."]
     pub keyEventsCount: u64,
+    #[doc = " The size of the `keyEvents` buffer."]
+    pub keyEventsBufferSize: u64,
 }
 #[test]
 fn bindgen_test_layout_android_input_buffer() {
+    const UNINIT: ::std::mem::MaybeUninit<android_input_buffer> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_input_buffer>(),
-        40824usize,
+        48usize,
         concat!("Size of: ", stringify!(android_input_buffer))
     );
     assert_eq!(
@@ -9473,9 +9423,7 @@ fn bindgen_test_layout_android_input_buffer() {
         concat!("Alignment of ", stringify!(android_input_buffer))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).motionEvents as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEvents) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -9485,10 +9433,8 @@ fn bindgen_test_layout_android_input_buffer() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).motionEventsCount as *const _ as usize
-        },
-        27776usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEventsCount) as usize - ptr as usize },
+        8usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
@@ -9497,153 +9443,81 @@ fn bindgen_test_layout_android_input_buffer() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).historicalAxisSamples as *const _
-                as usize
-        },
-        27784usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEventsBufferSize) as usize - ptr as usize },
+        16usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(historicalAxisSamples)
+            stringify!(motionEventsBufferSize)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).historicalSamplesCount as *const _
-                as usize
-        },
-        40584usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEvents) as usize - ptr as usize },
+        24usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(historicalSamplesCount)
+            stringify!(keyEvents)
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_input_buffer>())).keyEvents as *const _ as usize },
-        40592usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEventsCount) as usize - ptr as usize },
+        32usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(keyEvents)
+            stringify!(keyEventsCount)
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_input_buffer>())).keyEventsCount as *const _ as usize
-        },
-        40816usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEventsBufferSize) as usize - ptr as usize },
+        40usize,
         concat!(
             "Offset of field: ",
             stringify!(android_input_buffer),
             "::",
-            stringify!(keyEventsCount)
+            stringify!(keyEventsBufferSize)
         )
     );
 }
-#[doc = " Function pointer declaration for the filtering of key events."]
-#[doc = " A function with this signature should be passed to"]
-#[doc = " android_app_set_key_event_filter and return false for any events that should"]
-#[doc = " not be handled by android_native_app_glue. These events will be handled by"]
-#[doc = " the system instead."]
+#[doc = " Function pointer declaration for the filtering of key events.\n A function with this signature should be passed to\n android_app_set_key_event_filter and return false for any events that should\n not be handled by android_native_app_glue. These events will be handled by\n the system instead."]
 pub type android_key_event_filter =
     ::std::option::Option<unsafe extern "C" fn(arg1: *const GameActivityKeyEvent) -> bool>;
-#[doc = " Function pointer definition for the filtering of motion events."]
-#[doc = " A function with this signature should be passed to"]
-#[doc = " android_app_set_motion_event_filter and return false for any events that"]
-#[doc = " should not be handled by android_native_app_glue. These events will be"]
-#[doc = " handled by the system instead."]
+#[doc = " Function pointer definition for the filtering of motion events.\n A function with this signature should be passed to\n android_app_set_motion_event_filter and return false for any events that\n should not be handled by android_native_app_glue. These events will be\n handled by the system instead."]
 pub type android_motion_event_filter =
     ::std::option::Option<unsafe extern "C" fn(arg1: *const GameActivityMotionEvent) -> bool>;
-#[doc = " The GameActivity interface provided by <game-activity/GameActivity.h>"]
-#[doc = " is based on a set of application-provided callbacks that will be called"]
-#[doc = " by the Activity's main thread when certain events occur."]
-#[doc = ""]
-#[doc = " This means that each one of this callbacks _should_ _not_ block, or they"]
-#[doc = " risk having the system force-close the application. This programming"]
-#[doc = " model is direct, lightweight, but constraining."]
-#[doc = ""]
-#[doc = " The 'android_native_app_glue' static library is used to provide a different"]
-#[doc = " execution model where the application can implement its own main event"]
-#[doc = " loop in a different thread instead. Here's how it works:"]
-#[doc = ""]
-#[doc = " 1/ The application must provide a function named \"android_main()\" that"]
-#[doc = "    will be called when the activity is created, in a new thread that is"]
-#[doc = "    distinct from the activity's main thread."]
-#[doc = ""]
-#[doc = " 2/ android_main() receives a pointer to a valid \"android_app\" structure"]
-#[doc = "    that contains references to other important objects, e.g. the"]
-#[doc = "    GameActivity obejct instance the application is running in."]
-#[doc = ""]
-#[doc = " 3/ the \"android_app\" object holds an ALooper instance that already"]
-#[doc = "    listens to activity lifecycle events (e.g. \"pause\", \"resume\")."]
-#[doc = "    See APP_CMD_XXX declarations below."]
-#[doc = ""]
-#[doc = "    This corresponds to an ALooper identifier returned by"]
-#[doc = "    ALooper_pollOnce with value LOOPER_ID_MAIN."]
-#[doc = ""]
-#[doc = "    Your application can use the same ALooper to listen to additional"]
-#[doc = "    file-descriptors.  They can either be callback based, or with return"]
-#[doc = "    identifiers starting with LOOPER_ID_USER."]
-#[doc = ""]
-#[doc = " 4/ Whenever you receive a LOOPER_ID_MAIN event,"]
-#[doc = "    the returned data will point to an android_poll_source structure.  You"]
-#[doc = "    can call the process() function on it, and fill in android_app->onAppCmd"]
-#[doc = "    to be called for your own processing of the event."]
-#[doc = ""]
-#[doc = "    Alternatively, you can call the low-level functions to read and process"]
-#[doc = "    the data directly...  look at the process_cmd() and process_input()"]
-#[doc = "    implementations in the glue to see how to do this."]
-#[doc = ""]
-#[doc = " See the sample named \"native-activity\" that comes with the NDK with a"]
-#[doc = " full usage example.  Also look at the documentation of GameActivity."]
+#[doc = " The GameActivity interface provided by <game-activity/GameActivity.h>\n is based on a set of application-provided callbacks that will be called\n by the Activity's main thread when certain events occur.\n\n This means that each one of this callbacks _should_ _not_ block, or they\n risk having the system force-close the application. This programming\n model is direct, lightweight, but constraining.\n\n The 'android_native_app_glue' static library is used to provide a different\n execution model where the application can implement its own main event\n loop in a different thread instead. Here's how it works:\n\n 1/ The application must provide a function named \"android_main()\" that\n    will be called when the activity is created, in a new thread that is\n    distinct from the activity's main thread.\n\n 2/ android_main() receives a pointer to a valid \"android_app\" structure\n    that contains references to other important objects, e.g. the\n    GameActivity obejct instance the application is running in.\n\n 3/ the \"android_app\" object holds an ALooper instance that already\n    listens to activity lifecycle events (e.g. \"pause\", \"resume\").\n    See APP_CMD_XXX declarations below.\n\n    This corresponds to an ALooper identifier returned by\n    ALooper_pollOnce with value LOOPER_ID_MAIN.\n\n    Your application can use the same ALooper to listen to additional\n    file-descriptors.  They can either be callback based, or with return\n    identifiers starting with LOOPER_ID_USER.\n\n 4/ Whenever you receive a LOOPER_ID_MAIN event,\n    the returned data will point to an android_poll_source structure.  You\n    can call the process() function on it, and fill in android_app->onAppCmd\n    to be called for your own processing of the event.\n\n    Alternatively, you can call the low-level functions to read and process\n    the data directly...  look at the process_cmd() and process_input()\n    implementations in the glue to see how to do this.\n\n See the sample named \"native-activity\" that comes with the NDK with a\n full usage example.  Also look at the documentation of GameActivity."]
 #[repr(C)]
 pub struct android_app {
     #[doc = " An optional pointer to application-defined state."]
     pub userData: *mut ::std::os::raw::c_void,
-    #[doc = " A required callback for processing main app commands (`APP_CMD_*`)."]
-    #[doc = " This is called each frame if there are app commands that need processing."]
+    #[doc = " A required callback for processing main app commands (`APP_CMD_*`).\n This is called each frame if there are app commands that need processing."]
     pub onAppCmd: ::std::option::Option<unsafe extern "C" fn(app: *mut android_app, cmd: i32)>,
     #[doc = " The GameActivity object instance that this app is running in."]
     pub activity: *mut GameActivity,
     #[doc = " The current configuration the app is running in."]
     pub config: *mut AConfiguration,
-    #[doc = " The last activity saved state, as provided at creation time."]
-    #[doc = " It is NULL if there was no state.  You can use this as you need; the"]
-    #[doc = " memory will remain around until you call android_app_exec_cmd() for"]
-    #[doc = " APP_CMD_RESUME, at which point it will be freed and savedState set to"]
-    #[doc = " NULL. These variables should only be changed when processing a"]
-    #[doc = " APP_CMD_SAVE_STATE, at which point they will be initialized to NULL and"]
-    #[doc = " you can malloc your state and place the information here.  In that case"]
-    #[doc = " the memory will be freed for you later."]
+    #[doc = " The last activity saved state, as provided at creation time.\n It is NULL if there was no state.  You can use this as you need; the\n memory will remain around until you call android_app_exec_cmd() for\n APP_CMD_RESUME, at which point it will be freed and savedState set to\n NULL. These variables should only be changed when processing a\n APP_CMD_SAVE_STATE, at which point they will be initialized to NULL and\n you can malloc your state and place the information here.  In that case\n the memory will be freed for you later."]
     pub savedState: *mut ::std::os::raw::c_void,
     #[doc = " The size of the activity saved state. It is 0 if `savedState` is NULL."]
-    pub savedStateSize: size_t,
+    pub savedStateSize: usize,
     #[doc = " The ALooper associated with the app's thread."]
     pub looper: *mut ALooper,
     #[doc = " When non-NULL, this is the window surface that the app can draw in."]
     pub window: *mut ANativeWindow,
-    #[doc = " Current content rectangle of the window; this is the area where the"]
-    #[doc = " window's content should be placed to be seen by the user."]
+    #[doc = " Current content rectangle of the window; this is the area where the\n window's content should be placed to be seen by the user."]
     pub contentRect: ARect,
-    #[doc = " Current state of the app's activity.  May be either APP_CMD_START,"]
-    #[doc = " APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP."]
+    #[doc = " Current state of the app's activity.  May be either APP_CMD_START,\n APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP."]
     pub activityState: ::std::os::raw::c_int,
-    #[doc = " This is non-zero when the application's GameActivity is being"]
-    #[doc = " destroyed and waiting for the app thread to complete."]
+    #[doc = " This is non-zero when the application's GameActivity is being\n destroyed and waiting for the app thread to complete."]
     pub destroyRequested: ::std::os::raw::c_int,
-    #[doc = " This is used for buffering input from GameActivity. Once ready, the"]
-    #[doc = " application thread switches the buffers and processes what was"]
-    #[doc = " accumulated."]
+    #[doc = " This is used for buffering input from GameActivity. Once ready, the\n application thread switches the buffers and processes what was\n accumulated."]
     pub inputBuffers: [android_input_buffer; 2usize],
     pub currentInputBuffer: ::std::os::raw::c_int,
-    #[doc = " 0 if no text input event is outstanding, 1 if it is."]
-    #[doc = " Use `GameActivity_getTextInputState` to get information"]
-    #[doc = " about the text entered by the user."]
+    #[doc = " 0 if no text input event is outstanding, 1 if it is.\n Use `GameActivity_getTextInputState` to get information\n about the text entered by the user."]
     pub textInputState: ::std::os::raw::c_int,
     #[doc = " @cond INTERNAL"]
     pub mutex: pthread_mutex_t,
@@ -9665,9 +9539,11 @@ pub struct android_app {
 }
 #[test]
 fn bindgen_test_layout_android_app() {
+    const UNINIT: ::std::mem::MaybeUninit<android_app> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_app>(),
-        81936usize,
+        384usize,
         concat!("Size of: ", stringify!(android_app))
     );
     assert_eq!(
@@ -9676,7 +9552,7 @@ fn bindgen_test_layout_android_app() {
         concat!("Alignment of ", stringify!(android_app))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).userData as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).userData) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -9686,7 +9562,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).onAppCmd as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).onAppCmd) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -9696,7 +9572,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).activity as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).activity) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -9706,7 +9582,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).config as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).config) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -9716,7 +9592,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).savedState as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).savedState) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -9726,7 +9602,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).savedStateSize as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).savedStateSize) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -9736,7 +9612,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).looper as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).looper) as usize - ptr as usize },
         48usize,
         concat!(
             "Offset of field: ",
@@ -9746,7 +9622,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).window as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).window) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -9756,7 +9632,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).contentRect as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).contentRect) as usize - ptr as usize },
         64usize,
         concat!(
             "Offset of field: ",
@@ -9766,7 +9642,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).activityState as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).activityState) as usize - ptr as usize },
         80usize,
         concat!(
             "Offset of field: ",
@@ -9776,7 +9652,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).destroyRequested as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).destroyRequested) as usize - ptr as usize },
         84usize,
         concat!(
             "Offset of field: ",
@@ -9786,7 +9662,7 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).inputBuffers as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).inputBuffers) as usize - ptr as usize },
         88usize,
         concat!(
             "Offset of field: ",
@@ -9796,8 +9672,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).currentInputBuffer as *const _ as usize },
-        81736usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).currentInputBuffer) as usize - ptr as usize },
+        184usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9806,8 +9682,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).textInputState as *const _ as usize },
-        81740usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).textInputState) as usize - ptr as usize },
+        188usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9816,8 +9692,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).mutex as *const _ as usize },
-        81744usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).mutex) as usize - ptr as usize },
+        192usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9826,8 +9702,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).cond as *const _ as usize },
-        81784usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).cond) as usize - ptr as usize },
+        232usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9836,8 +9712,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).msgread as *const _ as usize },
-        81832usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).msgread) as usize - ptr as usize },
+        280usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9846,8 +9722,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).msgwrite as *const _ as usize },
-        81836usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).msgwrite) as usize - ptr as usize },
+        284usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9856,8 +9732,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).thread as *const _ as usize },
-        81840usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).thread) as usize - ptr as usize },
+        288usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9866,8 +9742,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).cmdPollSource as *const _ as usize },
-        81848usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).cmdPollSource) as usize - ptr as usize },
+        296usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9876,8 +9752,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).running as *const _ as usize },
-        81872usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).running) as usize - ptr as usize },
+        320usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9886,8 +9762,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).stateSaved as *const _ as usize },
-        81876usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).stateSaved) as usize - ptr as usize },
+        324usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9896,8 +9772,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).destroyed as *const _ as usize },
-        81880usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).destroyed) as usize - ptr as usize },
+        328usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9906,8 +9782,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).redrawNeeded as *const _ as usize },
-        81884usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).redrawNeeded) as usize - ptr as usize },
+        332usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9916,8 +9792,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).pendingWindow as *const _ as usize },
-        81888usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pendingWindow) as usize - ptr as usize },
+        336usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9926,8 +9802,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).pendingContentRect as *const _ as usize },
-        81896usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).pendingContentRect) as usize - ptr as usize },
+        344usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9936,8 +9812,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).keyEventFilter as *const _ as usize },
-        81912usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).keyEventFilter) as usize - ptr as usize },
+        360usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9946,8 +9822,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).motionEventFilter as *const _ as usize },
-        81920usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).motionEventFilter) as usize - ptr as usize },
+        368usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9956,10 +9832,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<android_app>())).inputAvailableWakeUp as *const _ as usize
-        },
-        81928usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).inputAvailableWakeUp) as usize - ptr as usize },
+        376usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9968,8 +9842,8 @@ fn bindgen_test_layout_android_app() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<android_app>())).inputSwapPending as *const _ as usize },
-        81929usize,
+        unsafe { ::std::ptr::addr_of!((*ptr).inputSwapPending) as usize - ptr as usize },
+        377usize,
         concat!(
             "Offset of field: ",
             stringify!(android_app),
@@ -9978,139 +9852,89 @@ fn bindgen_test_layout_android_app() {
         )
     );
 }
-#[doc = " Looper data ID of commands coming from the app's main thread, which"]
-#[doc = " is returned as an identifier from ALooper_pollOnce().  The data for this"]
-#[doc = " identifier is a pointer to an android_poll_source structure."]
-#[doc = " These can be retrieved and processed with android_app_read_cmd()"]
-#[doc = " and android_app_exec_cmd()."]
+#[doc = " Looper data ID of commands coming from the app's main thread, which\n is returned as an identifier from ALooper_pollOnce().  The data for this\n identifier is a pointer to an android_poll_source structure.\n These can be retrieved and processed with android_app_read_cmd()\n and android_app_exec_cmd()."]
 pub const NativeAppGlueLooperId_LOOPER_ID_MAIN: NativeAppGlueLooperId = 1;
-#[doc = " Unused. Reserved for future use when usage of AInputQueue will be"]
-#[doc = " supported."]
+#[doc = " Unused. Reserved for future use when usage of AInputQueue will be\n supported."]
 pub const NativeAppGlueLooperId_LOOPER_ID_INPUT: NativeAppGlueLooperId = 2;
 #[doc = " Start of user-defined ALooper identifiers."]
 pub const NativeAppGlueLooperId_LOOPER_ID_USER: NativeAppGlueLooperId = 3;
-#[doc = " Looper ID of commands coming from the app's main thread, an AInputQueue or"]
-#[doc = " user-defined sources."]
+#[doc = " Looper ID of commands coming from the app's main thread, an AInputQueue or\n user-defined sources."]
 pub type NativeAppGlueLooperId = ::std::os::raw::c_uint;
-#[doc = " Unused. Reserved for future use when usage of AInputQueue will be"]
-#[doc = " supported."]
+#[doc = " Unused. Reserved for future use when usage of AInputQueue will be\n supported."]
 pub const NativeAppGlueAppCmd_UNUSED_APP_CMD_INPUT_CHANGED: NativeAppGlueAppCmd = 0;
-#[doc = " Command from main thread: a new ANativeWindow is ready for use.  Upon"]
-#[doc = " receiving this command, android_app->window will contain the new window"]
-#[doc = " surface."]
+#[doc = " Command from main thread: a new ANativeWindow is ready for use.  Upon\n receiving this command, android_app->window will contain the new window\n surface."]
 pub const NativeAppGlueAppCmd_APP_CMD_INIT_WINDOW: NativeAppGlueAppCmd = 1;
-#[doc = " Command from main thread: the existing ANativeWindow needs to be"]
-#[doc = " terminated.  Upon receiving this command, android_app->window still"]
-#[doc = " contains the existing window; after calling android_app_exec_cmd"]
-#[doc = " it will be set to NULL."]
+#[doc = " Command from main thread: the existing ANativeWindow needs to be\n terminated.  Upon receiving this command, android_app->window still\n contains the existing window; after calling android_app_exec_cmd\n it will be set to NULL."]
 pub const NativeAppGlueAppCmd_APP_CMD_TERM_WINDOW: NativeAppGlueAppCmd = 2;
-#[doc = " Command from main thread: the current ANativeWindow has been resized."]
-#[doc = " Please redraw with its new size."]
+#[doc = " Command from main thread: the current ANativeWindow has been resized.\n Please redraw with its new size."]
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_RESIZED: NativeAppGlueAppCmd = 3;
-#[doc = " Command from main thread: the system needs that the current ANativeWindow"]
-#[doc = " be redrawn.  You should redraw the window before handing this to"]
-#[doc = " android_app_exec_cmd() in order to avoid transient drawing glitches."]
+#[doc = " Command from main thread: the system needs that the current ANativeWindow\n be redrawn.  You should redraw the window before handing this to\n android_app_exec_cmd() in order to avoid transient drawing glitches."]
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_REDRAW_NEEDED: NativeAppGlueAppCmd = 4;
-#[doc = " Command from main thread: the content area of the window has changed,"]
-#[doc = " such as from the soft input window being shown or hidden.  You can"]
-#[doc = " find the new content rect in android_app::contentRect."]
+#[doc = " Command from main thread: the content area of the window has changed,\n such as from the soft input window being shown or hidden.  You can\n find the new content rect in android_app::contentRect."]
 pub const NativeAppGlueAppCmd_APP_CMD_CONTENT_RECT_CHANGED: NativeAppGlueAppCmd = 5;
-#[doc = " Command from main thread: the app's activity window has gained"]
-#[doc = " input focus."]
+#[doc = " Command from main thread: the app's activity window has gained\n input focus."]
 pub const NativeAppGlueAppCmd_APP_CMD_GAINED_FOCUS: NativeAppGlueAppCmd = 6;
-#[doc = " Command from main thread: the app's activity window has lost"]
-#[doc = " input focus."]
+#[doc = " Command from main thread: the app's activity window has lost\n input focus."]
 pub const NativeAppGlueAppCmd_APP_CMD_LOST_FOCUS: NativeAppGlueAppCmd = 7;
 #[doc = " Command from main thread: the current device configuration has changed."]
 pub const NativeAppGlueAppCmd_APP_CMD_CONFIG_CHANGED: NativeAppGlueAppCmd = 8;
-#[doc = " Command from main thread: the system is running low on memory."]
-#[doc = " Try to reduce your memory use."]
+#[doc = " Command from main thread: the system is running low on memory.\n Try to reduce your memory use."]
 pub const NativeAppGlueAppCmd_APP_CMD_LOW_MEMORY: NativeAppGlueAppCmd = 9;
 #[doc = " Command from main thread: the app's activity has been started."]
 pub const NativeAppGlueAppCmd_APP_CMD_START: NativeAppGlueAppCmd = 10;
 #[doc = " Command from main thread: the app's activity has been resumed."]
 pub const NativeAppGlueAppCmd_APP_CMD_RESUME: NativeAppGlueAppCmd = 11;
-#[doc = " Command from main thread: the app should generate a new saved state"]
-#[doc = " for itself, to restore from later if needed.  If you have saved state,"]
-#[doc = " allocate it with malloc and place it in android_app.savedState with"]
-#[doc = " the size in android_app.savedStateSize.  The will be freed for you"]
-#[doc = " later."]
+#[doc = " Command from main thread: the app should generate a new saved state\n for itself, to restore from later if needed.  If you have saved state,\n allocate it with malloc and place it in android_app.savedState with\n the size in android_app.savedStateSize.  The will be freed for you\n later."]
 pub const NativeAppGlueAppCmd_APP_CMD_SAVE_STATE: NativeAppGlueAppCmd = 12;
 #[doc = " Command from main thread: the app's activity has been paused."]
 pub const NativeAppGlueAppCmd_APP_CMD_PAUSE: NativeAppGlueAppCmd = 13;
 #[doc = " Command from main thread: the app's activity has been stopped."]
 pub const NativeAppGlueAppCmd_APP_CMD_STOP: NativeAppGlueAppCmd = 14;
-#[doc = " Command from main thread: the app's activity is being destroyed,"]
-#[doc = " and waiting for the app thread to clean up and exit before proceeding."]
+#[doc = " Command from main thread: the app's activity is being destroyed,\n and waiting for the app thread to clean up and exit before proceeding."]
 pub const NativeAppGlueAppCmd_APP_CMD_DESTROY: NativeAppGlueAppCmd = 15;
 #[doc = " Command from main thread: the app's insets have changed."]
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_INSETS_CHANGED: NativeAppGlueAppCmd = 16;
 #[doc = " Commands passed from the application's main Java thread to the game's thread."]
 pub type NativeAppGlueAppCmd = ::std::os::raw::c_uint;
 extern "C" {
-    #[doc = " Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next"]
-    #[doc = " app command message."]
+    #[doc = " Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next\n app command message."]
     pub fn android_app_read_cmd(android_app: *mut android_app) -> i8;
 }
 extern "C" {
-    #[doc = " Call with the command returned by android_app_read_cmd() to do the"]
-    #[doc = " initial pre-processing of the given command.  You can perform your own"]
-    #[doc = " actions for the command after calling this function."]
+    #[doc = " Call with the command returned by android_app_read_cmd() to do the\n initial pre-processing of the given command.  You can perform your own\n actions for the command after calling this function."]
     pub fn android_app_pre_exec_cmd(android_app: *mut android_app, cmd: i8);
 }
 extern "C" {
-    #[doc = " Call with the command returned by android_app_read_cmd() to do the"]
-    #[doc = " final post-processing of the given command.  You must have done your own"]
-    #[doc = " actions for the command before calling this function."]
+    #[doc = " Call with the command returned by android_app_read_cmd() to do the\n final post-processing of the given command.  You must have done your own\n actions for the command before calling this function."]
     pub fn android_app_post_exec_cmd(android_app: *mut android_app, cmd: i8);
 }
 extern "C" {
-    #[doc = " Call this before processing input events to get the events buffer."]
-    #[doc = " The function returns NULL if there are no events to process."]
+    #[doc = " Call this before processing input events to get the events buffer.\n The function returns NULL if there are no events to process."]
     pub fn android_app_swap_input_buffers(
         android_app: *mut android_app,
     ) -> *mut android_input_buffer;
 }
 extern "C" {
-    #[doc = " Clear the array of motion events that were waiting to be handled, and release"]
-    #[doc = " each of them."]
-    #[doc = ""]
-    #[doc = " This method should be called after you have processed the motion events in"]
-    #[doc = " your game loop. You should handle events at each iteration of your game loop."]
+    #[doc = " Clear the array of motion events that were waiting to be handled, and release\n each of them.\n\n This method should be called after you have processed the motion events in\n your game loop. You should handle events at each iteration of your game loop."]
     pub fn android_app_clear_motion_events(inputBuffer: *mut android_input_buffer);
 }
 extern "C" {
-    #[doc = " Clear the array of key events that were waiting to be handled, and release"]
-    #[doc = " each of them."]
-    #[doc = ""]
-    #[doc = " This method should be called after you have processed the key up events in"]
-    #[doc = " your game loop. You should handle events at each iteration of your game loop."]
+    #[doc = " Clear the array of key events that were waiting to be handled, and release\n each of them.\n\n This method should be called after you have processed the key up events in\n your game loop. You should handle events at each iteration of your game loop."]
     pub fn android_app_clear_key_events(inputBuffer: *mut android_input_buffer);
 }
 extern "C" {
-    #[doc = " This is a springboard into the Rust glue layer that wraps calling the"]
-    #[doc = " main entry for the app itself."]
+    #[doc = " This is a springboard into the Rust glue layer that wraps calling the\n main entry for the app itself."]
     pub fn _rust_glue_entry(app: *mut android_app);
 }
 extern "C" {
-    #[doc = " Set the filter to use when processing key events."]
-    #[doc = " Any events for which the filter returns false will be ignored by"]
-    #[doc = " android_native_app_glue. If filter is set to NULL, no filtering is done."]
-    #[doc = ""]
-    #[doc = " The default key filter will filter out volume and camera button presses."]
+    #[doc = " Set the filter to use when processing key events.\n Any events for which the filter returns false will be ignored by\n android_native_app_glue. If filter is set to NULL, no filtering is done.\n\n The default key filter will filter out volume and camera button presses."]
     pub fn android_app_set_key_event_filter(
         app: *mut android_app,
         filter: android_key_event_filter,
     );
 }
 extern "C" {
-    #[doc = " Set the filter to use when processing touch and motion events."]
-    #[doc = " Any events for which the filter returns false will be ignored by"]
-    #[doc = " android_native_app_glue. If filter is set to NULL, no filtering is done."]
-    #[doc = ""]
-    #[doc = " Note that the default motion event filter will only allow touchscreen events"]
-    #[doc = " through, in order to mimic NativeActivity's behaviour, so for controller"]
-    #[doc = " events to be passed to the app, set the filter to NULL."]
+    #[doc = " Set the filter to use when processing touch and motion events.\n Any events for which the filter returns false will be ignored by\n android_native_app_glue. If filter is set to NULL, no filtering is done.\n\n Note that the default motion event filter will only allow touchscreen events\n through, in order to mimic NativeActivity's behaviour, so for controller\n events to be passed to the app, set the filter to NULL."]
     pub fn android_app_set_motion_event_filter(
         app: *mut android_app,
         filter: android_motion_event_filter,
@@ -10131,6 +9955,8 @@ pub struct __va_list_tag {
 }
 #[test]
 fn bindgen_test_layout___va_list_tag() {
+    const UNINIT: ::std::mem::MaybeUninit<__va_list_tag> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__va_list_tag>(),
         24usize,
@@ -10142,7 +9968,7 @@ fn bindgen_test_layout___va_list_tag() {
         concat!("Alignment of ", stringify!(__va_list_tag))
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__va_list_tag>())).gp_offset as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).gp_offset) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -10152,7 +9978,7 @@ fn bindgen_test_layout___va_list_tag() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__va_list_tag>())).fp_offset as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).fp_offset) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -10162,7 +9988,7 @@ fn bindgen_test_layout___va_list_tag() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__va_list_tag>())).overflow_arg_area as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).overflow_arg_area) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -10172,7 +9998,7 @@ fn bindgen_test_layout___va_list_tag() {
         )
     );
     assert_eq!(
-        unsafe { &(*(::std::ptr::null::<__va_list_tag>())).reg_save_area as *const _ as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).reg_save_area) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",

From a604c0aa9f9523f5e35a09fafb14e9550a785f3d Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Sat, 22 Jul 2023 18:09:18 +0100
Subject: [PATCH 20/93] game-activity: Integrate GameActivity 2.0.2

---
 android-activity/CHANGELOG.md             |  7 ++--
 android-activity/build.rs                 |  9 +++++-
 android-activity/src/game_activity/mod.rs | 39 ++++++++++++++++-------
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/android-activity/CHANGELOG.md b/android-activity/CHANGELOG.md
index 4453871..35afefa 100644
--- a/android-activity/CHANGELOG.md
+++ b/android-activity/CHANGELOG.md
@@ -5,11 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- GameActivity updated to 2.0.2 (requires the corresponding 2.0.2 `.aar` release from Google) ([#88](https://github.com/rust-mobile/android-activity/pull/88))
 
 ## [0.4.3] - 2022-07-30
 ### Fixed
 - Fixed a deadlock in the `native-activity` backend while waiting for the native thread after getting an `onDestroy` callback from Java ([#94](https://github.com/rust-mobile/android-activity/pull/94))
-
 - Fixed numerous deadlocks in the `game-activity` backend with how it would wait for the native thread in various Java callbacks, after the app has returned from `android_main` ([#98](https://github.com/rust-mobile/android-activity/pull/98))
 
 ## [0.4.2] - 2022-06-17
@@ -26,7 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Removed some overly-verbose logging in the `native-activity` backend ([#49](https://github.com/rust-mobile/android-activity/pull/49))
 ### Removed
-- Most of the examples were moved to https://github.com/rust-mobile/rust-android-examples ([#50](https://github.com/rust-mobile/android-activity/pull/50))
+- Most of the examples were moved to <https://github.com/rust-mobile/rust-android-examples> ([#50](https://github.com/rust-mobile/android-activity/pull/50))
 
 ## [0.4] - 2022-11-10
 ### Changed
@@ -61,4 +62,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.1] - 2022-07-04
 ### Added
-- Initial release
\ No newline at end of file
+- Initial release
diff --git a/android-activity/build.rs b/android-activity/build.rs
index 305b6ba..7fc92e7 100644
--- a/android-activity/build.rs
+++ b/android-activity/build.rs
@@ -1,13 +1,20 @@
 #![allow(dead_code)]
 
 fn build_glue_for_game_activity() {
-    for f in ["GameActivity.h", "GameActivity.cpp"] {
+    for f in [
+        "GameActivity.h",
+        "GameActivity.cpp",
+        "GameActivityEvents.h",
+        "GameActivityEvents.cpp",
+        "GameActivityLog.h",
+    ] {
         println!("cargo:rerun-if-changed=game-activity-csrc/game-activity/{f}");
     }
     cc::Build::new()
         .cpp(true)
         .include("game-activity-csrc")
         .file("game-activity-csrc/game-activity/GameActivity.cpp")
+        .file("game-activity-csrc/game-activity/GameActivityEvents.cpp")
         .extra_warnings(false)
         .cpp_link_stdlib("c++_static")
         .compile("libgame_activity.a");
diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index d43dc6e..95aef1d 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -467,7 +467,17 @@ impl<'a> MotionEventsLendingIterator<'a> {
     }
     fn next(&mut self) -> Option<MotionEvent<'a>> {
         if self.pos < self.count {
-            let ga_event = unsafe { &(*self.buffer.ptr.as_ptr()).motionEvents[self.pos] };
+            // Safety:
+            // - This iterator currently has exclusive access to the front buffer of events
+            // - We know the buffer is non-null
+            // - `pos` is less than the number of events stored in the buffer
+            let ga_event = unsafe {
+                (*self.buffer.ptr.as_ptr())
+                    .motionEvents
+                    .offset(self.pos as isize)
+                    .as_ref()
+                    .unwrap()
+            };
             let event = MotionEvent::new(ga_event);
             self.pos += 1;
             Some(event)
@@ -496,7 +506,17 @@ impl<'a> KeyEventsLendingIterator<'a> {
     }
     fn next(&mut self) -> Option<KeyEvent<'a>> {
         if self.pos < self.count {
-            let ga_event = unsafe { &(*self.buffer.ptr.as_ptr()).keyEvents[self.pos] };
+            // Safety:
+            // - This iterator currently has exclusive access to the front buffer of events
+            // - We know the buffer is non-null
+            // - `pos` is less than the number of events stored in the buffer
+            let ga_event = unsafe {
+                (*self.buffer.ptr.as_ptr())
+                    .keyEvents
+                    .offset(self.pos as isize)
+                    .as_ref()
+                    .unwrap()
+            };
             let event = KeyEvent::new(ga_event);
             self.pos += 1;
             Some(event)
@@ -543,16 +563,15 @@ impl<'a> Drop for InputBuffer<'a> {
 //
 // https://github.com/rust-lang/rfcs/issues/2771
 extern "C" {
-    pub fn Java_com_google_androidgamesdk_GameActivity_loadNativeCode_C(
+    pub fn Java_com_google_androidgamesdk_GameActivity_initializeNativeCode_C(
         env: *mut JNIEnv,
         javaGameActivity: jobject,
-        path: jstring,
-        funcName: jstring,
         internalDataDir: jstring,
         obbDir: jstring,
         externalDataDir: jstring,
         jAssetMgr: jobject,
         savedState: jbyteArray,
+        javaConfig: jobject,
     ) -> jlong;
 
     pub fn GameActivity_onCreate_C(
@@ -563,27 +582,25 @@ extern "C" {
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn Java_com_google_androidgamesdk_GameActivity_loadNativeCode(
+pub unsafe extern "C" fn Java_com_google_androidgamesdk_GameActivity_initializeNativeCode(
     env: *mut JNIEnv,
     java_game_activity: jobject,
-    path: jstring,
-    func_name: jstring,
     internal_data_dir: jstring,
     obb_dir: jstring,
     external_data_dir: jstring,
     jasset_mgr: jobject,
     saved_state: jbyteArray,
+    java_config: jobject,
 ) -> jni_sys::jlong {
-    Java_com_google_androidgamesdk_GameActivity_loadNativeCode_C(
+    Java_com_google_androidgamesdk_GameActivity_initializeNativeCode_C(
         env,
         java_game_activity,
-        path,
-        func_name,
         internal_data_dir,
         obb_dir,
         external_data_dir,
         jasset_mgr,
         saved_state,
+        java_config,
     )
 }
 

From c22a5453df3575e4b990ed606abba6b531c1862c Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Sun, 23 Jul 2023 16:41:14 +0100
Subject: [PATCH 21/93] game-activity: Remove Deref implementations for
 Key/MotionEvent types

---
 android-activity/src/game_activity/input.rs | 94 +++++++++------------
 1 file changed, 39 insertions(+), 55 deletions(-)

diff --git a/android-activity/src/game_activity/input.rs b/android-activity/src/game_activity/input.rs
index 0f29a42..63f04e7 100644
--- a/android-activity/src/game_activity/input.rs
+++ b/android-activity/src/game_activity/input.rs
@@ -14,7 +14,7 @@
 // by masking bits from the `Source`.
 
 use num_enum::{IntoPrimitive, TryFromPrimitive};
-use std::{convert::TryInto, ops::Deref};
+use std::convert::TryInto;
 
 use crate::game_activity::ffi::{GameActivityKeyEvent, GameActivityMotionEvent};
 use crate::input::{Class, Source};
@@ -114,14 +114,6 @@ pub struct MotionEvent<'a> {
     ga_event: &'a GameActivityMotionEvent,
 }
 
-impl<'a> Deref for MotionEvent<'a> {
-    type Target = GameActivityMotionEvent;
-
-    fn deref(&self) -> &Self::Target {
-        self.ga_event
-    }
-}
-
 /// A motion action.
 ///
 /// See [the NDK
@@ -295,7 +287,7 @@ impl<'a> MotionEvent<'a> {
     ///
     #[inline]
     pub fn source(&self) -> Source {
-        let source = self.source as u32;
+        let source = self.ga_event.source as u32;
         source.try_into().unwrap_or(Source::Unknown)
     }
 
@@ -310,7 +302,7 @@ impl<'a> MotionEvent<'a> {
     ///
     #[inline]
     pub fn device_id(&self) -> i32 {
-        self.deviceId
+        self.ga_event.deviceId
     }
 
     /// Returns the motion action associated with the event.
@@ -318,7 +310,7 @@ impl<'a> MotionEvent<'a> {
     /// See [the MotionEvent docs](https://developer.android.com/reference/android/view/MotionEvent#getActionMasked())
     #[inline]
     pub fn action(&self) -> MotionAction {
-        let action = self.action as u32 & ndk_sys::AMOTION_EVENT_ACTION_MASK;
+        let action = self.ga_event.action as u32 & ndk_sys::AMOTION_EVENT_ACTION_MASK;
         action.try_into().unwrap()
     }
 
@@ -327,12 +319,12 @@ impl<'a> MotionEvent<'a> {
     /// Pointer indices can change per motion event.  For an identifier that stays the same, see
     /// [`Pointer::pointer_id()`].
     ///
-    /// This only has a meaning when the [action](Self::action) is one of [`Up`](MotionAction::Up),
+    /// This only has a meaning when the [action](self::action) is one of [`Up`](MotionAction::Up),
     /// [`Down`](MotionAction::Down), [`PointerUp`](MotionAction::PointerUp),
     /// or [`PointerDown`](MotionAction::PointerDown).
     #[inline]
     pub fn pointer_index(&self) -> usize {
-        let action = self.action as u32;
+        let action = self.ga_event.action as u32;
         let index = (action & ndk_sys::AMOTION_EVENT_ACTION_POINTER_INDEX_MASK)
             >> ndk_sys::AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
         index as usize
@@ -345,8 +337,8 @@ impl<'a> MotionEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getpointerid)
     // TODO: look at output with out-of-range pointer index
     // Probably -1 though
-    pub fn pointer_id_for(&self, pointer_index: usize) -> i32 {
-        unsafe { ndk_sys::AMotionEvent_getPointerId(self.ptr.as_ptr(), pointer_index) }
+    pub fn pointer_id_for(&self.ga_event, pointer_index: usize) -> i32 {
+        unsafe { ndk_sys::AMotionEvent_getPointerId(self.ga_event.ptr.as_ptr(), pointer_index) }
     }
     */
 
@@ -355,7 +347,7 @@ impl<'a> MotionEvent<'a> {
     /// See [the MotionEvent docs](https://developer.android.com/reference/android/view/MotionEvent#getPointerCount())
     #[inline]
     pub fn pointer_count(&self) -> usize {
-        self.pointerCount as usize
+        self.ga_event.pointerCount as usize
     }
 
     /// An iterator over the pointers in this motion event
@@ -370,7 +362,7 @@ impl<'a> MotionEvent<'a> {
 
     /// The pointer at a given pointer index. Panics if the pointer index is out of bounds.
     ///
-    /// If you need to loop over all the pointers, prefer the [`pointers()`](Self::pointers) method.
+    /// If you need to loop over all the pointers, prefer the [`pointers()`](self::pointers) method.
     #[inline]
     pub fn pointer_at_index(&self, index: usize) -> Pointer<'_> {
         if index >= self.pointer_count() {
@@ -386,14 +378,14 @@ impl<'a> MotionEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_gethistorysize)
     #[inline]
     pub fn history_size(&self) -> usize {
-        unsafe { ndk_sys::AMotionEvent_getHistorySize(self.ptr.as_ptr()) as usize }
+        unsafe { ndk_sys::AMotionEvent_getHistorySize(self.ga_event.ptr.as_ptr()) as usize }
     }
 
     /// An iterator over the historical events contained in this event.
     #[inline]
     pub fn history(&self) -> HistoricalMotionEventsIter<'_> {
         HistoricalMotionEventsIter {
-            event: self.ptr,
+            event: self.ga_event.ptr,
             next_history_index: 0,
             history_size: self.history_size(),
             _marker: std::marker::PhantomData,
@@ -407,7 +399,7 @@ impl<'a> MotionEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getmetastate)
     #[inline]
     pub fn meta_state(&self) -> MetaState {
-        MetaState(self.metaState as u32)
+        MetaState(self.ga_event.metaState as u32)
     }
 
     /// Returns the button state during this event, as a bitfield.
@@ -416,7 +408,7 @@ impl<'a> MotionEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getbuttonstate)
     #[inline]
     pub fn button_state(&self) -> ButtonState {
-        ButtonState(self.buttonState as u32)
+        ButtonState(self.ga_event.buttonState as u32)
     }
 
     /// Returns the time of the start of this gesture, in the `java.lang.System.nanoTime()` time
@@ -426,7 +418,7 @@ impl<'a> MotionEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getdowntime)
     #[inline]
     pub fn down_time(&self) -> i64 {
-        self.downTime
+        self.ga_event.downTime
     }
 
     /// Returns a bitfield indicating which edges were touched by this event.
@@ -435,7 +427,7 @@ impl<'a> MotionEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getedgeflags)
     #[inline]
     pub fn edge_flags(&self) -> EdgeFlags {
-        EdgeFlags(self.edgeFlags as u32)
+        EdgeFlags(self.ga_event.edgeFlags as u32)
     }
 
     /// Returns the time of this event, in the `java.lang.System.nanoTime()` time base
@@ -444,7 +436,7 @@ impl<'a> MotionEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_geteventtime)
     #[inline]
     pub fn event_time(&self) -> i64 {
-        self.eventTime
+        self.ga_event.eventTime
     }
 
     /// The flags associated with a motion event.
@@ -453,7 +445,7 @@ impl<'a> MotionEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getflags)
     #[inline]
     pub fn flags(&self) -> MotionEventFlags {
-        MotionEventFlags(self.flags as u32)
+        MotionEventFlags(self.ga_event.flags as u32)
     }
 
     /* Missing from GameActivity currently...
@@ -462,8 +454,8 @@ impl<'a> MotionEvent<'a> {
     /// See [the NDK
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getxoffset)
     #[inline]
-    pub fn x_offset(&self) -> f32 {
-        self.x_offset
+    pub fn x_offset(&self.ga_event) -> f32 {
+        self.ga_event.x_offset
     }
 
     /// Returns the offset in the y direction between the coordinates and the raw coordinates
@@ -471,8 +463,8 @@ impl<'a> MotionEvent<'a> {
     /// See [the NDK
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getyoffset)
     #[inline]
-    pub fn y_offset(&self) -> f32 {
-        self.y_offset
+    pub fn y_offset(&self.ga_event) -> f32 {
+        self.ga_event.y_offset
     }
     */
 
@@ -482,7 +474,7 @@ impl<'a> MotionEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getxprecision)
     #[inline]
     pub fn x_precision(&self) -> f32 {
-        self.precisionX
+        self.ga_event.precisionX
     }
 
     /// Returns the precision of the y value of the coordinates
@@ -491,7 +483,7 @@ impl<'a> MotionEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getyprecision)
     #[inline]
     pub fn y_precision(&self) -> f32 {
-        self.precisionY
+        self.ga_event.precisionY
     }
 }
 
@@ -510,13 +502,13 @@ impl<'a> Pointer<'a> {
 
     #[inline]
     pub fn pointer_id(&self) -> i32 {
-        let pointer = &self.event.pointers[self.index];
+        let pointer = &self.event.ga_event.pointers[self.index];
         pointer.id
     }
 
     #[inline]
     pub fn axis_value(&self, axis: Axis) -> f32 {
-        let pointer = &self.event.pointers[self.index];
+        let pointer = &self.event.ga_event.pointers[self.index];
         pointer.axisValues[axis as u32 as usize]
     }
 
@@ -532,13 +524,13 @@ impl<'a> Pointer<'a> {
 
     #[inline]
     pub fn raw_x(&self) -> f32 {
-        let pointer = &self.event.pointers[self.index];
+        let pointer = &self.event.ga_event.pointers[self.index];
         pointer.rawX
     }
 
     #[inline]
     pub fn raw_y(&self) -> f32 {
-        let pointer = &self.event.pointers[self.index];
+        let pointer = &self.event.ga_event.pointers[self.index];
         pointer.rawY
     }
 
@@ -579,7 +571,7 @@ impl<'a> Pointer<'a> {
 
     #[inline]
     pub fn tool_type(&self) -> ToolType {
-        let pointer = &self.event.pointers[self.index];
+        let pointer = &self.event.ga_event.pointers[self.index];
         let tool_type = pointer.toolType as u32;
         tool_type.try_into().unwrap()
     }
@@ -937,14 +929,6 @@ pub struct KeyEvent<'a> {
     ga_event: &'a GameActivityKeyEvent,
 }
 
-impl<'a> Deref for KeyEvent<'a> {
-    type Target = GameActivityKeyEvent;
-
-    fn deref(&self) -> &Self::Target {
-        self.ga_event
-    }
-}
-
 /// Key actions.
 ///
 /// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-27)
@@ -1262,7 +1246,7 @@ impl<'a> KeyEvent<'a> {
     ///
     #[inline]
     pub fn source(&self) -> Source {
-        let source = self.source as u32;
+        let source = self.ga_event.source as u32;
         source.try_into().unwrap_or(Source::Unknown)
     }
 
@@ -1277,7 +1261,7 @@ impl<'a> KeyEvent<'a> {
     ///
     #[inline]
     pub fn device_id(&self) -> i32 {
-        self.deviceId
+        self.ga_event.deviceId
     }
 
     /// Returns the key action associated with the event.
@@ -1285,7 +1269,7 @@ impl<'a> KeyEvent<'a> {
     /// See [the KeyEvent docs](https://developer.android.com/reference/android/view/KeyEvent#getAction())
     #[inline]
     pub fn action(&self) -> KeyAction {
-        let action = self.action as u32;
+        let action = self.ga_event.action as u32;
         action.try_into().unwrap()
     }
 
@@ -1296,7 +1280,7 @@ impl<'a> KeyEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#akeyevent_getdowntime)
     #[inline]
     pub fn down_time(&self) -> i64 {
-        self.downTime
+        self.ga_event.downTime
     }
 
     /// Returns the time this event occured.  This is on the scale of
@@ -1306,7 +1290,7 @@ impl<'a> KeyEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#akeyevent_geteventtime)
     #[inline]
     pub fn event_time(&self) -> i64 {
-        self.eventTime
+        self.ga_event.eventTime
     }
 
     /// Returns the keycode associated with this key event
@@ -1315,7 +1299,7 @@ impl<'a> KeyEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#akeyevent_getkeycode)
     #[inline]
     pub fn key_code(&self) -> Keycode {
-        let keycode = self.keyCode as u32;
+        let keycode = self.ga_event.keyCode as u32;
         keycode.try_into().unwrap_or(Keycode::Unknown)
     }
 
@@ -1325,7 +1309,7 @@ impl<'a> KeyEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#akeyevent_getrepeatcount)
     #[inline]
     pub fn repeat_count(&self) -> i32 {
-        self.repeatCount
+        self.ga_event.repeatCount
     }
 
     /// Returns the hardware keycode of a key.  This varies from device to device.
@@ -1334,7 +1318,7 @@ impl<'a> KeyEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#akeyevent_getscancode)
     #[inline]
     pub fn scan_code(&self) -> i32 {
-        self.scanCode
+        self.ga_event.scanCode
     }
 }
 
@@ -1397,7 +1381,7 @@ impl<'a> KeyEvent<'a> {
     /// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#akeyevent_getflags)
     #[inline]
     pub fn flags(&self) -> KeyEventFlags {
-        KeyEventFlags(self.flags as u32)
+        KeyEventFlags(self.ga_event.flags as u32)
     }
 
     /// Returns the state of the modifiers during this key event, represented by a bitmask.
@@ -1406,6 +1390,6 @@ impl<'a> KeyEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#akeyevent_getmetastate)
     #[inline]
     pub fn meta_state(&self) -> MetaState {
-        MetaState(self.metaState as u32)
+        MetaState(self.ga_event.metaState as u32)
     }
 }

From 41f30c39ad09f90b7d721626ffbb86bfdc931b81 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 12 Sep 2022 17:14:49 +0100
Subject: [PATCH 22/93] Expose TextEvent and input method state

This also adds `InputEvent::TextEvent` for notifying applications of IME
state changes as well as explicit getter/setter APIs for tracking IME
selection + compose region state. (only supported with GameActivity)

Fixes: #18
---
 android-activity/Cargo.toml                   |   1 +
 .../native_app_glue/android_native_app_glue.c |   1 +
 android-activity/src/game_activity/input.rs   |   1 +
 android-activity/src/game_activity/mod.rs     | 140 +++++++++++++++++-
 android-activity/src/input.rs                 |  38 +++++
 android-activity/src/lib.rs                   |  10 ++
 android-activity/src/native_activity/input.rs |   1 +
 android-activity/src/native_activity/mod.rs   |  16 ++
 8 files changed, 207 insertions(+), 1 deletion(-)

diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index d60bca4..25c3449 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -25,6 +25,7 @@ native-activity = []
 [dependencies]
 log = "0.4"
 jni-sys = "0.3"
+cesu8 = "1"
 ndk = "0.7"
 ndk-sys = "0.4"
 ndk-context = "0.1"
diff --git a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
index b78a44f..a7bcb85 100644
--- a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
+++ b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
@@ -674,6 +674,7 @@ static void onTextInputEvent(GameActivity* activity,
     pthread_mutex_lock(&android_app->mutex);
     if (!android_app->destroyed) {
         android_app->textInputState = 1;
+        notifyInput(android_app);
     }
     pthread_mutex_unlock(&android_app->mutex);
 }
diff --git a/android-activity/src/game_activity/input.rs b/android-activity/src/game_activity/input.rs
index 63f04e7..ba442b7 100644
--- a/android-activity/src/game_activity/input.rs
+++ b/android-activity/src/game_activity/input.rs
@@ -26,6 +26,7 @@ use crate::input::{Class, Source};
 pub enum InputEvent<'a> {
     MotionEvent(MotionEvent<'a>),
     KeyEvent(KeyEvent<'a>),
+    TextEvent(crate::input::TextInputState),
 }
 
 /// A bitfield representing the state of modifier keys during an event.
diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index 95aef1d..fd9da25 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -32,6 +32,7 @@ use crate::{
 mod ffi;
 
 pub mod input;
+use crate::input::{TextInputState, TextSpan};
 use input::{Axis, InputEvent, KeyEvent, MotionEvent};
 
 // The only time it's safe to update the android_app->savedState pointer is
@@ -360,6 +361,121 @@ impl AndroidAppInner {
         }
     }
 
+    unsafe extern "C" fn map_input_state_to_text_event_callback(
+        context: *mut c_void,
+        state: *const ffi::GameTextInputState,
+    ) {
+        // Java uses a modified UTF-8 format, which is a modified cesu8 format
+        let out_ptr: *mut TextInputState = context.cast();
+        let text_modified_utf8: *const u8 = (*state).text_UTF8.cast();
+        let text_modified_utf8 =
+            std::slice::from_raw_parts(text_modified_utf8, (*state).text_length as usize);
+        match cesu8::from_java_cesu8(&text_modified_utf8) {
+            Ok(str) => {
+                let len = *&str.len();
+                (*out_ptr).text = String::from(str);
+
+                let selection_start = (*state).selection.start.clamp(0, len as i32 + 1);
+                let selection_end = (*state).selection.end.clamp(0, len as i32 + 1);
+                (*out_ptr).selection = TextSpan {
+                    start: selection_start as usize,
+                    end: selection_end as usize,
+                };
+                if (*state).composingRegion.start < 0 || (*state).composingRegion.end < 0 {
+                    (*out_ptr).compose_region = None;
+                } else {
+                    (*out_ptr).compose_region = Some(TextSpan {
+                        start: (*state).composingRegion.start as usize,
+                        end: (*state).composingRegion.end as usize,
+                    });
+                }
+            }
+            Err(err) => {
+                log::error!("Invalid UTF8 text in TextEvent: {}", err);
+            }
+        }
+    }
+
+    // TODO: move into a trait
+    pub fn text_input_state(&self) -> TextInputState {
+        unsafe {
+            let activity = (*self.native_app.as_ptr()).activity;
+            let mut out_state = TextInputState {
+                text: String::new(),
+                selection: TextSpan { start: 0, end: 0 },
+                compose_region: None,
+            };
+            let out_ptr = &mut out_state as *mut TextInputState;
+
+            // NEON WARNING:
+            //
+            // It's not clearly documented but the GameActivity API over the
+            // GameTextInput library directly exposes _modified_ UTF8 text
+            // from Java so we need to be careful to convert text to and
+            // from UTF8
+            //
+            // GameTextInput also uses a pre-allocated, fixed-sized buffer for the current
+            // text state but GameTextInput doesn't actually provide it's own thread
+            // safe API to safely access this state  so we have to cooperate with
+            // the GameActivity code that does locking when reading/writing the state
+            // (I.e. we can't just punch through to the GameTextInput layer from here).
+            //
+            // Overall this is all quite gnarly - and probably a good reminder of why
+            // we want to use Rust instead of C/C++.
+            ffi::GameActivity_getTextInputState(
+                activity,
+                Some(AndroidAppInner::map_input_state_to_text_event_callback),
+                out_ptr.cast(),
+            );
+
+            out_state
+        }
+    }
+
+    // TODO: move into a trait
+    pub fn set_text_input_state(&self, state: TextInputState) {
+        unsafe {
+            let activity = (*self.native_app.as_ptr()).activity;
+            let modified_utf8 = cesu8::to_java_cesu8(&state.text);
+            let text_length = modified_utf8.len() as i32;
+            let modified_utf8_bytes = modified_utf8.as_ptr();
+            let ffi_state = ffi::GameTextInputState {
+                text_UTF8: modified_utf8_bytes.cast(), // NB: may be signed or unsigned depending on target
+                text_length,
+                selection: ffi::GameTextInputSpan {
+                    start: state.selection.start as i32,
+                    end: state.selection.end as i32,
+                },
+                composingRegion: match state.compose_region {
+                    Some(span) => {
+                        // The GameText subclass of InputConnection only has a special case for removing the
+                        // compose region if `start == -1` but the docs for `setComposingRegion` imply that
+                        // the region should effectively be removed if any empty region is given (unlike for the
+                        // selection region, it's not meaningful to maintain an empty compose region)
+                        //
+                        // We aim for more consistent behaviour by normalizing any empty region into `(-1, -1)`
+                        // to remove the compose region.
+                        //
+                        // NB `setComposingRegion` itself is documented to clamp start/end to the text bounds
+                        // so apart from this special-case handling in GameText's implementation of
+                        // `setComposingRegion` then there's nothing special about `(-1, -1)` - it's just an empty
+                        // region that should get clamped to `(0, 0)` and then get removed.
+                        if span.start == span.end {
+                            ffi::GameTextInputSpan { start: -1, end: -1 }
+                        } else {
+                            ffi::GameTextInputSpan {
+                                start: span.start as i32,
+                                end: span.end as i32,
+                            }
+                        }
+                    }
+                    None => ffi::GameTextInputSpan { start: -1, end: -1 },
+                },
+            };
+            ffi::GameActivity_setTextInputState(activity, &ffi_state as *const _);
+        }
+    }
+
     pub fn enable_motion_axis(&mut self, axis: Axis) {
         unsafe { ffi::GameActivityPointerAxes_enableAxis(axis as i32) }
     }
@@ -403,7 +519,7 @@ impl AndroidAppInner {
         }
     }
 
-    pub fn input_events<F>(&self, mut callback: F)
+    fn dispatch_key_and_motion_events<F>(&self, mut callback: F)
     where
         F: FnMut(&InputEvent) -> InputStatus,
     {
@@ -426,6 +542,28 @@ impl AndroidAppInner {
         }
     }
 
+    fn dispatch_text_events<F>(&self, mut callback: F)
+    where
+        F: FnMut(&InputEvent) -> InputStatus,
+    {
+        unsafe {
+            let app_ptr = self.native_app.as_ptr();
+            if (*app_ptr).textInputState != 0 {
+                let state = self.text_input_state();
+                callback(&InputEvent::TextEvent(state));
+                (*app_ptr).textInputState = 0;
+            }
+        }
+    }
+
+    pub fn input_events<F>(&self, mut callback: F)
+    where
+        F: FnMut(&InputEvent) -> InputStatus,
+    {
+        self.dispatch_key_and_motion_events(&mut callback);
+        self.dispatch_text_events(&mut callback);
+    }
+
     pub fn internal_data_path(&self) -> Option<std::path::PathBuf> {
         unsafe {
             let app_ptr = self.native_app.as_ptr();
diff --git a/android-activity/src/input.rs b/android-activity/src/input.rs
index f28d1a9..372965e 100644
--- a/android-activity/src/input.rs
+++ b/android-activity/src/input.rs
@@ -81,3 +81,41 @@ impl From<Source> for Class {
         source.into()
     }
 }
+
+/// This struct holds a span within a region of text from `start` to `end`.
+///
+/// The `start` index may be greater than the `end` index (swapping `start` and `end` will represent the same span)
+///
+/// The lower index is inclusive and the higher index is exclusive.
+///
+/// An empty span or cursor position is specified with `start == end`.
+///
+#[derive(Debug, Clone, Copy)]
+pub struct TextSpan {
+    /// The start of the span (inclusive)
+    pub start: usize,
+
+    /// The end of the span (exclusive)
+    pub end: usize,
+}
+
+#[derive(Debug, Clone)]
+pub struct TextInputState {
+    pub text: String,
+
+    /// A selection defined on the text.
+    ///
+    /// To set the cursor position, start and end should have the same value.
+    ///
+    /// Changing the selection has no effect on the compose_region.
+    pub selection: TextSpan,
+
+    /// A composing region defined on the text.
+    ///
+    /// When being set, then if there was a composing region, the region is replaced.
+    ///
+    /// The given indices will be clamped to the `text` bounds
+    ///
+    /// If the resulting region is zero-sized, no region is marked (equivalent to passing `None`)
+    pub compose_region: Option<TextSpan>,
+}
diff --git a/android-activity/src/lib.rs b/android-activity/src/lib.rs
index 6ae6b0c..0650e04 100644
--- a/android-activity/src/lib.rs
+++ b/android-activity/src/lib.rs
@@ -618,6 +618,16 @@ impl AndroidApp {
             .hide_soft_input(hide_implicit_only);
     }
 
+    /// Fetch the current input text state, as updated by any active IME.
+    pub fn text_input_state(&self) -> input::TextInputState {
+        self.inner.read().unwrap().text_input_state()
+    }
+
+    /// Forward the given input text `state` to any active IME.
+    pub fn set_text_input_state(&self, state: input::TextInputState) {
+        self.inner.read().unwrap().set_text_input_state(state);
+    }
+
     /// Query and process all out-standing input event
     ///
     /// `callback` should return [`InputStatus::Unhandled`] for any input events that aren't directly
diff --git a/android-activity/src/native_activity/input.rs b/android-activity/src/native_activity/input.rs
index 17e8f4b..08db48f 100644
--- a/android-activity/src/native_activity/input.rs
+++ b/android-activity/src/native_activity/input.rs
@@ -337,4 +337,5 @@ impl<'a> KeyEvent<'a> {
 pub enum InputEvent<'a> {
     MotionEvent(self::MotionEvent<'a>),
     KeyEvent(self::KeyEvent<'a>),
+    TextEvent(crate::input::TextInputState),
 }
diff --git a/android-activity/src/native_activity/mod.rs b/android-activity/src/native_activity/mod.rs
index e0bb330..3f16550 100644
--- a/android-activity/src/native_activity/mod.rs
+++ b/android-activity/src/native_activity/mod.rs
@@ -9,6 +9,7 @@ use libc::c_void;
 use log::{error, trace};
 use ndk::{asset::AssetManager, native_window::NativeWindow};
 
+use crate::input::{TextInputState, TextSpan};
 use crate::{
     util, AndroidApp, ConfigurationRef, InputStatus, MainEvent, PollEvent, Rect, WindowManagerFlags,
 };
@@ -341,6 +342,20 @@ impl AndroidAppInner {
         }
     }
 
+    // TODO: move into a trait
+    pub fn text_input_state(&self) -> TextInputState {
+        TextInputState {
+            text: String::new(),
+            selection: TextSpan { start: 0, end: 0 },
+            compose_region: None,
+        }
+    }
+
+    // TODO: move into a trait
+    pub fn set_text_input_state(&self, _state: TextInputState) {
+        // NOP: Unsupported
+    }
+
     pub fn enable_motion_axis(&self, _axis: input::Axis) {
         // NOP - The InputQueue API doesn't let us optimize which axis values are read
     }
@@ -390,6 +405,7 @@ impl AndroidAppInner {
                     input::InputEvent::KeyEvent(e) => {
                         ndk::event::InputEvent::KeyEvent(e.into_ndk_event())
                     }
+                    _ => unreachable!(),
                 };
                 queue.finish_event(ndk_event, matches!(handled, InputStatus::Handled));
             }

From 74f510a99ac37d803ebe7a1682d042c23a3d075a Mon Sep 17 00:00:00 2001
From: dAxpeDDa <daxpedda@gmail.com>
Date: Sun, 28 May 2023 20:09:20 +0200
Subject: [PATCH 23/93] Bump `bitflags` to v2

---
 android-activity/Cargo.toml   | 2 +-
 android-activity/src/input.rs | 1 +
 android-activity/src/lib.rs   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 25c3449..9b70e95 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -31,7 +31,7 @@ ndk-sys = "0.4"
 ndk-context = "0.1"
 android-properties = "0.2"
 num_enum = "0.6"
-bitflags = "1.3"
+bitflags = "2.0"
 libc = "0.2"
 
 [build-dependencies]
diff --git a/android-activity/src/input.rs b/android-activity/src/input.rs
index 372965e..b9edf7e 100644
--- a/android-activity/src/input.rs
+++ b/android-activity/src/input.rs
@@ -36,6 +36,7 @@ pub enum Source {
 }
 
 bitflags! {
+    #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
     struct SourceFlags: u32 {
         const CLASS_MASK = 0x000000ff;
 
diff --git a/android-activity/src/lib.rs b/android-activity/src/lib.rs
index 0650e04..e00a902 100644
--- a/android-activity/src/lib.rs
+++ b/android-activity/src/lib.rs
@@ -275,6 +275,7 @@ pub use activity_impl::AndroidAppWaker;
 bitflags! {
     /// Flags for [`AndroidApp::set_window_flags`]
     /// as per the [android.view.WindowManager.LayoutParams Java API](https://developer.android.com/reference/android/view/WindowManager.LayoutParams)
+    #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
     pub struct WindowManagerFlags: u32 {
         /// As long as this window is visible to the user, allow the lock
         /// screen to activate while the screen is on.  This can be used

From 66cfc68dac2a28e584c02f0ee4278fa7376aafee Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Thu, 3 Aug 2023 17:01:27 +0100
Subject: [PATCH 24/93] Bump MSRV to 1.68

- Lets us build with cargo ndk 3+
- Lets us remove suppression for false-negative clippy warning about unsafe
  blocks in unsafe functions
- Should unblock CI for #102

- 1.68.0 notably also builds the standard library with a newer r25 NDK
  toolchain which avoid the need for awkward libgcc workarounds, so it's
  anyway a desirable baseline for Android projects.
---
 .github/workflows/ci.yml                     | 6 ++----
 android-activity/Cargo.toml                  | 2 +-
 android-activity/src/game_activity/mod.rs    | 1 -
 android-activity/src/native_activity/glue.rs | 1 -
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c4d7c13..d465dba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         # See top README for MSRV policy
-        rust_version: [1.64.0, stable]
+        rust_version: [1.68.0, stable]
     steps:
       - uses: actions/checkout@v3
 
@@ -34,9 +34,7 @@ jobs:
           i686-linux-android
 
       - name: Install cargo-ndk
-        # We're currently sticking with cargo-ndk 2, until we bump our
-        # MSRV to 1.68+
-        run: cargo install cargo-ndk --version "^2"
+        run: cargo install cargo-ndk
 
       - name: Setup Java
         uses: actions/setup-java@v3
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 9b70e95..2927952 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/rust-mobile/android-activity"
 documentation = "https://docs.rs/android-activity"
 description = "Glue for building Rust applications on Android with NativeActivity or GameActivity"
 license = "MIT OR Apache-2.0"
-rust-version = "1.64"
+rust-version = "1.68.0"
 
 [features]
 # Note: we don't enable any backend by default since features
diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index fd9da25..623a6a6 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -759,7 +759,6 @@ extern "Rust" {
 // `app_main` function. This is run on a dedicated thread spawned
 // by android_native_app_glue.
 #[no_mangle]
-#[allow(unused_unsafe)] // Otherwise rust 1.64 moans about using unsafe{} in unsafe functions
 pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
     abort_on_panic(|| {
         // Maybe make this stdout/stderr redirection an optional / opt-in feature?...
diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index 6682857..58a0a27 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -828,7 +828,6 @@ unsafe extern "C" fn on_content_rect_changed(
 
 /// This is the native entrypoint for our cdylib library that `ANativeActivity` will look for via `dlsym`
 #[no_mangle]
-#[allow(unused_unsafe)] // Otherwise rust 1.64 moans about using unsafe{} in unsafe functions
 extern "C" fn ANativeActivity_onCreate(
     activity: *mut ndk_sys::ANativeActivity,
     saved_state: *const libc::c_void,

From 1abb02c82087eaed4e2e0ab7a5dc8fd3969916fc Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Fri, 4 Aug 2023 15:37:05 +0100
Subject: [PATCH 25/93] Revert 'Bump MSRV to 1.68'

This effectively reverts 66cfc68dac2a28e584c02f0ee4278fa7376aafee
and adds some comments explaining that we're currently blocked by
Winit's MSRV policy + CI from being able to increase our
rust-version.

This is a frustrating conflict that I hope can be addressed by
updating Winit's CI system to allow different platforms to require
more recent versions of Rust (which notably isn't in conflict with
setting a conservative rust-version in Winit for supporting Debian
on Linux)

This re-instates building android-activity with cargo-ndk 2 because
building on Android with 1.64 requires a linker workaround that's
not implemented in newer version of cargo-ndk.

This also reinstates the clippy false-negative warning suppression
for unsafe blocks. Again it's frustrating that we can't have good
things because of how Winit wants to support Debian which shouldn't
be relevant for Android development.

Here is an upstream issue to discuss a potential solution for this:
https://github.com/rust-windowing/winit/issues/3000
---
 .github/workflows/ci.yml                     | 10 +++++++---
 android-activity/Cargo.toml                  | 14 +++++++++++++-
 android-activity/src/game_activity/mod.rs    |  1 +
 android-activity/src/native_activity/glue.rs |  1 +
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d465dba..dc71ede 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,8 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # See top README for MSRV policy
-        rust_version: [1.68.0, stable]
+        # XXX: We are currently constrained by Winit's MSRV policy + CI system
+        # See Cargo.toml for details
+        rust_version: [1.64.0, stable]
     steps:
       - uses: actions/checkout@v3
 
@@ -34,7 +35,10 @@ jobs:
           i686-linux-android
 
       - name: Install cargo-ndk
-        run: cargo install cargo-ndk
+        # XXX: We have to use an old version of cargo-ndk that supports the
+        # libgcc linker workaround for rust < 1.68 because Winit's CI system
+        # currently requires this crate to be buildable with 1.64
+        run: cargo install cargo-ndk --version "^2"
 
       - name: Setup Java
         uses: actions/setup-java@v3
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 2927952..5a01bd6 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -9,7 +9,19 @@ repository = "https://github.com/rust-mobile/android-activity"
 documentation = "https://docs.rs/android-activity"
 description = "Glue for building Rust applications on Android with NativeActivity or GameActivity"
 license = "MIT OR Apache-2.0"
-rust-version = "1.68.0"
+
+# XXX: Even though we have our own MSRV policy that says we only promise to
+# support stable releases over the last three months we actually end up
+# constrained by the MSRV policy of Winit, which is currently based on
+# supporting Alacritty on Debian Sid, and requires a > 10 month old Rust version
+#
+# This Winit policiy is unfortunately in conflict with what makes sense for
+# Android because versions below 1.68 for Android requires awkward toolchain
+# linker workarounds, and can't even be compiled with newer versions of
+# `cargo ndk` that removed these linker workarounds.
+#
+# TODO: Open a PR for Winit's CI to test Android builds using a newer toolchain.
+rust-version = "1.64"
 
 [features]
 # Note: we don't enable any backend by default since features
diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index 623a6a6..fd9da25 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -759,6 +759,7 @@ extern "Rust" {
 // `app_main` function. This is run on a dedicated thread spawned
 // by android_native_app_glue.
 #[no_mangle]
+#[allow(unused_unsafe)] // Otherwise rust 1.64 moans about using unsafe{} in unsafe functions
 pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
     abort_on_panic(|| {
         // Maybe make this stdout/stderr redirection an optional / opt-in feature?...
diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index 58a0a27..6682857 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -828,6 +828,7 @@ unsafe extern "C" fn on_content_rect_changed(
 
 /// This is the native entrypoint for our cdylib library that `ANativeActivity` will look for via `dlsym`
 #[no_mangle]
+#[allow(unused_unsafe)] // Otherwise rust 1.64 moans about using unsafe{} in unsafe functions
 extern "C" fn ANativeActivity_onCreate(
     activity: *mut ndk_sys::ANativeActivity,
     saved_state: *const libc::c_void,

From d0f10a0dd9351af7266751291fff0c4d3268a63a Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Fri, 4 Aug 2023 20:39:22 +0100
Subject: [PATCH 26/93] agdk-mainloop: update for GameActivity 2.0.2

---
 examples/agdk-mainloop/.gitignore             |  8 ++------
 examples/agdk-mainloop/.idea/.gitignore       |  3 ---
 examples/agdk-mainloop/.idea/compiler.xml     |  6 ------
 examples/agdk-mainloop/.idea/gradle.xml       | 19 -------------------
 examples/agdk-mainloop/.idea/misc.xml         |  5 +----
 examples/agdk-mainloop/.idea/vcs.xml          |  7 -------
 examples/agdk-mainloop/Cargo.toml             |  2 +-
 examples/agdk-mainloop/app/build.gradle       | 18 +++++++-----------
 .../co/realfit/agdkmainloop/MainActivity.java |  5 +++++
 .../app/src/main/res/layout/activity_main.xml | 18 ------------------
 .../app/src/main/res/values-night/themes.xml  | 16 ----------------
 .../app/src/main/res/values/themes.xml        | 17 ++---------------
 12 files changed, 18 insertions(+), 106 deletions(-)
 delete mode 100644 examples/agdk-mainloop/.idea/.gitignore
 delete mode 100644 examples/agdk-mainloop/.idea/compiler.xml
 delete mode 100644 examples/agdk-mainloop/.idea/gradle.xml
 delete mode 100644 examples/agdk-mainloop/.idea/vcs.xml
 delete mode 100644 examples/agdk-mainloop/app/src/main/res/layout/activity_main.xml
 delete mode 100644 examples/agdk-mainloop/app/src/main/res/values-night/themes.xml

diff --git a/examples/agdk-mainloop/.gitignore b/examples/agdk-mainloop/.gitignore
index 24ad84c..9f8412d 100644
--- a/examples/agdk-mainloop/.gitignore
+++ b/examples/agdk-mainloop/.gitignore
@@ -1,12 +1,8 @@
 *.iml
+.idea
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea
 .DS_Store
 /build
 /captures
diff --git a/examples/agdk-mainloop/.idea/.gitignore b/examples/agdk-mainloop/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/examples/agdk-mainloop/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/examples/agdk-mainloop/.idea/compiler.xml b/examples/agdk-mainloop/.idea/compiler.xml
deleted file mode 100644
index fb7f4a8..0000000
--- a/examples/agdk-mainloop/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/examples/agdk-mainloop/.idea/gradle.xml b/examples/agdk-mainloop/.idea/gradle.xml
deleted file mode 100644
index a2d7c21..0000000
--- a/examples/agdk-mainloop/.idea/gradle.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/examples/agdk-mainloop/.idea/misc.xml b/examples/agdk-mainloop/.idea/misc.xml
index 2a4d5b5..fb0d77e 100644
--- a/examples/agdk-mainloop/.idea/misc.xml
+++ b/examples/agdk-mainloop/.idea/misc.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/examples/agdk-mainloop/.idea/vcs.xml b/examples/agdk-mainloop/.idea/vcs.xml
deleted file mode 100644
index fdf1fc8..0000000
--- a/examples/agdk-mainloop/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/examples/agdk-mainloop/Cargo.toml b/examples/agdk-mainloop/Cargo.toml
index 6971468..536146f 100644
--- a/examples/agdk-mainloop/Cargo.toml
+++ b/examples/agdk-mainloop/Cargo.toml
@@ -14,4 +14,4 @@ ndk = "0.7"
 
 [lib]
 name="main"
-crate_type=["cdylib"]
\ No newline at end of file
+crate_type=["cdylib"]
diff --git a/examples/agdk-mainloop/app/build.gradle b/examples/agdk-mainloop/app/build.gradle
index cce660e..386a484 100644
--- a/examples/agdk-mainloop/app/build.gradle
+++ b/examples/agdk-mainloop/app/build.gradle
@@ -12,8 +12,6 @@ android {
         targetSdk 31
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -38,12 +36,10 @@ android {
 
 dependencies {
 
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    implementation "androidx.core:core:1.5.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    implementation 'androidx.fragment:fragment:1.2.5'
+    implementation 'com.google.oboe:oboe:1.5.0'
 
     // To use the Android Frame Pacing library
     //implementation "androidx.games:games-frame-pacing:1.9.1"
@@ -52,12 +48,12 @@ dependencies {
     //implementation "androidx.games:games-performance-tuner:1.5.0"
 
     // To use the Games Activity library
-    implementation "androidx.games:games-activity:1.1.0"
+    implementation "androidx.games:games-activity:2.0.2"
 
     // To use the Games Controller Library
-    //implementation "androidx.games:games-controller:1.1.0"
+    //implementation "androidx.games:games-controller:2.0.2"
 
     // To use the Games Text Input Library
-    //implementation "androidx.games:games-text-input:1.1.0"
+    //implementation "androidx.games:games-text-input:2.0.2"
 }
 
diff --git a/examples/agdk-mainloop/app/src/main/java/co/realfit/agdkmainloop/MainActivity.java b/examples/agdk-mainloop/app/src/main/java/co/realfit/agdkmainloop/MainActivity.java
index 831dd48..6dea50d 100644
--- a/examples/agdk-mainloop/app/src/main/java/co/realfit/agdkmainloop/MainActivity.java
+++ b/examples/agdk-mainloop/app/src/main/java/co/realfit/agdkmainloop/MainActivity.java
@@ -63,6 +63,11 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
     }
 
+    protected void onResume() {
+        super.onResume();
+        hideSystemUI();
+    }
+
     public boolean isGooglePlayGames() {
         PackageManager pm = getPackageManager();
         return pm.hasSystemFeature("com.google.android.play.feature.HPE_EXPERIENCE");
diff --git a/examples/agdk-mainloop/app/src/main/res/layout/activity_main.xml b/examples/agdk-mainloop/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 4fc2444..0000000
--- a/examples/agdk-mainloop/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/examples/agdk-mainloop/app/src/main/res/values-night/themes.xml b/examples/agdk-mainloop/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 81c6873..0000000
--- a/examples/agdk-mainloop/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.RustTemplate" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
\ No newline at end of file
diff --git a/examples/agdk-mainloop/app/src/main/res/values/themes.xml b/examples/agdk-mainloop/app/src/main/res/values/themes.xml
index 83a6c4a..96e0241 100644
--- a/examples/agdk-mainloop/app/src/main/res/values/themes.xml
+++ b/examples/agdk-mainloop/app/src/main/res/values/themes.xml
@@ -1,16 +1,3 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.RustTemplate" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<style name="Theme.RustTemplate" parent="Theme.AppCompat.Light.NoActionBar" />
 </resources>
\ No newline at end of file

From af331e3bff04c0e821e9fe223d24ea4d8a6f2914 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Sun, 25 Jun 2023 21:29:38 +0100
Subject: [PATCH 27/93] Rework input_events API and expose KeyCharacterMap
 bindings

With the way events are delivered via an `InputQueue` with
`NativeActivity` there is no direct access to the underlying KeyEvent
and MotionEvent Java objects and no `ndk` API that supports the
equivalent of `KeyEvent.getUnicodeChar()`

What `getUnicodeChar` does under the hood though is to do lookups into a
`KeyCharacterMap` for the corresponding `InputDevice` based on the
event's `key_code` and `meta_state` - which are things we can do via
some JNI bindings for `KeyCharacterMap`.

Although it's still awkward to expose an API like
`key_event.get_unicode_char()` we can instead provide an API that
lets you look up a `KeyCharacterMap` for any `device_id` and
applications can then use that for character mapping.

This approach is also more general than the `getUnicodeChar` utility
since it exposes other useful state, such as being able to check what
kind of keyboard input events are coming from (such as a full physical
keyboard vs a virtual / 'predictive' keyboard)

For consistency this exposes the same API through the game-activity
backend, even though the game-activity backend is technically able to
support unicode lookups via `getUnicodeChar` (since it has access to the
Java `KeyEvent` object).

This highlighted a need to be able to use other `AndroidApp` APIs while
processing input, which wasn't possible with the `.input_events()` API
design because the `AndroidApp` held a lock over the backend while
iterating events.

This changes `input_events()` to `input_events_iter()` which now returns
a form of lending iterator and instead of taking a callback that gets
called repeatedly by `input_events()` a similar callback is now passed
to `iter.next(callback)`.

The API isn't as ergonomic as I would have liked, considering that
lending iterators aren't a standard feature for Rust yet but also since
we still want to have the handling for each individual event go via a
callback that can report whether an event was "handled". I think the
slightly awkward ergonomics are acceptable though considering that
the API will generally be used as an implementation detail within
middleware frameworks like Winit.

Since this is the first example where we're creating non-trivial Java
bindings for an Android SDK API this adds some JNI utilities and
establishes a pattern for how we can implement a class binding.

It's an implementation detail but with how I wrote the binding I tried
to keep in mind the possibility of creating a procmacro later that would
generate some of the JNI boilerplate involved.
---
 android-activity/CHANGELOG.md                 |  98 +++-
 android-activity/Cargo.toml                   |   2 +
 android-activity/LICENSE                      |  24 +-
 android-activity/src/error.rs                 |  58 +++
 android-activity/src/game_activity/input.rs   |   8 +-
 android-activity/src/game_activity/mod.rs     | 445 ++++++++++++------
 android-activity/src/input.rs                 |  23 +
 android-activity/src/input/sdk.rs             | 358 ++++++++++++++
 android-activity/src/jni_utils.rs             | 151 ++++++
 android-activity/src/lib.rs                   | 165 ++++++-
 android-activity/src/native_activity/glue.rs  |  22 +-
 android-activity/src/native_activity/input.rs |   9 +
 android-activity/src/native_activity/mod.rs   | 165 ++++++-
 examples/agdk-mainloop/src/lib.rs             | 129 ++++-
 examples/na-mainloop/src/lib.rs               | 129 ++++-
 15 files changed, 1555 insertions(+), 231 deletions(-)
 create mode 100644 android-activity/src/error.rs
 create mode 100644 android-activity/src/input/sdk.rs
 create mode 100644 android-activity/src/jni_utils.rs

diff --git a/android-activity/CHANGELOG.md b/android-activity/CHANGELOG.md
index 35afefa..dd66796 100644
--- a/android-activity/CHANGELOG.md
+++ b/android-activity/CHANGELOG.md
@@ -1,12 +1,108 @@
-<!-- markdownlint-disable MD022 MD024 MD032  -->
+<!-- markdownlint-disable MD022 MD024 MD032 MD033  -->
 
 # Changelog
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+### Added
+- Added `KeyEvent::meta_state()` for being able to query the state of meta keys, needed for character mapping ([#102](https://github.com/rust-mobile/android-activity/pull/102))
+- Added `KeyCharacterMap` JNI bindings to the corresponding Android SDK API ([#102](https://github.com/rust-mobile/android-activity/pull/102))
+- Added `AndroidApp::device_key_character_map()` for being able to get a `KeyCharacterMap` for a given `device_id` for unicode character mapping ([#102](https://github.com/rust-mobile/android-activity/pull/102))
+
+    <details>
+    <summary>Click here for an example of how to handle unicode character mapping:</summary>
+
+    ```rust
+    let mut combining_accent = None;
+    // Snip
+
+
+    let combined_key_char = if let Ok(map) = app.device_key_character_map(device_id) {
+        match map.get(key_event.key_code(), key_event.meta_state()) {
+            Ok(KeyMapChar::Unicode(unicode)) => {
+                let combined_unicode = if let Some(accent) = combining_accent {
+                    match map.get_dead_char(accent, unicode) {
+                        Ok(Some(key)) => {
+                            info!("KeyEvent: Combined '{unicode}' with accent '{accent}' to give '{key}'");
+                            Some(key)
+                        }
+                        Ok(None) => None,
+                        Err(err) => {
+                            log::error!("KeyEvent: Failed to combine 'dead key' accent '{accent}' with '{unicode}': {err:?}");
+                            None
+                        }
+                    }
+                } else {
+                    info!("KeyEvent: Pressed '{unicode}'");
+                    Some(unicode)
+                };
+                combining_accent = None;
+                combined_unicode.map(|unicode| KeyMapChar::Unicode(unicode))
+            }
+            Ok(KeyMapChar::CombiningAccent(accent)) => {
+                info!("KeyEvent: Pressed 'dead key' combining accent '{accent}'");
+                combining_accent = Some(accent);
+                Some(KeyMapChar::CombiningAccent(accent))
+            }
+            Ok(KeyMapChar::None) => {
+                info!("KeyEvent: Pressed non-unicode key");
+                combining_accent = None;
+                None
+            }
+            Err(err) => {
+                log::error!("KeyEvent: Failed to get key map character: {err:?}");
+                combining_accent = None;
+                None
+            }
+        }
+    } else {
+        None
+    };
+    ```
+
+    </details>
+
 ### Changed
 - GameActivity updated to 2.0.2 (requires the corresponding 2.0.2 `.aar` release from Google) ([#88](https://github.com/rust-mobile/android-activity/pull/88))
+- `AndroidApp::input_events()` is replaced by `AndroidApp::input_events_iter()` ([#102](https://github.com/rust-mobile/android-activity/pull/102))
+
+    <details>
+    <summary>Click here for an example of how to use `input_events_iter()`:</summary>
+
+    ```rust
+    match app.input_events_iter() {
+        Ok(mut iter) => {
+            loop {
+                let read_input = iter.next(|event| {
+                    let handled = match event {
+                        InputEvent::KeyEvent(key_event) => {
+                            // Snip
+                        }
+                        InputEvent::MotionEvent(motion_event) => {
+                            // Snip
+                        }
+                        event => {
+                            // Snip
+                        }
+                    };
+
+                    handled
+                });
+
+                if !read_input {
+                    break;
+                }
+            }
+        }
+        Err(err) => {
+            log::error!("Failed to get input events iterator: {err:?}");
+        }
+    }
+    ```
+
+    </details>
 
 ## [0.4.3] - 2022-07-30
 ### Fixed
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 5a01bd6..9233f4c 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -38,6 +38,7 @@ native-activity = []
 log = "0.4"
 jni-sys = "0.3"
 cesu8 = "1"
+jni = "0.21"
 ndk = "0.7"
 ndk-sys = "0.4"
 ndk-context = "0.1"
@@ -45,6 +46,7 @@ android-properties = "0.2"
 num_enum = "0.6"
 bitflags = "2.0"
 libc = "0.2"
+thiserror = "1"
 
 [build-dependencies]
 cc = { version = "1.0", features = ["parallel"] }
diff --git a/android-activity/LICENSE b/android-activity/LICENSE
index b4635e9..47bdfd8 100644
--- a/android-activity/LICENSE
+++ b/android-activity/LICENSE
@@ -1,12 +1,24 @@
-The third-party glue code, under the native-activity-csrc/ and game-activity-csrc/ directories
-is covered by the Apache 2.0 license only:
+# License
 
-Apache License, Version 2.0 (docs/LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0)
+## GameActivity
 
+The third-party glue code, under the game-activity-csrc/ directory is covered by
+the Apache 2.0 license only:
+
+Apache License, Version 2.0 (docs/LICENSE-APACHE or <http://www.apache.org/licenses/LICENSE-2.0>)
+
+## SDK Documentation
+
+Documentation for APIs that are direct bindings of Android platform APIs are covered
+by the Apache 2.0 license only:
+
+Apache License, Version 2.0 (docs/LICENSE-APACHE or <http://www.apache.org/licenses/LICENSE-2.0>)
+
+## android-activity
 
 All other code is dual-licensed under either
 
-* MIT License (docs/LICENSE-MIT or http://opensource.org/licenses/MIT)
-* Apache License, Version 2.0 (docs/LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0)
+- MIT License (docs/LICENSE-MIT or <http://opensource.org/licenses/MIT>)
+- Apache License, Version 2.0 (docs/LICENSE-APACHE or <http://www.apache.org/licenses/LICENSE-2.0>)
 
-at your option.
\ No newline at end of file
+at your option.
diff --git a/android-activity/src/error.rs b/android-activity/src/error.rs
new file mode 100644
index 0000000..7193f5a
--- /dev/null
+++ b/android-activity/src/error.rs
@@ -0,0 +1,58 @@
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum AppError {
+    #[error("Operation only supported from the android_main() thread: {0}")]
+    NonMainThread(String),
+
+    #[error("Java VM or JNI error, including Java exceptions")]
+    JavaError(String),
+
+    #[error("Input unavailable")]
+    InputUnavailable,
+}
+
+pub type Result<T> = std::result::Result<T, AppError>;
+
+// XXX: we don't want to expose jni-rs in the public API
+// so we have an internal error type that we can generally
+// use in the backends and then we can strip the error
+// in the frontend of the API.
+//
+// This way we avoid exposing a public trait implementation for
+// `From<jni::errors::Error>`
+#[derive(Error, Debug)]
+pub(crate) enum InternalAppError {
+    #[error("A JNI error")]
+    JniError(jni::errors::JniError),
+    #[error("A Java Exception was thrown via a JNI method call")]
+    JniException(String),
+    #[error("A Java VM error")]
+    JvmError(jni::errors::Error),
+    #[error("Input unavailable")]
+    InputUnavailable,
+}
+
+pub(crate) type InternalResult<T> = std::result::Result<T, InternalAppError>;
+
+impl From<jni::errors::Error> for InternalAppError {
+    fn from(value: jni::errors::Error) -> Self {
+        InternalAppError::JvmError(value)
+    }
+}
+impl From<jni::errors::JniError> for InternalAppError {
+    fn from(value: jni::errors::JniError) -> Self {
+        InternalAppError::JniError(value)
+    }
+}
+
+impl From<InternalAppError> for AppError {
+    fn from(value: InternalAppError) -> Self {
+        match value {
+            InternalAppError::JniError(err) => AppError::JavaError(err.to_string()),
+            InternalAppError::JniException(msg) => AppError::JavaError(msg),
+            InternalAppError::JvmError(err) => AppError::JavaError(err.to_string()),
+            InternalAppError::InputUnavailable => AppError::InputUnavailable,
+        }
+    }
+}
diff --git a/android-activity/src/game_activity/input.rs b/android-activity/src/game_activity/input.rs
index ba442b7..29b33bf 100644
--- a/android-activity/src/game_activity/input.rs
+++ b/android-activity/src/game_activity/input.rs
@@ -16,7 +16,7 @@
 use num_enum::{IntoPrimitive, TryFromPrimitive};
 use std::convert::TryInto;
 
-use crate::game_activity::ffi::{GameActivityKeyEvent, GameActivityMotionEvent};
+use crate::activity_impl::ffi::{GameActivityKeyEvent, GameActivityMotionEvent};
 use crate::input::{Class, Source};
 
 // Note: try to keep this wrapper API compatible with the AInputEvent API if possible
@@ -1274,6 +1274,12 @@ impl<'a> KeyEvent<'a> {
         action.try_into().unwrap()
     }
 
+    #[inline]
+    pub fn action_button(&self) -> KeyAction {
+        let action = self.ga_event.action as u32;
+        action.try_into().unwrap()
+    }
+
     /// Returns the last time the key was pressed.  This is on the scale of
     /// `java.lang.System.nanoTime()`, which has nanosecond precision, but no defined start time.
     ///
diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index fd9da25..88a9fd6 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -1,5 +1,6 @@
 #![cfg(feature = "game-activity")]
 
+use std::collections::HashMap;
 use std::ffi::{CStr, CString};
 use std::fs::File;
 use std::io::{BufRead, BufReader};
@@ -8,7 +9,8 @@ use std::ops::Deref;
 use std::os::unix::prelude::*;
 use std::panic::catch_unwind;
 use std::ptr::NonNull;
-use std::sync::{Arc, RwLock};
+use std::sync::Weak;
+use std::sync::{Arc, Mutex, RwLock};
 use std::time::Duration;
 use std::{ptr, thread};
 
@@ -24,6 +26,9 @@ use ndk::asset::AssetManager;
 use ndk::configuration::Configuration;
 use ndk::native_window::NativeWindow;
 
+use crate::error::InternalResult;
+use crate::input::{KeyCharacterMap, KeyCharacterMapBinding};
+use crate::jni_utils::{self, CloneJavaVM};
 use crate::util::{abort_on_panic, android_log, log_panic};
 use crate::{
     util, AndroidApp, ConfigurationRef, InputStatus, MainEvent, PollEvent, Rect, WindowManagerFlags,
@@ -90,7 +95,7 @@ impl<'a> StateLoader<'a> {
             if !(*app_ptr).savedState.is_null() && (*app_ptr).savedStateSize > 0 {
                 let buf: &mut [u8] = std::slice::from_raw_parts_mut(
                     (*app_ptr).savedState.cast(),
-                    (*app_ptr).savedStateSize as usize,
+                    (*app_ptr).savedStateSize,
                 );
                 let state = buf.to_vec();
                 Some(state)
@@ -120,7 +125,16 @@ impl AndroidAppWaker {
 }
 
 impl AndroidApp {
-    pub(crate) unsafe fn from_ptr(ptr: NonNull<ffi::android_app>) -> Self {
+    pub(crate) unsafe fn from_ptr(ptr: NonNull<ffi::android_app>, jvm: CloneJavaVM) -> Self {
+        let mut env = jvm.get_env().unwrap(); // We attach to the thread before creating the AndroidApp
+
+        let key_map_binding = match KeyCharacterMapBinding::new(&mut env) {
+            Ok(b) => b,
+            Err(err) => {
+                panic!("Failed to create KeyCharacterMap JNI bindings: {err:?}");
+            }
+        };
+
         // Note: we don't use from_ptr since we don't own the android_app.config
         // and need to keep in mind that the Drop handler is going to call
         // AConfiguration_delete()
@@ -128,15 +142,19 @@ impl AndroidApp {
 
         Self {
             inner: Arc::new(RwLock::new(AndroidAppInner {
+                jvm,
                 native_app: NativeAppGlue { ptr },
                 config: ConfigurationRef::new(config),
                 native_window: Default::default(),
+                key_map_binding: Arc::new(key_map_binding),
+                key_maps: Mutex::new(HashMap::new()),
+                input_receiver: Mutex::new(None),
             })),
         }
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 struct NativeAppGlue {
     ptr: NonNull<ffi::android_app>,
 }
@@ -150,11 +168,112 @@ impl Deref for NativeAppGlue {
 unsafe impl Send for NativeAppGlue {}
 unsafe impl Sync for NativeAppGlue {}
 
+impl NativeAppGlue {
+    // TODO: move into a trait
+    pub fn text_input_state(&self) -> TextInputState {
+        unsafe {
+            let activity = (*self.as_ptr()).activity;
+            let mut out_state = TextInputState {
+                text: String::new(),
+                selection: TextSpan { start: 0, end: 0 },
+                compose_region: None,
+            };
+            let out_ptr = &mut out_state as *mut TextInputState;
+
+            let app_ptr = self.as_ptr();
+            (*app_ptr).textInputState = 0;
+
+            // NEON WARNING:
+            //
+            // It's not clearly documented but the GameActivity API over the
+            // GameTextInput library directly exposes _modified_ UTF8 text
+            // from Java so we need to be careful to convert text to and
+            // from UTF8
+            //
+            // GameTextInput also uses a pre-allocated, fixed-sized buffer for
+            // the current text state and has shared `currentState_` that
+            // appears to have no lock to guard access from multiple threads.
+            //
+            // There's also no locking at the GameActivity level, so I'm fairly
+            // certain that `GameActivity_getTextInputState` isn't thread
+            // safe: https://issuetracker.google.com/issues/294112477
+            //
+            // Overall this is all quite gnarly - and probably a good reminder
+            // of why we want to use Rust instead of C/C++.
+            ffi::GameActivity_getTextInputState(
+                activity,
+                Some(AndroidAppInner::map_input_state_to_text_event_callback),
+                out_ptr.cast(),
+            );
+
+            out_state
+        }
+    }
+
+    // TODO: move into a trait
+    pub fn set_text_input_state(&self, state: TextInputState) {
+        unsafe {
+            let activity = (*self.as_ptr()).activity;
+            let modified_utf8 = cesu8::to_java_cesu8(&state.text);
+            let text_length = modified_utf8.len() as i32;
+            let modified_utf8_bytes = modified_utf8.as_ptr();
+            let ffi_state = ffi::GameTextInputState {
+                text_UTF8: modified_utf8_bytes.cast(), // NB: may be signed or unsigned depending on target
+                text_length,
+                selection: ffi::GameTextInputSpan {
+                    start: state.selection.start as i32,
+                    end: state.selection.end as i32,
+                },
+                composingRegion: match state.compose_region {
+                    Some(span) => {
+                        // The GameText subclass of InputConnection only has a special case for removing the
+                        // compose region if `start == -1` but the docs for `setComposingRegion` imply that
+                        // the region should effectively be removed if any empty region is given (unlike for the
+                        // selection region, it's not meaningful to maintain an empty compose region)
+                        //
+                        // We aim for more consistent behaviour by normalizing any empty region into `(-1, -1)`
+                        // to remove the compose region.
+                        //
+                        // NB `setComposingRegion` itself is documented to clamp start/end to the text bounds
+                        // so apart from this special-case handling in GameText's implementation of
+                        // `setComposingRegion` then there's nothing special about `(-1, -1)` - it's just an empty
+                        // region that should get clamped to `(0, 0)` and then get removed.
+                        if span.start == span.end {
+                            ffi::GameTextInputSpan { start: -1, end: -1 }
+                        } else {
+                            ffi::GameTextInputSpan {
+                                start: span.start as i32,
+                                end: span.end as i32,
+                            }
+                        }
+                    }
+                    None => ffi::GameTextInputSpan { start: -1, end: -1 },
+                },
+            };
+            ffi::GameActivity_setTextInputState(activity, &ffi_state as *const _);
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct AndroidAppInner {
+    pub(crate) jvm: CloneJavaVM,
     native_app: NativeAppGlue,
     config: ConfigurationRef,
     native_window: RwLock<Option<NativeWindow>>,
+
+    /// Shared JNI bindings for the `KeyCharacterMap` class
+    key_map_binding: Arc<KeyCharacterMapBinding>,
+
+    /// A table of `KeyCharacterMap`s per `InputDevice` ID
+    /// these are used to be able to map key presses to unicode
+    /// characters
+    key_maps: Mutex<HashMap<i32, KeyCharacterMap>>,
+
+    /// While an app is reading input events it holds an
+    /// InputReceiver reference which we track to ensure
+    /// we don't hand out more than one receiver at a time
+    input_receiver: Mutex<Option<Weak<InputReceiver>>>,
 }
 
 impl AndroidAppInner {
@@ -370,9 +489,9 @@ impl AndroidAppInner {
         let text_modified_utf8: *const u8 = (*state).text_UTF8.cast();
         let text_modified_utf8 =
             std::slice::from_raw_parts(text_modified_utf8, (*state).text_length as usize);
-        match cesu8::from_java_cesu8(&text_modified_utf8) {
+        match cesu8::from_java_cesu8(text_modified_utf8) {
             Ok(str) => {
-                let len = *&str.len();
+                let len = str.len();
                 (*out_ptr).text = String::from(str);
 
                 let selection_start = (*state).selection.start.clamp(0, len as i32 + 1);
@@ -398,82 +517,34 @@ impl AndroidAppInner {
 
     // TODO: move into a trait
     pub fn text_input_state(&self) -> TextInputState {
-        unsafe {
-            let activity = (*self.native_app.as_ptr()).activity;
-            let mut out_state = TextInputState {
-                text: String::new(),
-                selection: TextSpan { start: 0, end: 0 },
-                compose_region: None,
-            };
-            let out_ptr = &mut out_state as *mut TextInputState;
-
-            // NEON WARNING:
-            //
-            // It's not clearly documented but the GameActivity API over the
-            // GameTextInput library directly exposes _modified_ UTF8 text
-            // from Java so we need to be careful to convert text to and
-            // from UTF8
-            //
-            // GameTextInput also uses a pre-allocated, fixed-sized buffer for the current
-            // text state but GameTextInput doesn't actually provide it's own thread
-            // safe API to safely access this state  so we have to cooperate with
-            // the GameActivity code that does locking when reading/writing the state
-            // (I.e. we can't just punch through to the GameTextInput layer from here).
-            //
-            // Overall this is all quite gnarly - and probably a good reminder of why
-            // we want to use Rust instead of C/C++.
-            ffi::GameActivity_getTextInputState(
-                activity,
-                Some(AndroidAppInner::map_input_state_to_text_event_callback),
-                out_ptr.cast(),
-            );
-
-            out_state
-        }
+        self.native_app.text_input_state()
     }
 
     // TODO: move into a trait
     pub fn set_text_input_state(&self, state: TextInputState) {
-        unsafe {
-            let activity = (*self.native_app.as_ptr()).activity;
-            let modified_utf8 = cesu8::to_java_cesu8(&state.text);
-            let text_length = modified_utf8.len() as i32;
-            let modified_utf8_bytes = modified_utf8.as_ptr();
-            let ffi_state = ffi::GameTextInputState {
-                text_UTF8: modified_utf8_bytes.cast(), // NB: may be signed or unsigned depending on target
-                text_length,
-                selection: ffi::GameTextInputSpan {
-                    start: state.selection.start as i32,
-                    end: state.selection.end as i32,
-                },
-                composingRegion: match state.compose_region {
-                    Some(span) => {
-                        // The GameText subclass of InputConnection only has a special case for removing the
-                        // compose region if `start == -1` but the docs for `setComposingRegion` imply that
-                        // the region should effectively be removed if any empty region is given (unlike for the
-                        // selection region, it's not meaningful to maintain an empty compose region)
-                        //
-                        // We aim for more consistent behaviour by normalizing any empty region into `(-1, -1)`
-                        // to remove the compose region.
-                        //
-                        // NB `setComposingRegion` itself is documented to clamp start/end to the text bounds
-                        // so apart from this special-case handling in GameText's implementation of
-                        // `setComposingRegion` then there's nothing special about `(-1, -1)` - it's just an empty
-                        // region that should get clamped to `(0, 0)` and then get removed.
-                        if span.start == span.end {
-                            ffi::GameTextInputSpan { start: -1, end: -1 }
-                        } else {
-                            ffi::GameTextInputSpan {
-                                start: span.start as i32,
-                                end: span.end as i32,
-                            }
-                        }
-                    }
-                    None => ffi::GameTextInputSpan { start: -1, end: -1 },
-                },
-            };
-            ffi::GameActivity_setTextInputState(activity, &ffi_state as *const _);
-        }
+        self.native_app.set_text_input_state(state);
+    }
+
+    pub(crate) fn device_key_character_map(
+        &self,
+        device_id: i32,
+    ) -> InternalResult<KeyCharacterMap> {
+        let mut guard = self.key_maps.lock().unwrap();
+
+        let key_map = match guard.entry(device_id) {
+            std::collections::hash_map::Entry::Occupied(occupied) => occupied.get().clone(),
+            std::collections::hash_map::Entry::Vacant(vacant) => {
+                let character_map = jni_utils::device_key_character_map(
+                    self.jvm.clone(),
+                    self.key_map_binding.clone(),
+                    device_id,
+                )?;
+                vacant.insert(character_map.clone());
+                character_map
+            }
+        };
+
+        Ok(key_map)
     }
 
     pub fn enable_motion_axis(&mut self, axis: Axis) {
@@ -519,49 +590,26 @@ impl AndroidAppInner {
         }
     }
 
-    fn dispatch_key_and_motion_events<F>(&self, mut callback: F)
-    where
-        F: FnMut(&InputEvent) -> InputStatus,
-    {
-        let buf = unsafe {
-            let app_ptr = self.native_app.as_ptr();
-            let input_buffer = ffi::android_app_swap_input_buffers(app_ptr);
-            if input_buffer.is_null() {
-                return;
-            }
-            InputBuffer::from_ptr(NonNull::new_unchecked(input_buffer))
-        };
+    pub(crate) fn input_events_receiver(&self) -> InternalResult<Arc<InputReceiver>> {
+        let mut guard = self.input_receiver.lock().unwrap();
 
-        let mut keys_iter = KeyEventsLendingIterator::new(&buf);
-        while let Some(key_event) = keys_iter.next() {
-            callback(&InputEvent::KeyEvent(key_event));
-        }
-        let mut motion_iter = MotionEventsLendingIterator::new(&buf);
-        while let Some(motion_event) = motion_iter.next() {
-            callback(&InputEvent::MotionEvent(motion_event));
-        }
-    }
-
-    fn dispatch_text_events<F>(&self, mut callback: F)
-    where
-        F: FnMut(&InputEvent) -> InputStatus,
-    {
-        unsafe {
-            let app_ptr = self.native_app.as_ptr();
-            if (*app_ptr).textInputState != 0 {
-                let state = self.text_input_state();
-                callback(&InputEvent::TextEvent(state));
-                (*app_ptr).textInputState = 0;
+        // Make sure we don't hand out more than one receiver at a time because
+        // turning the reciever into an interator will perform a swap_buffers
+        // for the buffered input events which shouldn't happen while we're in
+        // the middle of iterating events
+        if let Some(receiver) = &*guard {
+            if receiver.strong_count() > 0 {
+                return Err(crate::error::InternalAppError::InputUnavailable);
             }
         }
-    }
+        *guard = None;
 
-    pub fn input_events<F>(&self, mut callback: F)
-    where
-        F: FnMut(&InputEvent) -> InputStatus,
-    {
-        self.dispatch_key_and_motion_events(&mut callback);
-        self.dispatch_text_events(&mut callback);
+        let receiver = Arc::new(InputReceiver {
+            native_app: self.native_app.clone(),
+        });
+
+        *guard = Some(Arc::downgrade(&receiver));
+        Ok(receiver)
     }
 
     pub fn internal_data_path(&self) -> Option<std::path::PathBuf> {
@@ -586,33 +634,28 @@ impl AndroidAppInner {
     }
 }
 
-struct MotionEventsLendingIterator<'a> {
+struct MotionEventsLendingIterator {
     pos: usize,
     count: usize,
-    buffer: &'a InputBuffer<'a>,
 }
 
-// A kind of lending iterator but since our MSRV is 1.60 we can't handle this
-// via a generic trait. The iteration of motion events is entirely private
-// though so this is ok for now.
-impl<'a> MotionEventsLendingIterator<'a> {
-    fn new(buffer: &'a InputBuffer<'a>) -> Self {
+impl MotionEventsLendingIterator {
+    fn new(buffer: &InputBuffer) -> Self {
         Self {
             pos: 0,
             count: buffer.motion_events_count(),
-            buffer,
         }
     }
-    fn next(&mut self) -> Option<MotionEvent<'a>> {
+    fn next<'buf>(&mut self, buffer: &'buf InputBuffer) -> Option<MotionEvent<'buf>> {
         if self.pos < self.count {
             // Safety:
             // - This iterator currently has exclusive access to the front buffer of events
             // - We know the buffer is non-null
             // - `pos` is less than the number of events stored in the buffer
             let ga_event = unsafe {
-                (*self.buffer.ptr.as_ptr())
+                (*buffer.ptr.as_ptr())
                     .motionEvents
-                    .offset(self.pos as isize)
+                    .add(self.pos)
                     .as_ref()
                     .unwrap()
             };
@@ -625,33 +668,28 @@ impl<'a> MotionEventsLendingIterator<'a> {
     }
 }
 
-struct KeyEventsLendingIterator<'a> {
+struct KeyEventsLendingIterator {
     pos: usize,
     count: usize,
-    buffer: &'a InputBuffer<'a>,
 }
 
-// A kind of lending iterator but since our MSRV is 1.60 we can't handle this
-// via a generic trait. The iteration of key events is entirely private
-// though so this is ok for now.
-impl<'a> KeyEventsLendingIterator<'a> {
-    fn new(buffer: &'a InputBuffer<'a>) -> Self {
+impl KeyEventsLendingIterator {
+    fn new(buffer: &InputBuffer) -> Self {
         Self {
             pos: 0,
             count: buffer.key_events_count(),
-            buffer,
         }
     }
-    fn next(&mut self) -> Option<KeyEvent<'a>> {
+    fn next<'buf>(&mut self, buffer: &'buf InputBuffer) -> Option<KeyEvent<'buf>> {
         if self.pos < self.count {
             // Safety:
             // - This iterator currently has exclusive access to the front buffer of events
             // - We know the buffer is non-null
             // - `pos` is less than the number of events stored in the buffer
             let ga_event = unsafe {
-                (*self.buffer.ptr.as_ptr())
+                (*buffer.ptr.as_ptr())
                     .keyEvents
-                    .offset(self.pos as isize)
+                    .add(self.pos)
                     .as_ref()
                     .unwrap()
             };
@@ -673,7 +711,7 @@ impl<'a> InputBuffer<'a> {
     pub(crate) fn from_ptr(ptr: NonNull<ffi::android_input_buffer>) -> InputBuffer<'a> {
         Self {
             ptr,
-            _lifetime: PhantomData::default(),
+            _lifetime: PhantomData,
         }
     }
 
@@ -695,6 +733,118 @@ impl<'a> Drop for InputBuffer<'a> {
     }
 }
 
+/// Conceptually we can think of this like the receiver end of an
+/// input events channel.
+///
+/// After being passed back to AndroidApp it gets turned into a
+/// lending iterator for pending input events.
+///
+/// It serves two purposes:
+/// 1. It represents an exclusive access to input events (the application
+///    can only have one receiver at a time) and it's intended to support
+///    the double-buffering design for input events in GameActivity where
+///    we issue a swap_buffers before iterating events and wouldn't want
+///    another swap to be possible before finishing - especially since
+///    we want to borrow directly from the buffer while dispatching.
+/// 2. It doesn't borrow from AndroidAppInner so we can pass it back to
+///    AndroidApp which can drop its lock around AndroidAppInner and
+///    it can then be turned into a lending iterator. (We wouldn't
+///    be able to pass the iterator back to the application if it
+///    borrowed from within the lock and we need to drop the lock
+///    because otherwise the app wouldn't be able to access the AndroidApp
+///    API in any way while iterating events)
+#[derive(Debug)]
+pub(crate) struct InputReceiver {
+    // Safety: the native_app effectively has a static lifetime and it
+    // has its own internal locking when calling
+    // `android_app_swap_input_buffers`
+    native_app: NativeAppGlue,
+}
+
+impl<'a> From<Arc<InputReceiver>> for InputIteratorInner<'a> {
+    fn from(receiver: Arc<InputReceiver>) -> Self {
+        let buffered = unsafe {
+            let app_ptr = receiver.native_app.as_ptr();
+            let input_buffer = ffi::android_app_swap_input_buffers(app_ptr);
+            if input_buffer.is_null() {
+                None
+            } else {
+                let buffer = InputBuffer::from_ptr(NonNull::new_unchecked(input_buffer));
+                let keys_iter = KeyEventsLendingIterator::new(&buffer);
+                let motion_iter = MotionEventsLendingIterator::new(&buffer);
+                Some(BufferedEvents::<'a> {
+                    buffer,
+                    keys_iter,
+                    motion_iter,
+                })
+            }
+        };
+
+        let native_app = receiver.native_app.clone();
+        Self {
+            _receiver: receiver,
+            buffered,
+            native_app,
+            text_event_checked: false,
+        }
+    }
+}
+
+struct BufferedEvents<'a> {
+    buffer: InputBuffer<'a>,
+    keys_iter: KeyEventsLendingIterator,
+    motion_iter: MotionEventsLendingIterator,
+}
+
+pub(crate) struct InputIteratorInner<'a> {
+    // Held to maintain exclusive access to buffered input events
+    _receiver: Arc<InputReceiver>,
+
+    buffered: Option<BufferedEvents<'a>>,
+    native_app: NativeAppGlue,
+    text_event_checked: bool,
+}
+
+impl<'a> InputIteratorInner<'a> {
+    pub(crate) fn next<F>(&mut self, callback: F) -> bool
+    where
+        F: FnOnce(&input::InputEvent) -> InputStatus,
+    {
+        if let Some(buffered) = &mut self.buffered {
+            if let Some(key_event) = buffered.keys_iter.next(&buffered.buffer) {
+                let _ = callback(&InputEvent::KeyEvent(key_event));
+                return true;
+            }
+            if let Some(motion_event) = buffered.motion_iter.next(&buffered.buffer) {
+                let _ = callback(&InputEvent::MotionEvent(motion_event));
+                return true;
+            }
+            self.buffered = None;
+        }
+
+        if !self.text_event_checked {
+            self.text_event_checked = true;
+            unsafe {
+                let app_ptr = self.native_app.as_ptr();
+
+                // XXX: It looks like the GameActivity implementation should
+                // be using atomic ops to set this flag, and require us to
+                // use atomics to check and clear it too.
+                //
+                // We currently just hope that with the lack of atomic ops that
+                // the compiler isn't reordering code so this gets flagged
+                // before the java main thread really updates the state.
+                if (*app_ptr).textInputState != 0 {
+                    let state = self.native_app.text_input_state(); // Will clear .textInputState
+                    let _ = callback(&InputEvent::TextEvent(state));
+                    return true;
+                }
+            }
+        }
+        false
+    }
+}
+
 // Rust doesn't give us a clean way to directly export symbols from C/C++
 // so we rename the C/C++ symbols and re-export these JNI entrypoints from
 // Rust...
@@ -789,19 +939,16 @@ pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
             let activity: jobject = (*(*native_app).activity).javaGameActivity;
             ndk_context::initialize_android_context(jvm.cast(), activity.cast());
 
+            let jvm = CloneJavaVM::from_raw(jvm).unwrap();
             // Since this is a newly spawned thread then the JVM hasn't been attached
             // to the thread yet. Attach before calling the applications main function
             // so they can safely make JNI calls
-            let mut jenv_out: *mut core::ffi::c_void = std::ptr::null_mut();
-            if let Some(attach_current_thread) = (*(*jvm)).AttachCurrentThread {
-                attach_current_thread(jvm, &mut jenv_out, std::ptr::null_mut());
-            }
-
+            jvm.attach_current_thread_permanently().unwrap();
             jvm
         };
 
         unsafe {
-            let app = AndroidApp::from_ptr(NonNull::new(native_app).unwrap());
+            let app = AndroidApp::from_ptr(NonNull::new(native_app).unwrap(), jvm.clone());
 
             // We want to specifically catch any panic from the application's android_main
             // so we can finish + destroy the Activity gracefully via the JVM
@@ -824,9 +971,9 @@ pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
             //  to the main thread of the process where the Java finish call will take place"
             ffi::GameActivity_finish((*native_app).activity);
 
-            if let Some(detach_current_thread) = (*(*jvm)).DetachCurrentThread {
-                detach_current_thread(jvm);
-            }
+            // This should detach automatically but lets detach explicitly to avoid depending
+            // on the TLS trickery in `jni-rs`
+            jvm.detach_current_thread();
 
             ndk_context::release_android_context();
         }
diff --git a/android-activity/src/input.rs b/android-activity/src/input.rs
index b9edf7e..f62a088 100644
--- a/android-activity/src/input.rs
+++ b/android-activity/src/input.rs
@@ -2,6 +2,10 @@ use bitflags::bitflags;
 use num_enum::{IntoPrimitive, TryFromPrimitive};
 
 pub use crate::activity_impl::input::*;
+use crate::InputStatus;
+
+mod sdk;
+pub use sdk::*;
 
 /// An enum representing the source of an [`MotionEvent`] or [`KeyEvent`]
 ///
@@ -120,3 +124,22 @@ pub struct TextInputState {
     /// If the resulting region is zero-sized, no region is marked (equivalent to passing `None`)
     pub compose_region: Option<TextSpan>,
 }
+
+/// An exclusive, lending iterator for input events
+pub struct InputIterator<'a> {
+    pub(crate) inner: crate::activity_impl::InputIteratorInner<'a>,
+}
+
+impl<'a> InputIterator<'a> {
+    /// Reads and handles the next input event by passing it to the given `callback`
+    ///
+    /// `callback` should return [`InputStatus::Unhandled`] for any input events that aren't directly
+    /// handled by the application, or else [`InputStatus::Handled`]. Unhandled events may lead to a
+    /// fallback interpretation of the event.
+    pub fn next<F>(&mut self, callback: F) -> bool
+    where
+        F: FnOnce(&crate::activity_impl::input::InputEvent) -> InputStatus,
+    {
+        self.inner.next(callback)
+    }
+}
diff --git a/android-activity/src/input/sdk.rs b/android-activity/src/input/sdk.rs
new file mode 100644
index 0000000..4d1e84b
--- /dev/null
+++ b/android-activity/src/input/sdk.rs
@@ -0,0 +1,358 @@
+use std::sync::Arc;
+
+use jni::{
+    objects::{GlobalRef, JClass, JMethodID, JObject, JStaticMethodID, JValue},
+    signature::{Primitive, ReturnType},
+    JNIEnv,
+};
+use jni_sys::jint;
+
+use crate::{
+    activity_impl::input::{Keycode, MetaState},
+    jni_utils::CloneJavaVM,
+};
+
+use crate::{
+    error::{AppError, InternalAppError},
+    jni_utils,
+};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum KeyboardType {
+    /// A numeric (12-key) keyboard.
+    ///
+    /// A numeric keyboard supports text entry using a multi-tap approach. It may be necessary to tap a key multiple times to generate the desired letter or symbol.
+    ///
+    /// This type of keyboard is generally designed for thumb typing.
+    Numeric,
+
+    /// A keyboard with all the letters, but with more than one letter per key.
+    ///
+    /// This type of keyboard is generally designed for thumb typing.
+    Predictive,
+
+    /// A keyboard with all the letters, and maybe some numbers.
+    ///
+    /// An alphabetic keyboard supports text entry directly but may have a condensed layout with a small form factor. In contrast to a full keyboard, some symbols may only be accessible using special on-screen character pickers. In addition, to improve typing speed and accuracy, the framework provides special affordances for alphabetic keyboards such as auto-capitalization and toggled / locked shift and alt keys.
+    ///
+    /// This type of keyboard is generally designed for thumb typing.
+    Alpha,
+
+    /// A full PC-style keyboard.
+    ///
+    /// A full keyboard behaves like a PC keyboard. All symbols are accessed directly by pressing keys on the keyboard without on-screen support or affordances such as auto-capitalization.
+    ///
+    /// This type of keyboard is generally designed for full two hand typing.
+    Full,
+
+    /// A keyboard that is only used to control special functions rather than for typing.
+    ///
+    /// A special function keyboard consists only of non-printing keys such as HOME and POWER that are not actually used for typing.
+    SpecialFunction,
+
+    /// An unknown type of keyboard
+    Unknown(i32),
+}
+
+impl From<i32> for KeyboardType {
+    fn from(value: i32) -> Self {
+        match value {
+            1 => KeyboardType::Numeric,
+            2 => KeyboardType::Predictive,
+            3 => KeyboardType::Alpha,
+            4 => KeyboardType::Full,
+            5 => KeyboardType::SpecialFunction,
+            unknown => KeyboardType::Unknown(unknown),
+        }
+    }
+}
+impl From<KeyboardType> for i32 {
+    fn from(value: KeyboardType) -> i32 {
+        match value {
+            KeyboardType::Numeric => 1,
+            KeyboardType::Predictive => 2,
+            KeyboardType::Alpha => 3,
+            KeyboardType::Full => 4,
+            KeyboardType::SpecialFunction => 5,
+            KeyboardType::Unknown(unknown) => unknown,
+        }
+    }
+}
+
+/// Either represents, a unicode character or combining accent from a
+/// [`KeyCharacterMap`], or `None` for non-printable keys.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum KeyMapChar {
+    None,
+    Unicode(char),
+    CombiningAccent(char),
+}
+
+// I've also tried to think here about how to we could potentially automatically
+// generate a binding struct like `KeyCharacterMapBinding` with a procmacro and
+// so have intentionally limited the `Binding` being a very thin, un-opinionated
+// wrapper based on basic JNI types.
+
+/// Lower-level JNI binding for `KeyCharacterMap` class only holds 'static state
+/// and can be shared with an `Arc` ref count.
+///
+/// The separation here also neatly helps us separate `InternalAppError` from
+/// `AppError` for mapping JNI errors without exposing any `jni-rs` types in the
+/// public API.
+#[derive(Debug)]
+pub(crate) struct KeyCharacterMapBinding {
+    //vm: JavaVM,
+    klass: GlobalRef,
+    get_method_id: JMethodID,
+    get_dead_char_method_id: JStaticMethodID,
+    get_keyboard_type_method_id: JMethodID,
+}
+
+impl KeyCharacterMapBinding {
+    pub(crate) fn new(env: &mut JNIEnv) -> Result<Self, InternalAppError> {
+        let binding = env.with_local_frame::<_, _, InternalAppError>(10, |env| {
+            let klass = env.find_class("android/view/KeyCharacterMap")?; // Creates a local ref
+            Ok(Self {
+                get_method_id: env.get_method_id(&klass, "get", "(II)I")?,
+                get_dead_char_method_id: env.get_static_method_id(
+                    &klass,
+                    "getDeadChar",
+                    "(II)I",
+                )?,
+                get_keyboard_type_method_id: env.get_method_id(&klass, "getKeyboardType", "()I")?,
+                klass: env.new_global_ref(&klass)?,
+            })
+        })?;
+        Ok(binding)
+    }
+
+    pub fn get<'local>(
+        &self,
+        env: &'local mut JNIEnv,
+        key_map: impl AsRef<JObject<'local>>,
+        key_code: jint,
+        meta_state: jint,
+    ) -> Result<jint, InternalAppError> {
+        let key_map = key_map.as_ref();
+
+        // Safety:
+        // - we know our global `key_map` reference is non-null and valid.
+        // - we know `get_method_id` remains valid
+        // - we know that the signature of KeyCharacterMap::get is `(int, int) -> int`
+        // - we know this won't leak any local references as a side effect
+        //
+        // We know it's ok to unwrap the `.i()` value since we explicitly
+        // specify the return type as `Int`
+        let unicode = unsafe {
+            env.call_method_unchecked(
+                key_map,
+                self.get_method_id,
+                ReturnType::Primitive(Primitive::Int),
+                &[
+                    JValue::Int(key_code).as_jni(),
+                    JValue::Int(meta_state).as_jni(),
+                ],
+            )
+        }
+        .map_err(|err| jni_utils::clear_and_map_exception_to_err(env, err))?;
+        Ok(unicode.i().unwrap())
+    }
+
+    pub fn get_dead_char(
+        &self,
+        env: &mut JNIEnv,
+        accent_char: jint,
+        base_char: jint,
+    ) -> Result<jint, InternalAppError> {
+        // Safety:
+        // - we know `get_dead_char_method_id` remains valid
+        // - we know that KeyCharacterMap::getDeadKey is a static method
+        // - we know that the signature of KeyCharacterMap::getDeadKey is `(int, int) -> int`
+        // - we know this won't leak any local references as a side effect
+        //
+        // We know it's ok to unwrap the `.i()` value since we explicitly
+        // specify the return type as `Int`
+
+        // Urgh, it's pretty terrible that there's no ergonomic/safe way to get a JClass reference from a GlobalRef
+        // Safety: we don't do anything that would try to delete the JClass as if it were a real local reference
+        let klass = unsafe { JClass::from_raw(self.klass.as_obj().as_raw()) };
+        let unicode = unsafe {
+            env.call_static_method_unchecked(
+                &klass,
+                self.get_dead_char_method_id,
+                ReturnType::Primitive(Primitive::Int),
+                &[
+                    JValue::Int(accent_char).as_jni(),
+                    JValue::Int(base_char).as_jni(),
+                ],
+            )
+        }
+        .map_err(|err| jni_utils::clear_and_map_exception_to_err(env, err))?;
+        Ok(unicode.i().unwrap())
+    }
+
+    pub fn get_keyboard_type<'local>(
+        &self,
+        env: &'local mut JNIEnv,
+        key_map: impl AsRef<JObject<'local>>,
+    ) -> Result<jint, InternalAppError> {
+        let key_map = key_map.as_ref();
+
+        // Safety:
+        // - we know our global `key_map` reference is non-null and valid.
+        // - we know `get_keyboard_type_method_id` remains valid
+        // - we know that the signature of KeyCharacterMap::getKeyboardType is `() -> int`
+        // - we know this won't leak any local references as a side effect
+        //
+        // We know it's ok to unwrap the `.i()` value since we explicitly
+        // specify the return type as `Int`
+        Ok(unsafe {
+            env.call_method_unchecked(
+                key_map,
+                self.get_keyboard_type_method_id,
+                ReturnType::Primitive(Primitive::Int),
+                &[],
+            )
+        }
+        .map_err(|err| jni_utils::clear_and_map_exception_to_err(env, err))?
+        .i()
+        .unwrap())
+    }
+}
+
+/// Describes the keys provided by a keyboard device and their associated labels.
+#[derive(Clone, Debug)]
+pub struct KeyCharacterMap {
+    jvm: CloneJavaVM,
+    binding: Arc<KeyCharacterMapBinding>,
+    key_map: GlobalRef,
+}
+
+impl KeyCharacterMap {
+    pub(crate) fn new(
+        jvm: CloneJavaVM,
+        binding: Arc<KeyCharacterMapBinding>,
+        key_map: GlobalRef,
+    ) -> Self {
+        Self {
+            jvm,
+            binding,
+            key_map,
+        }
+    }
+
+    /// Gets the Unicode character generated by the specified [`Keycode`] and [`MetaState`] combination.
+    ///
+    /// Returns [`KeyMapChar::None`] if the key is not one that is used to type Unicode characters.
+    ///
+    /// Returns [`KeyMapChar::CombiningAccent`] if the key is a "dead key" that should be combined with
+    /// another to actually produce a character -- see [`KeyCharacterMap::get_dead_char`].
+    ///
+    /// # Errors
+    ///
+    /// Since this API needs to use JNI internally to call into the Android JVM it may return
+    /// a [`AppError::JavaError`] in case there is a spurious JNI error or an exception
+    /// is caught.
+    pub fn get(&self, key_code: Keycode, meta_state: MetaState) -> Result<KeyMapChar, AppError> {
+        let key_code: u32 = key_code.into();
+        let key_code = key_code as jni_sys::jint;
+        let meta_state: u32 = meta_state.0;
+        let meta_state = meta_state as jni_sys::jint;
+
+        // Since we expect this API to be called from the `main` thread then we expect to already be
+        // attached to the JVM
+        //
+        // Safety: there's no other JNIEnv in scope so this env can't be used to subvert the mutable
+        // borrow rules that ensure we can only add local references to the top JNI frame.
+        let mut env = self.jvm.get_env().map_err(|err| {
+            let err: InternalAppError = err.into();
+            err
+        })?;
+        let unicode = self
+            .binding
+            .get(&mut env, self.key_map.as_obj(), key_code, meta_state)?;
+        let unicode = unicode as u32;
+
+        const COMBINING_ACCENT: u32 = 0x80000000;
+        const COMBINING_ACCENT_MASK: u32 = !COMBINING_ACCENT;
+
+        if unicode == 0 {
+            Ok(KeyMapChar::None)
+        } else if unicode & COMBINING_ACCENT == COMBINING_ACCENT {
+            let accent = unicode & COMBINING_ACCENT_MASK;
+            // Safety: assumes Android key maps don't contain invalid unicode characters
+            Ok(KeyMapChar::CombiningAccent(unsafe {
+                char::from_u32_unchecked(accent)
+            }))
+        } else {
+            // Safety: assumes Android key maps don't contain invalid unicode characters
+            Ok(KeyMapChar::Unicode(unsafe {
+                char::from_u32_unchecked(unicode)
+            }))
+        }
+    }
+
+    /// Get the character that is produced by combining the dead key producing accent with the key producing character c.
+    ///
+    /// For example, ```get_dead_char('`', 'e')``` returns 'è'. `get_dead_char('^', ' ')` returns '^' and `get_dead_char('^', '^')` returns '^'.
+    ///
+    /// # Errors
+    ///
+    /// Since this API needs to use JNI internally to call into the Android JVM it may return
+    /// a [`AppError::JavaError`] in case there is a spurious JNI error or an exception
+    /// is caught.
+    pub fn get_dead_char(
+        &self,
+        accent_char: char,
+        base_char: char,
+    ) -> Result<Option<char>, AppError> {
+        let accent_char = accent_char as jni_sys::jint;
+        let base_char = base_char as jni_sys::jint;
+
+        // Since we expect this API to be called from the `main` thread then we expect to already be
+        // attached to the JVM
+        //
+        // Safety: there's no other JNIEnv in scope so this env can't be used to subvert the mutable
+        // borrow rules that ensure we can only add local references to the top JNI frame.
+        let mut env = self.jvm.get_env().map_err(|err| {
+            let err: InternalAppError = err.into();
+            err
+        })?;
+        let unicode = self
+            .binding
+            .get_dead_char(&mut env, accent_char, base_char)?;
+        let unicode = unicode as u32;
+
+        // Safety: assumes Android key maps don't contain invalid unicode characters
+        Ok(if unicode == 0 {
+            None
+        } else {
+            Some(unsafe { char::from_u32_unchecked(unicode) })
+        })
+    }
+
+    /// Gets the keyboard type.
+    ///
+    /// Different keyboard types have different semantics. See [`KeyboardType`] for details.
+    ///
+    /// # Errors
+    ///
+    /// Since this API needs to use JNI internally to call into the Android JVM it may return
+    /// a [`AppError::JavaError`] in case there is a spurious JNI error or an exception
+    /// is caught.
+    pub fn get_keyboard_type(&self) -> Result<KeyboardType, AppError> {
+        // Since we expect this API to be called from the `main` thread then we expect to already be
+        // attached to the JVM
+        //
+        // Safety: there's no other JNIEnv in scope so this env can't be used to subvert the mutable
+        // borrow rules that ensure we can only add local references to the top JNI frame.
+        let mut env = self.jvm.get_env().map_err(|err| {
+            let err: InternalAppError = err.into();
+            err
+        })?;
+        let keyboard_type = self
+            .binding
+            .get_keyboard_type(&mut env, self.key_map.as_obj())?;
+        Ok(keyboard_type.into())
+    }
+}
diff --git a/android-activity/src/jni_utils.rs b/android-activity/src/jni_utils.rs
new file mode 100644
index 0000000..dcf6083
--- /dev/null
+++ b/android-activity/src/jni_utils.rs
@@ -0,0 +1,151 @@
+//! The JNI calls we make in this crate are often not part of a Java native
+//! method implementation and so we can't assume we have a JNI local frame that
+//! is going to unwind and free local references, and we also can't just leave
+//! exceptions to get thrown when returning to Java.
+//!
+//! These utilities help us check + clear exceptions and map them into Rust Errors.
+
+use std::{ops::Deref, sync::Arc};
+
+use jni::{
+    objects::{JObject, JString},
+    JavaVM,
+};
+
+use crate::{
+    error::{InternalAppError, InternalResult},
+    input::{KeyCharacterMap, KeyCharacterMapBinding},
+};
+
+// TODO: JavaVM should implement Clone
+#[derive(Debug)]
+pub(crate) struct CloneJavaVM {
+    pub jvm: JavaVM,
+}
+impl Clone for CloneJavaVM {
+    fn clone(&self) -> Self {
+        Self {
+            jvm: unsafe { JavaVM::from_raw(self.jvm.get_java_vm_pointer()).unwrap() },
+        }
+    }
+}
+impl CloneJavaVM {
+    pub unsafe fn from_raw(jvm: *mut jni_sys::JavaVM) -> InternalResult<Self> {
+        Ok(Self {
+            jvm: JavaVM::from_raw(jvm)?,
+        })
+    }
+}
+unsafe impl Send for CloneJavaVM {}
+unsafe impl Sync for CloneJavaVM {}
+
+impl Deref for CloneJavaVM {
+    type Target = JavaVM;
+
+    fn deref(&self) -> &Self::Target {
+        &self.jvm
+    }
+}
+
+/// Use with `.map_err()` to map `jni::errors::Error::JavaException` into a
+/// richer error based on the actual contents of the `JThrowable`
+///
+/// (The `jni` crate doesn't do that automatically since it's more
+/// common to let the exception get thrown when returning to Java)
+///
+/// This will also clear the exception
+pub(crate) fn clear_and_map_exception_to_err(
+    env: &mut jni::JNIEnv<'_>,
+    err: jni::errors::Error,
+) -> InternalAppError {
+    if matches!(err, jni::errors::Error::JavaException) {
+        let result = env.with_local_frame::<_, _, InternalAppError>(5, |env| {
+            let e = env.exception_occurred()?;
+            assert!(!e.is_null()); // should only be called after receiving a JavaException Result
+            env.exception_clear()?;
+
+            let class = env.get_object_class(&e)?;
+            //let get_stack_trace_method = env.get_method_id(&class, "getStackTrace", "()[Ljava/lang/StackTraceElement;")?;
+            let get_message_method =
+                env.get_method_id(&class, "getMessage", "()Ljava/lang/String;")?;
+
+            let msg = unsafe {
+                env.call_method_unchecked(
+                    &e,
+                    get_message_method,
+                    jni::signature::ReturnType::Object,
+                    &[],
+                )?
+                .l()
+                .unwrap()
+            };
+            let msg = unsafe { JString::from_raw(JObject::into_raw(msg)) };
+            let msg = env.get_string(&msg)?;
+            let msg: String = msg.into();
+
+            // TODO: get Java backtrace:
+            /*
+            if let JValue::Object(elements) = env.call_method_unchecked(&e, get_stack_trace_method, jni::signature::ReturnType::Array, &[])? {
+                let elements = env.auto_local(elements);
+
+            }
+            */
+
+            Ok(msg)
+        });
+
+        match result {
+            Ok(msg) => InternalAppError::JniException(msg),
+            Err(err) => InternalAppError::JniException(format!(
+                "UNKNOWN (Failed to query JThrowable: {err:?})"
+            )),
+        }
+    } else {
+        err.into()
+    }
+}
+
+pub(crate) fn device_key_character_map(
+    jvm: CloneJavaVM,
+    key_map_binding: Arc<KeyCharacterMapBinding>,
+    device_id: i32,
+) -> InternalResult<KeyCharacterMap> {
+    // Don't really need to 'attach' since this should be called from the app's main thread that
+    // should already be attached, but the redundancy should be fine
+    //
+    // Attach 'permanently' to avoid any chance of detaching the thread from the VM
+    let mut env = jvm.attach_current_thread_permanently()?;
+
+    // We don't want to accidentally leak any local references while we
+    // aren't going to be returning from here back to the JVM, to unwind, so
+    // we make a local frame
+    let character_map = env.with_local_frame::<_, _, jni::errors::Error>(10, |env| {
+        let input_device_class = env.find_class("android/view/InputDevice")?; // Creates a local ref
+        let device = env
+            .call_static_method(
+                input_device_class,
+                "getDevice",
+                "(I)Landroid/view/InputDevice;",
+                &[device_id.into()],
+            )?
+            .l()?; // Creates a local ref
+
+        let character_map = env
+            .call_method(
+                &device,
+                "getKeyCharacterMap",
+                "()Landroid/view/KeyCharacterMap;",
+                &[],
+            )?
+            .l()?;
+        let character_map = env.new_global_ref(character_map)?;
+
+        Ok(character_map)
+    })?;
+
+    Ok(KeyCharacterMap::new(
+        jvm.clone(),
+        key_map_binding,
+        character_map,
+    ))
+}
diff --git a/android-activity/src/lib.rs b/android-activity/src/lib.rs
index e00a902..8b9c46e 100644
--- a/android-activity/src/lib.rs
+++ b/android-activity/src/lib.rs
@@ -62,6 +62,7 @@ use std::sync::Arc;
 use std::sync::RwLock;
 use std::time::Duration;
 
+use input::KeyCharacterMap;
 use libc::c_void;
 use ndk::asset::AssetManager;
 use ndk::native_window::NativeWindow;
@@ -96,15 +97,12 @@ You may need to add a `[patch]` into your Cargo.toml to ensure a specific versio
 android-activity is used across all of your application's crates."#
 );
 
-#[cfg(any(feature = "native-activity", doc))]
-mod native_activity;
-#[cfg(any(feature = "native-activity", doc))]
-use native_activity as activity_impl;
+#[cfg_attr(any(feature = "native-activity", doc), path = "native_activity/mod.rs")]
+#[cfg_attr(any(feature = "game-activity", doc), path = "game_activity/mod.rs")]
+pub(crate) mod activity_impl;
 
-#[cfg(feature = "game-activity")]
-mod game_activity;
-#[cfg(feature = "game-activity")]
-use game_activity as activity_impl;
+pub mod error;
+use error::Result;
 
 pub mod input;
 
@@ -113,6 +111,8 @@ pub use config::ConfigurationRef;
 
 mod util;
 
+mod jni_utils;
+
 /// A rectangle with integer edge coordinates. Used to represent window insets, for example.
 #[derive(Clone, Debug, Default, Eq, PartialEq)]
 pub struct Rect {
@@ -163,14 +163,14 @@ pub use activity_impl::StateSaver;
 #[non_exhaustive]
 #[derive(Debug)]
 pub enum MainEvent<'a> {
-    /// New input events are available via [`AndroidApp::input_events()`]
+    /// New input events are available via [`AndroidApp::input_events_iter()`]
     ///
     /// _Note: Even if more input is received this event will not be resent
-    /// until [`AndroidApp::input_events()`] has been called, which enables
+    /// until [`AndroidApp::input_events_iter()`] has been called, which enables
     /// applications to batch up input processing without there being lots of
     /// redundant event loop wake ups._
     ///
-    /// [`AndroidApp::input_events()`]: AndroidApp::input_events
+    /// [`AndroidApp::input_events_iter()`]: AndroidApp::input_events_iter
     InputAvailable,
 
     /// Command from main thread: a new [`NativeWindow`] is ready for use.  Upon
@@ -629,24 +629,139 @@ impl AndroidApp {
         self.inner.read().unwrap().set_text_input_state(state);
     }
 
-    /// Query and process all out-standing input event
+    /// Get an exclusive, lending iterator over buffered input events
     ///
-    /// `callback` should return [`InputStatus::Unhandled`] for any input events that aren't directly
-    /// handled by the application, or else [`InputStatus::Handled`]. Unhandled events may lead to a
-    /// fallback interpretation of the event.
+    /// Applications are expected to call this in-sync with their rendering or
+    /// in response to a [`MainEvent::InputAvailable`] event being delivered.
     ///
-    /// Applications are generally either expected to call this in-sync with their rendering or
-    /// in response to a [`MainEvent::InputAvailable`] event being delivered. _Note though that your
-    /// application is will only be delivered a single [`MainEvent::InputAvailable`] event between calls
-    /// to this API._
+    /// _**Note:** your application is will only be delivered a single
+    /// [`MainEvent::InputAvailable`] event between calls to this API._
     ///
-    /// To reduce overhead, by default only [`input::Axis::X`] and [`input::Axis::Y`] are enabled
+    /// To reduce overhead, by default, only [`input::Axis::X`] and [`input::Axis::Y`] are enabled
     /// and other axis should be enabled explicitly via [`Self::enable_motion_axis`].
-    pub fn input_events<F>(&self, callback: F)
-    where
-        F: FnMut(&input::InputEvent) -> InputStatus,
-    {
-        self.inner.read().unwrap().input_events(callback)
+    ///
+    /// This isn't the most ergonomic iteration API since we can't return a standard `Iterator`:
+    /// - This API returns a lending iterator may borrow from the internal buffer
+    ///   of pending events without copying them.
+    /// - For each event we want to ensure the application reports whether the
+    ///   event was handled.
+    ///
+    /// # Example
+    /// Code to iterate all pending input events would look something like this:
+    ///
+    /// ```rust
+    /// match app.input_events_iter() {
+    ///     Ok(mut iter) => {
+    ///         loop {
+    ///             let read_input = iter.next(|event| {
+    ///                 let handled = match event {
+    ///                     InputEvent::KeyEvent(key_event) => {
+    ///                         // Snip
+    ///                     }
+    ///                     InputEvent::MotionEvent(motion_event) => {
+    ///                         // Snip
+    ///                     }
+    ///                     event => {
+    ///                         // Snip
+    ///                     }
+    ///                 };
+    ///
+    ///                 handled
+    ///             });
+    ///
+    ///             if !read_input {
+    ///                 break;
+    ///             }
+    ///         }
+    ///     }
+    ///     Err(err) => {
+    ///         log::error!("Failed to get input events iterator: {err:?}");
+    ///     }
+    /// }
+    /// ```
+    ///
+    /// # Panics
+    ///
+    /// This must only be called from your `android_main()` thread and it may panic if called
+    /// from another thread.
+    pub fn input_events_iter(&self) -> Result<input::InputIterator> {
+        let receiver = {
+            let guard = self.inner.read().unwrap();
+            guard.input_events_receiver()?
+        };
+
+        Ok(input::InputIterator {
+            inner: receiver.into(),
+        })
+    }
+
+    /// Lookup the [`KeyCharacterMap`] for the given input `device_id`
+    ///
+    /// Use [`KeyCharacterMap::get`] to map key codes + meta state into unicode characters
+    /// or dead keys that compose with the next key.
+    ///
+    /// # Example
+    ///
+    /// Code to handle unicode character mapping as well as combining dead keys could look some thing like:
+    ///
+    /// ```rust
+    /// let mut combining_accent = None;
+    /// // Snip
+    ///
+    /// let combined_key_char = if let Ok(map) = app.device_key_character_map(device_id) {
+    ///     match map.get(key_event.key_code(), key_event.meta_state()) {
+    ///         Ok(KeyMapChar::Unicode(unicode)) => {
+    ///             let combined_unicode = if let Some(accent) = combining_accent {
+    ///                 match map.get_dead_char(accent, unicode) {
+    ///                     Ok(Some(key)) => {
+    ///                         info!("KeyEvent: Combined '{unicode}' with accent '{accent}' to give '{key}'");
+    ///                         Some(key)
+    ///                     }
+    ///                     Ok(None) => None,
+    ///                     Err(err) => {
+    ///                         log::error!("KeyEvent: Failed to combine 'dead key' accent '{accent}' with '{unicode}': {err:?}");
+    ///                         None
+    ///                     }
+    ///                 }
+    ///             } else {
+    ///                 info!("KeyEvent: Pressed '{unicode}'");
+    ///                 Some(unicode)
+    ///             };
+    ///             combining_accent = None;
+    ///             combined_unicode.map(|unicode| KeyMapChar::Unicode(unicode))
+    ///         }
+    ///         Ok(KeyMapChar::CombiningAccent(accent)) => {
+    ///             info!("KeyEvent: Pressed 'dead key' combining accent '{accent}'");
+    ///             combining_accent = Some(accent);
+    ///             Some(KeyMapChar::CombiningAccent(accent))
+    ///         }
+    ///         Ok(KeyMapChar::None) => {
+    ///             info!("KeyEvent: Pressed non-unicode key");
+    ///             combining_accent = None;
+    ///             None
+    ///         }
+    ///         Err(err) => {
+    ///             log::error!("KeyEvent: Failed to get key map character: {err:?}");
+    ///             combining_accent = None;
+    ///             None
+    ///         }
+    ///     }
+    /// } else {
+    ///     None
+    /// };
+    /// ```
+    ///
+    /// # Errors
+    ///
+    /// Since this API needs to use JNI internally to call into the Android JVM it may return
+    /// a [`error::AppError::JavaError`] in case there is a spurious JNI error or an exception
+    /// is caught.
+    pub fn device_key_character_map(&self, device_id: i32) -> Result<KeyCharacterMap> {
+        Ok(self
+            .inner
+            .read()
+            .unwrap()
+            .device_key_character_map(device_id)?)
     }
 
     /// The user-visible SDK version of the framework
diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index 6682857..495c813 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -17,6 +17,7 @@ use log::Level;
 use ndk::{configuration::Configuration, input_queue::InputQueue, native_window::NativeWindow};
 
 use crate::{
+    jni_utils::CloneJavaVM,
     util::android_log,
     util::{abort_on_panic, log_panic},
     ConfigurationRef,
@@ -878,24 +879,21 @@ extern "C" fn ANativeActivity_onCreate(
         std::thread::spawn(move || {
             let activity: *mut ndk_sys::ANativeActivity = activity_ptr as *mut _;
 
-            let jvm = unsafe {
+            let jvm = abort_on_panic(|| unsafe {
                 let na = activity;
-                let jvm = (*na).vm;
+                let jvm: *mut jni_sys::JavaVM = (*na).vm;
                 let activity = (*na).clazz; // Completely bogus name; this is the _instance_ not class pointer
                 ndk_context::initialize_android_context(jvm.cast(), activity.cast());
 
+                let jvm = CloneJavaVM::from_raw(jvm).unwrap();
                 // Since this is a newly spawned thread then the JVM hasn't been attached
                 // to the thread yet. Attach before calling the applications main function
                 // so they can safely make JNI calls
-                let mut jenv_out: *mut core::ffi::c_void = std::ptr::null_mut();
-                if let Some(attach_current_thread) = (*(*jvm)).AttachCurrentThread {
-                    attach_current_thread(jvm, &mut jenv_out, std::ptr::null_mut());
-                }
-
+                jvm.attach_current_thread_permanently().unwrap();
                 jvm
-            };
+            });
 
-            let app = AndroidApp::new(rust_glue.clone());
+            let app = AndroidApp::new(rust_glue.clone(), jvm.clone());
 
             rust_glue.notify_main_thread_running();
 
@@ -921,9 +919,9 @@ extern "C" fn ANativeActivity_onCreate(
                 //  to the main thread of the process where the Java finish call will take place"
                 ndk_sys::ANativeActivity_finish(activity);
 
-                if let Some(detach_current_thread) = (*(*jvm)).DetachCurrentThread {
-                    detach_current_thread(jvm);
-                }
+                // This should detach automatically but lets detach explicitly to avoid depending
+                // on the TLS trickery in `jni-rs`
+                jvm.detach_current_thread();
 
                 ndk_context::release_android_context();
             }
diff --git a/android-activity/src/native_activity/input.rs b/android-activity/src/native_activity/input.rs
index 08db48f..2056fe0 100644
--- a/android-activity/src/native_activity/input.rs
+++ b/android-activity/src/native_activity/input.rs
@@ -326,6 +326,15 @@ impl<'a> KeyEvent<'a> {
     pub fn scan_code(&self) -> i32 {
         self.ndk_event.scan_code()
     }
+
+    /// Returns the state of the modifiers during this key event, represented by a bitmask.
+    ///
+    /// See [the NDK
+    /// docs](https://developer.android.com/ndk/reference/group/input#akeyevent_getmetastate)
+    #[inline]
+    pub fn meta_state(&self) -> MetaState {
+        self.ndk_event.meta_state()
+    }
 }
 
 // We use our own wrapper type for input events to have better consistency
diff --git a/android-activity/src/native_activity/mod.rs b/android-activity/src/native_activity/mod.rs
index 3f16550..fee09b9 100644
--- a/android-activity/src/native_activity/mod.rs
+++ b/android-activity/src/native_activity/mod.rs
@@ -1,15 +1,22 @@
 #![cfg(any(feature = "native-activity", doc))]
 
+use std::collections::HashMap;
+use std::marker::PhantomData;
+use std::panic::AssertUnwindSafe;
 use std::ptr;
 use std::ptr::NonNull;
-use std::sync::{Arc, RwLock};
+use std::sync::{Arc, Mutex, RwLock, Weak};
 use std::time::Duration;
 
 use libc::c_void;
 use log::{error, trace};
+use ndk::input_queue::InputQueue;
 use ndk::{asset::AssetManager, native_window::NativeWindow};
 
+use crate::error::{InternalAppError, InternalResult};
+use crate::input::{KeyCharacterMap, KeyCharacterMapBinding};
 use crate::input::{TextInputState, TextSpan};
+use crate::jni_utils::{self, CloneJavaVM};
 use crate::{
     util, AndroidApp, ConfigurationRef, InputStatus, MainEvent, PollEvent, Rect, WindowManagerFlags,
 };
@@ -79,13 +86,26 @@ impl AndroidAppWaker {
 }
 
 impl AndroidApp {
-    pub(crate) fn new(native_activity: NativeActivityGlue) -> Self {
+    pub(crate) fn new(native_activity: NativeActivityGlue, jvm: CloneJavaVM) -> Self {
+        let mut env = jvm.get_env().unwrap(); // We attach to the thread before creating the AndroidApp
+
+        let key_map_binding = match KeyCharacterMapBinding::new(&mut env) {
+            Ok(b) => b,
+            Err(err) => {
+                panic!("Failed to create KeyCharacterMap JNI bindings: {err:?}");
+            }
+        };
+
         let app = Self {
             inner: Arc::new(RwLock::new(AndroidAppInner {
+                jvm,
                 native_activity,
                 looper: Looper {
                     ptr: ptr::null_mut(),
                 },
+                key_map_binding: Arc::new(key_map_binding),
+                key_maps: Mutex::new(HashMap::new()),
+                input_receiver: Mutex::new(None),
             })),
         };
 
@@ -122,8 +142,23 @@ unsafe impl Sync for Looper {}
 
 #[derive(Debug)]
 pub(crate) struct AndroidAppInner {
+    pub(crate) jvm: CloneJavaVM,
+
     pub(crate) native_activity: NativeActivityGlue,
     looper: Looper,
+
+    /// Shared JNI bindings for the `KeyCharacterMap` class
+    key_map_binding: Arc<KeyCharacterMapBinding>,
+
+    /// A table of `KeyCharacterMap`s per `InputDevice` ID
+    /// these are used to be able to map key presses to unicode
+    /// characters
+    key_maps: Mutex<HashMap<i32, KeyCharacterMap>>,
+
+    /// While an app is reading input events it holds an
+    /// InputReceiver reference which we track to ensure
+    /// we don't hand out more than one receiver at a time
+    input_receiver: Mutex<Option<Weak<InputReceiver>>>,
 }
 
 impl AndroidAppInner {
@@ -356,6 +391,25 @@ impl AndroidAppInner {
         // NOP: Unsupported
     }
 
+    pub fn device_key_character_map(&self, device_id: i32) -> InternalResult<KeyCharacterMap> {
+        let mut guard = self.key_maps.lock().unwrap();
+
+        let key_map = match guard.entry(device_id) {
+            std::collections::hash_map::Entry::Occupied(occupied) => occupied.get().clone(),
+            std::collections::hash_map::Entry::Vacant(vacant) => {
+                let character_map = jni_utils::device_key_character_map(
+                    self.jvm.clone(),
+                    self.key_map_binding.clone(),
+                    device_id,
+                )?;
+                vacant.insert(character_map.clone());
+                character_map
+            }
+        };
+
+        Ok(key_map)
+    }
+
     pub fn enable_motion_axis(&self, _axis: input::Axis) {
         // NOP - The InputQueue API doesn't let us optimize which axis values are read
     }
@@ -364,10 +418,16 @@ impl AndroidAppInner {
         // NOP - The InputQueue API doesn't let us optimize which axis values are read
     }
 
-    pub fn input_events<F>(&self, mut callback: F)
-    where
-        F: FnMut(&input::InputEvent) -> InputStatus,
-    {
+    pub fn input_events_receiver(&self) -> InternalResult<Arc<InputReceiver>> {
+        let mut guard = self.input_receiver.lock().unwrap();
+
+        if let Some(receiver) = &*guard {
+            if receiver.strong_count() > 0 {
+                return Err(crate::error::InternalAppError::InputUnavailable);
+            }
+        }
+        *guard = None;
+
         // Get the InputQueue for the NativeActivity (if there is one) and also ensure
         // the queue is re-attached to our event Looper (so new input events will again
         // trigger a wake up)
@@ -376,9 +436,56 @@ impl AndroidAppInner {
             .looper_attached_input_queue(self.looper(), LOOPER_ID_INPUT);
         let queue = match queue {
             Some(queue) => queue,
-            None => return,
+            None => return Err(InternalAppError::InputUnavailable),
         };
 
+        let receiver = Arc::new(InputReceiver { queue });
+
+        *guard = Some(Arc::downgrade(&receiver));
+        Ok(receiver)
+    }
+
+    pub fn internal_data_path(&self) -> Option<std::path::PathBuf> {
+        let na = self.native_activity();
+        unsafe { util::try_get_path_from_ptr((*na).internalDataPath) }
+    }
+
+    pub fn external_data_path(&self) -> Option<std::path::PathBuf> {
+        let na = self.native_activity();
+        unsafe { util::try_get_path_from_ptr((*na).externalDataPath) }
+    }
+
+    pub fn obb_path(&self) -> Option<std::path::PathBuf> {
+        let na = self.native_activity();
+        unsafe { util::try_get_path_from_ptr((*na).obbPath) }
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct InputReceiver {
+    queue: InputQueue,
+}
+
+impl<'a> From<Arc<InputReceiver>> for InputIteratorInner<'a> {
+    fn from(receiver: Arc<InputReceiver>) -> Self {
+        Self {
+            receiver,
+            _lifetime: PhantomData,
+        }
+    }
+}
+
+pub(crate) struct InputIteratorInner<'a> {
+    // Held to maintain exclusive access to buffered input events
+    receiver: Arc<InputReceiver>,
+    _lifetime: PhantomData<&'a ()>,
+}
+
+impl<'a> InputIteratorInner<'a> {
+    pub(crate) fn next<F>(&self, callback: F) -> bool
+    where
+        F: FnOnce(&input::InputEvent) -> InputStatus,
+    {
         // Note: we basically ignore errors from get_event() currently. Looking
         // at the source code for Android's InputQueue, the only error that
         // can be returned here is 'WOULD_BLOCK', which we want to just treat as
@@ -386,8 +493,10 @@ impl AndroidAppInner {
         //
         // ref: https://github.com/aosp-mirror/platform_frameworks_base/blob/master/core/jni/android_view_InputQueue.cpp
         //
-        while let Ok(Some(event)) = queue.get_event() {
-            if let Some(ndk_event) = queue.pre_dispatch(event) {
+        if let Ok(Some(ndk_event)) = self.receiver.queue.get_event() {
+            log::info!("queue: got event: {ndk_event:?}");
+
+            if let Some(ndk_event) = self.receiver.queue.pre_dispatch(ndk_event) {
                 let event = match ndk_event {
                     ndk::event::InputEvent::MotionEvent(e) => {
                         input::InputEvent::MotionEvent(input::MotionEvent::new(e))
@@ -396,7 +505,10 @@ impl AndroidAppInner {
                         input::InputEvent::KeyEvent(input::KeyEvent::new(e))
                     }
                 };
-                let handled = callback(&event);
+
+                // `finish_event` needs to be called for each event otherwise
+                // the app would likely get an ANR
+                let result = std::panic::catch_unwind(AssertUnwindSafe(|| callback(&event)));
 
                 let ndk_event = match event {
                     input::InputEvent::MotionEvent(e) => {
@@ -407,23 +519,26 @@ impl AndroidAppInner {
                     }
                     _ => unreachable!(),
                 };
-                queue.finish_event(ndk_event, matches!(handled, InputStatus::Handled));
-            }
-        }
-    }
 
-    pub fn internal_data_path(&self) -> Option<std::path::PathBuf> {
-        let na = self.native_activity();
-        unsafe { util::try_get_path_from_ptr((*na).internalDataPath) }
-    }
+                let handled = match result {
+                    Ok(handled) => handled,
+                    Err(payload) => {
+                        log::error!("Calling `finish_event` after panic in input event handler, to try and avoid being killed via an ANR");
+                        self.receiver.queue.finish_event(ndk_event, false);
+                        std::panic::resume_unwind(payload);
+                    }
+                };
 
-    pub fn external_data_path(&self) -> Option<std::path::PathBuf> {
-        let na = self.native_activity();
-        unsafe { util::try_get_path_from_ptr((*na).externalDataPath) }
-    }
+                log::info!("queue: finishing event");
+                self.receiver
+                    .queue
+                    .finish_event(ndk_event, handled == InputStatus::Handled);
+            }
 
-    pub fn obb_path(&self) -> Option<std::path::PathBuf> {
-        let na = self.native_activity();
-        unsafe { util::try_get_path_from_ptr((*na).obbPath) }
+            true
+        } else {
+            log::info!("queue: no more events");
+            false
+        }
     }
 }
diff --git a/examples/agdk-mainloop/src/lib.rs b/examples/agdk-mainloop/src/lib.rs
index 166ee69..a2f94e7 100644
--- a/examples/agdk-mainloop/src/lib.rs
+++ b/examples/agdk-mainloop/src/lib.rs
@@ -1,4 +1,7 @@
-use android_activity::{AndroidApp, InputStatus, MainEvent, PollEvent};
+use android_activity::{
+    input::{InputEvent, KeyAction, KeyEvent, KeyMapChar, MotionAction},
+    AndroidApp, InputStatus, MainEvent, PollEvent,
+};
 use log::info;
 
 #[no_mangle]
@@ -9,6 +12,8 @@ fn android_main(app: AndroidApp) {
     let mut redraw_pending = true;
     let mut native_window: Option<ndk::native_window::NativeWindow> = None;
 
+    let mut combining_accent = None;
+
     while !quit {
         app.poll_events(
             Some(std::time::Duration::from_secs(1)), /* timeout */
@@ -68,11 +73,56 @@ fn android_main(app: AndroidApp) {
                     if let Some(native_window) = &native_window {
                         redraw_pending = false;
 
-                        // Handle input
-                        app.input_events(|event| {
-                            info!("Input Event: {event:?}");
-                            InputStatus::Unhandled
-                        });
+                        // Handle input, via a lending iterator
+                        match app.input_events_iter() {
+                            Ok(mut iter) => loop {
+                                info!("Checking for next input event...");
+                                if !iter.next(|event| {
+                                    match event {
+                                        InputEvent::KeyEvent(key_event) => {
+                                            let combined_key_char = character_map_and_combine_key(
+                                                &app,
+                                                key_event,
+                                                &mut combining_accent,
+                                            );
+                                            info!("KeyEvent: combined key: {combined_key_char:?}")
+                                        }
+                                        InputEvent::MotionEvent(motion_event) => {
+                                            println!("action = {:?}", motion_event.action());
+                                            match motion_event.action() {
+                                                MotionAction::Up => {
+                                                    let pointer = motion_event.pointer_index();
+                                                    let pointer =
+                                                        motion_event.pointer_at_index(pointer);
+                                                    let x = pointer.x();
+                                                    let y = pointer.y();
+
+                                                    println!("POINTER UP {x}, {y}");
+                                                    if x < 200.0 && y < 200.0 {
+                                                        println!("Requesting to show keyboard");
+                                                        app.show_soft_input(true);
+                                                    }
+                                                }
+                                                _ => {}
+                                            }
+                                        }
+                                        InputEvent::TextEvent(state) => {
+                                            info!("Input Method State: {state:?}");
+                                        }
+                                        _ => {}
+                                    }
+
+                                    info!("Input Event: {event:?}");
+                                    InputStatus::Unhandled
+                                }) {
+                                    info!("No more input available");
+                                    break;
+                                }
+                            },
+                            Err(err) => {
+                                log::error!("Failed to get input events iterator: {err:?}");
+                            }
+                        }
 
                         info!("Render...");
                         dummy_render(native_window);
@@ -83,6 +133,73 @@ fn android_main(app: AndroidApp) {
     }
 }
 
+/// Tries to map the `key_event` to a `KeyMapChar` containing a unicode character or dead key accent
+///
+/// This shows how to take a `KeyEvent` and look up its corresponding `KeyCharacterMap` and
+/// use that to try and map the `key_code` + `meta_state` to a unicode character or a
+/// dead key that be combined with the next key press.
+fn character_map_and_combine_key(
+    app: &AndroidApp,
+    key_event: &KeyEvent,
+    combining_accent: &mut Option<char>,
+) -> Option<KeyMapChar> {
+    let device_id = key_event.device_id();
+
+    let key_map = match app.device_key_character_map(device_id) {
+        Ok(key_map) => key_map,
+        Err(err) => {
+            log::error!("Failed to look up `KeyCharacterMap` for device {device_id}: {err:?}");
+            return None;
+        }
+    };
+
+    match key_map.get(key_event.key_code(), key_event.meta_state()) {
+        Ok(KeyMapChar::Unicode(unicode)) => {
+            // Only do dead key combining on key down
+            if key_event.action() == KeyAction::Down {
+                let combined_unicode = if let Some(accent) = combining_accent {
+                    match key_map.get_dead_char(*accent, unicode) {
+                        Ok(Some(key)) => {
+                            info!("KeyEvent: Combined '{unicode}' with accent '{accent}' to give '{key}'");
+                            Some(key)
+                        }
+                        Ok(None) => None,
+                        Err(err) => {
+                            log::error!("KeyEvent: Failed to combine 'dead key' accent '{accent}' with '{unicode}': {err:?}");
+                            None
+                        }
+                    }
+                } else {
+                    info!("KeyEvent: Pressed '{unicode}'");
+                    Some(unicode)
+                };
+                *combining_accent = None;
+                combined_unicode.map(|unicode| KeyMapChar::Unicode(unicode))
+            } else {
+                Some(KeyMapChar::Unicode(unicode))
+            }
+        }
+        Ok(KeyMapChar::CombiningAccent(accent)) => {
+            if key_event.action() == KeyAction::Down {
+                info!("KeyEvent: Pressed 'dead key' combining accent '{accent}'");
+                *combining_accent = Some(accent);
+            }
+            Some(KeyMapChar::CombiningAccent(accent))
+        }
+        Ok(KeyMapChar::None) => {
+            // Leave any combining_accent state in tact (seems to match how other
+            // Android apps work)
+            info!("KeyEvent: Pressed non-unicode key");
+            None
+        }
+        Err(err) => {
+            log::error!("KeyEvent: Failed to get key map character: {err:?}");
+            *combining_accent = None;
+            None
+        }
+    }
+}
+
 /// Post a NOP frame to the window
 ///
 /// Since this is a bare minimum test app we don't depend
diff --git a/examples/na-mainloop/src/lib.rs b/examples/na-mainloop/src/lib.rs
index 166ee69..a2f94e7 100644
--- a/examples/na-mainloop/src/lib.rs
+++ b/examples/na-mainloop/src/lib.rs
@@ -1,4 +1,7 @@
-use android_activity::{AndroidApp, InputStatus, MainEvent, PollEvent};
+use android_activity::{
+    input::{InputEvent, KeyAction, KeyEvent, KeyMapChar, MotionAction},
+    AndroidApp, InputStatus, MainEvent, PollEvent,
+};
 use log::info;
 
 #[no_mangle]
@@ -9,6 +12,8 @@ fn android_main(app: AndroidApp) {
     let mut redraw_pending = true;
     let mut native_window: Option<ndk::native_window::NativeWindow> = None;
 
+    let mut combining_accent = None;
+
     while !quit {
         app.poll_events(
             Some(std::time::Duration::from_secs(1)), /* timeout */
@@ -68,11 +73,56 @@ fn android_main(app: AndroidApp) {
                     if let Some(native_window) = &native_window {
                         redraw_pending = false;
 
-                        // Handle input
-                        app.input_events(|event| {
-                            info!("Input Event: {event:?}");
-                            InputStatus::Unhandled
-                        });
+                        // Handle input, via a lending iterator
+                        match app.input_events_iter() {
+                            Ok(mut iter) => loop {
+                                info!("Checking for next input event...");
+                                if !iter.next(|event| {
+                                    match event {
+                                        InputEvent::KeyEvent(key_event) => {
+                                            let combined_key_char = character_map_and_combine_key(
+                                                &app,
+                                                key_event,
+                                                &mut combining_accent,
+                                            );
+                                            info!("KeyEvent: combined key: {combined_key_char:?}")
+                                        }
+                                        InputEvent::MotionEvent(motion_event) => {
+                                            println!("action = {:?}", motion_event.action());
+                                            match motion_event.action() {
+                                                MotionAction::Up => {
+                                                    let pointer = motion_event.pointer_index();
+                                                    let pointer =
+                                                        motion_event.pointer_at_index(pointer);
+                                                    let x = pointer.x();
+                                                    let y = pointer.y();
+
+                                                    println!("POINTER UP {x}, {y}");
+                                                    if x < 200.0 && y < 200.0 {
+                                                        println!("Requesting to show keyboard");
+                                                        app.show_soft_input(true);
+                                                    }
+                                                }
+                                                _ => {}
+                                            }
+                                        }
+                                        InputEvent::TextEvent(state) => {
+                                            info!("Input Method State: {state:?}");
+                                        }
+                                        _ => {}
+                                    }
+
+                                    info!("Input Event: {event:?}");
+                                    InputStatus::Unhandled
+                                }) {
+                                    info!("No more input available");
+                                    break;
+                                }
+                            },
+                            Err(err) => {
+                                log::error!("Failed to get input events iterator: {err:?}");
+                            }
+                        }
 
                         info!("Render...");
                         dummy_render(native_window);
@@ -83,6 +133,73 @@ fn android_main(app: AndroidApp) {
     }
 }
 
+/// Tries to map the `key_event` to a `KeyMapChar` containing a unicode character or dead key accent
+///
+/// This shows how to take a `KeyEvent` and look up its corresponding `KeyCharacterMap` and
+/// use that to try and map the `key_code` + `meta_state` to a unicode character or a
+/// dead key that be combined with the next key press.
+fn character_map_and_combine_key(
+    app: &AndroidApp,
+    key_event: &KeyEvent,
+    combining_accent: &mut Option<char>,
+) -> Option<KeyMapChar> {
+    let device_id = key_event.device_id();
+
+    let key_map = match app.device_key_character_map(device_id) {
+        Ok(key_map) => key_map,
+        Err(err) => {
+            log::error!("Failed to look up `KeyCharacterMap` for device {device_id}: {err:?}");
+            return None;
+        }
+    };
+
+    match key_map.get(key_event.key_code(), key_event.meta_state()) {
+        Ok(KeyMapChar::Unicode(unicode)) => {
+            // Only do dead key combining on key down
+            if key_event.action() == KeyAction::Down {
+                let combined_unicode = if let Some(accent) = combining_accent {
+                    match key_map.get_dead_char(*accent, unicode) {
+                        Ok(Some(key)) => {
+                            info!("KeyEvent: Combined '{unicode}' with accent '{accent}' to give '{key}'");
+                            Some(key)
+                        }
+                        Ok(None) => None,
+                        Err(err) => {
+                            log::error!("KeyEvent: Failed to combine 'dead key' accent '{accent}' with '{unicode}': {err:?}");
+                            None
+                        }
+                    }
+                } else {
+                    info!("KeyEvent: Pressed '{unicode}'");
+                    Some(unicode)
+                };
+                *combining_accent = None;
+                combined_unicode.map(|unicode| KeyMapChar::Unicode(unicode))
+            } else {
+                Some(KeyMapChar::Unicode(unicode))
+            }
+        }
+        Ok(KeyMapChar::CombiningAccent(accent)) => {
+            if key_event.action() == KeyAction::Down {
+                info!("KeyEvent: Pressed 'dead key' combining accent '{accent}'");
+                *combining_accent = Some(accent);
+            }
+            Some(KeyMapChar::CombiningAccent(accent))
+        }
+        Ok(KeyMapChar::None) => {
+            // Leave any combining_accent state in tact (seems to match how other
+            // Android apps work)
+            info!("KeyEvent: Pressed non-unicode key");
+            None
+        }
+        Err(err) => {
+            log::error!("KeyEvent: Failed to get key map character: {err:?}");
+            *combining_accent = None;
+            None
+        }
+    }
+}
+
 /// Post a NOP frame to the window
 ///
 /// Since this is a bare minimum test app we don't depend

From 6b3307410e9511b84dcb6469e5f67544803d3ae7 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Thu, 3 Aug 2023 10:02:13 +0100
Subject: [PATCH 28/93] GameActivity PATCH: Don't read unicode via
 getUnicodeChar

The `unicodeChar` in `GameActivityKeyEvent` wasn't being exposed by
`android-activity` because we couldn't expose the unicode character in
the same way with the native-activity backend - due to how events are
received via an `InputQueue` that doesn't expose the underlying Java
references for the key events.

Now that we have a consistent way of supporting unicode character
mapping via `KeyCharacterMap` bindings it's redundant for the
`GameActivity` backend to call `getUnicodeChar` automatically for
each key press.
---
 .../game-activity/GameActivityEvents.cpp            | 11 ++++++-----
 .../game-activity/GameActivityEvents.h              |  2 +-
 android-activity/src/game_activity/ffi_aarch64.rs   | 13 +------------
 android-activity/src/game_activity/ffi_arm.rs       | 13 +------------
 android-activity/src/game_activity/ffi_i686.rs      | 13 +------------
 android-activity/src/game_activity/ffi_x86_64.rs    | 13 +------------
 6 files changed, 11 insertions(+), 54 deletions(-)

diff --git a/android-activity/game-activity-csrc/game-activity/GameActivityEvents.cpp b/android-activity/game-activity-csrc/game-activity/GameActivityEvents.cpp
index 4142601..028b55e 100644
--- a/android-activity/game-activity-csrc/game-activity/GameActivityEvents.cpp
+++ b/android-activity/game-activity-csrc/game-activity/GameActivityEvents.cpp
@@ -345,7 +345,7 @@ static struct {
     jmethodID getRepeatCount;
     jmethodID getKeyCode;
     jmethodID getScanCode;
-    jmethodID getUnicodeChar;
+    //jmethodID getUnicodeChar;
 } gKeyEventClassInfo;
 
 extern "C" void GameActivityKeyEvent_fromJava(JNIEnv *env, jobject keyEvent,
@@ -379,8 +379,8 @@ extern "C" void GameActivityKeyEvent_fromJava(JNIEnv *env, jobject keyEvent,
             env->GetMethodID(keyEventClass, "getKeyCode", "()I");
         gKeyEventClassInfo.getScanCode =
             env->GetMethodID(keyEventClass, "getScanCode", "()I");
-        gKeyEventClassInfo.getUnicodeChar =
-            env->GetMethodID(keyEventClass, "getUnicodeChar", "()I");
+        //gKeyEventClassInfo.getUnicodeChar =
+        //    env->GetMethodID(keyEventClass, "getUnicodeChar", "()I");
 
         gKeyEventClassInfoInitialized = true;
     }
@@ -407,7 +407,8 @@ extern "C" void GameActivityKeyEvent_fromJava(JNIEnv *env, jobject keyEvent,
         /*keyCode=*/
         env->CallIntMethod(keyEvent, gKeyEventClassInfo.getKeyCode),
         /*scanCode=*/
-        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getScanCode),
+        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getScanCode)
         /*unicodeChar=*/
-        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getUnicodeChar)};
+        //env->CallIntMethod(keyEvent, gKeyEventClassInfo.getUnicodeChar)
+    };
 }
diff --git a/android-activity/game-activity-csrc/game-activity/GameActivityEvents.h b/android-activity/game-activity-csrc/game-activity/GameActivityEvents.h
index 183c72f..015ffbe 100644
--- a/android-activity/game-activity-csrc/game-activity/GameActivityEvents.h
+++ b/android-activity/game-activity-csrc/game-activity/GameActivityEvents.h
@@ -312,7 +312,7 @@ typedef struct GameActivityKeyEvent {
     int32_t repeatCount;
     int32_t keyCode;
     int32_t scanCode;
-    int32_t unicodeChar;
+    //int32_t unicodeChar;
 } GameActivityKeyEvent;
 
 /**
diff --git a/android-activity/src/game_activity/ffi_aarch64.rs b/android-activity/src/game_activity/ffi_aarch64.rs
index 0d5c320..cd3fabd 100644
--- a/android-activity/src/game_activity/ffi_aarch64.rs
+++ b/android-activity/src/game_activity/ffi_aarch64.rs
@@ -2686,7 +2686,6 @@ pub struct GameActivityKeyEvent {
     pub repeatCount: i32,
     pub keyCode: i32,
     pub scanCode: i32,
-    pub unicodeChar: i32,
 }
 #[test]
 fn bindgen_test_layout_GameActivityKeyEvent() {
@@ -2694,7 +2693,7 @@ fn bindgen_test_layout_GameActivityKeyEvent() {
     let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<GameActivityKeyEvent>(),
-        64usize,
+        56usize,
         concat!("Size of: ", stringify!(GameActivityKeyEvent))
     );
     assert_eq!(
@@ -2812,16 +2811,6 @@ fn bindgen_test_layout_GameActivityKeyEvent() {
             stringify!(scanCode)
         )
     );
-    assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).unicodeChar) as usize - ptr as usize },
-        56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(unicodeChar)
-        )
-    );
 }
 extern "C" {
     #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.\n\n This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`\n to set a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
diff --git a/android-activity/src/game_activity/ffi_arm.rs b/android-activity/src/game_activity/ffi_arm.rs
index f33e4bc..8933437 100644
--- a/android-activity/src/game_activity/ffi_arm.rs
+++ b/android-activity/src/game_activity/ffi_arm.rs
@@ -2716,7 +2716,6 @@ pub struct GameActivityKeyEvent {
     pub repeatCount: i32,
     pub keyCode: i32,
     pub scanCode: i32,
-    pub unicodeChar: i32,
 }
 #[test]
 fn bindgen_test_layout_GameActivityKeyEvent() {
@@ -2724,7 +2723,7 @@ fn bindgen_test_layout_GameActivityKeyEvent() {
     let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<GameActivityKeyEvent>(),
-        64usize,
+        56usize,
         concat!("Size of: ", stringify!(GameActivityKeyEvent))
     );
     assert_eq!(
@@ -2842,16 +2841,6 @@ fn bindgen_test_layout_GameActivityKeyEvent() {
             stringify!(scanCode)
         )
     );
-    assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).unicodeChar) as usize - ptr as usize },
-        56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(unicodeChar)
-        )
-    );
 }
 extern "C" {
     #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.\n\n This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`\n to set a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
diff --git a/android-activity/src/game_activity/ffi_i686.rs b/android-activity/src/game_activity/ffi_i686.rs
index ed9075f..d18082f 100644
--- a/android-activity/src/game_activity/ffi_i686.rs
+++ b/android-activity/src/game_activity/ffi_i686.rs
@@ -2637,7 +2637,6 @@ pub struct GameActivityKeyEvent {
     pub repeatCount: i32,
     pub keyCode: i32,
     pub scanCode: i32,
-    pub unicodeChar: i32,
 }
 #[test]
 fn bindgen_test_layout_GameActivityKeyEvent() {
@@ -2645,7 +2644,7 @@ fn bindgen_test_layout_GameActivityKeyEvent() {
     let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<GameActivityKeyEvent>(),
-        56usize,
+        52usize,
         concat!("Size of: ", stringify!(GameActivityKeyEvent))
     );
     assert_eq!(
@@ -2763,16 +2762,6 @@ fn bindgen_test_layout_GameActivityKeyEvent() {
             stringify!(scanCode)
         )
     );
-    assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).unicodeChar) as usize - ptr as usize },
-        52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(unicodeChar)
-        )
-    );
 }
 extern "C" {
     #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.\n\n This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`\n to set a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
diff --git a/android-activity/src/game_activity/ffi_x86_64.rs b/android-activity/src/game_activity/ffi_x86_64.rs
index 852e212..1e9d92a 100644
--- a/android-activity/src/game_activity/ffi_x86_64.rs
+++ b/android-activity/src/game_activity/ffi_x86_64.rs
@@ -2666,7 +2666,6 @@ pub struct GameActivityKeyEvent {
     pub repeatCount: i32,
     pub keyCode: i32,
     pub scanCode: i32,
-    pub unicodeChar: i32,
 }
 #[test]
 fn bindgen_test_layout_GameActivityKeyEvent() {
@@ -2674,7 +2673,7 @@ fn bindgen_test_layout_GameActivityKeyEvent() {
     let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<GameActivityKeyEvent>(),
-        64usize,
+        56usize,
         concat!("Size of: ", stringify!(GameActivityKeyEvent))
     );
     assert_eq!(
@@ -2792,16 +2791,6 @@ fn bindgen_test_layout_GameActivityKeyEvent() {
             stringify!(scanCode)
         )
     );
-    assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).unicodeChar) as usize - ptr as usize },
-        56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(unicodeChar)
-        )
-    );
 }
 extern "C" {
     #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.\n\n This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`\n to set a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]

From 1b3334178b1c3b997d535ff7208bc1b4277148b3 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 7 Aug 2023 22:58:15 +0100
Subject: [PATCH 29/93] Consolidate input types to avoid portability hazards

The following types have been moved from game_activity/input.rs to
input.rs so they can be shared by both backends:

Axis, ButtonState, EdgeFlags, KeyAction, KeyEventFlags, Keycode,
MetaState, MotionAction, MotionEventFlags

This addresses a portability hazard whereby code (such as Winit)
would inadvertently use the `ndk` type which works OK with the
native-activity backend but then wouldn't compile against the
game-activity backend.

The alternative of consolidating on the `ndk::events` types instead was
considered but we've repeatedly needed to diverge from the `ndk` API for
the sake of maintaining a consistent input API across the
`game-activity` and `native-activity` backends (input is an area where
the backends differ significantly in their implementation) and so it
generally seems slightly preferable to consolidate on types from this
crate (though it shouldn't make much difference for these types which
are almost direct bindings from ndk_sys).

The types can be converted to their `ndk::events` counterpart
via the `From` trait.

For now some of the `From` trait implementations rely on
`try_from().unwrap()` but the intention is to replace these with
infallible implementations once we bump the MSRV > 1.66
where we can use `num_enum::FromPrimitive` after adding a
catch-all `Other(u32)` to these enums.
---
 android-activity/src/game_activity/input.rs   | 608 +---------------
 android-activity/src/game_activity/mod.rs     |   4 +-
 android-activity/src/input.rs                 | 673 ++++++++++++++++++
 android-activity/src/input/sdk.rs             |   2 +-
 android-activity/src/native_activity/input.rs |  26 +-
 android-activity/src/native_activity/mod.rs   |   6 +-
 6 files changed, 696 insertions(+), 623 deletions(-)

diff --git a/android-activity/src/game_activity/input.rs b/android-activity/src/game_activity/input.rs
index 29b33bf..b5d5407 100644
--- a/android-activity/src/game_activity/input.rs
+++ b/android-activity/src/game_activity/input.rs
@@ -13,11 +13,13 @@
 // The `Class` was also bound differently to `android-ndk-rs` considering how the class is defined
 // by masking bits from the `Source`.
 
-use num_enum::{IntoPrimitive, TryFromPrimitive};
 use std::convert::TryInto;
 
 use crate::activity_impl::ffi::{GameActivityKeyEvent, GameActivityMotionEvent};
-use crate::input::{Class, Source};
+use crate::input::{
+    Axis, ButtonState, Class, EdgeFlags, KeyAction, KeyEventFlags, Keycode, MetaState,
+    MotionAction, MotionEventFlags, Source, ToolType,
+};
 
 // Note: try to keep this wrapper API compatible with the AInputEvent API if possible
 
@@ -29,83 +31,6 @@ pub enum InputEvent<'a> {
     TextEvent(crate::input::TextInputState),
 }
 
-/// A bitfield representing the state of modifier keys during an event.
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-25)
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct MetaState(pub u32);
-
-impl MetaState {
-    #[inline]
-    pub fn alt_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_ALT_ON != 0
-    }
-    #[inline]
-    pub fn alt_left_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_ALT_LEFT_ON != 0
-    }
-    #[inline]
-    pub fn alt_right_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_ALT_RIGHT_ON != 0
-    }
-    #[inline]
-    pub fn shift_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_SHIFT_ON != 0
-    }
-    #[inline]
-    pub fn shift_left_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_SHIFT_LEFT_ON != 0
-    }
-    #[inline]
-    pub fn shift_right_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_SHIFT_RIGHT_ON != 0
-    }
-    #[inline]
-    pub fn sym_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_SYM_ON != 0
-    }
-    #[inline]
-    pub fn function_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_FUNCTION_ON != 0
-    }
-    #[inline]
-    pub fn ctrl_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_CTRL_ON != 0
-    }
-    #[inline]
-    pub fn ctrl_left_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_CTRL_LEFT_ON != 0
-    }
-    #[inline]
-    pub fn ctrl_right_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_CTRL_RIGHT_ON != 0
-    }
-    #[inline]
-    pub fn meta_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_META_ON != 0
-    }
-    #[inline]
-    pub fn meta_left_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_META_LEFT_ON != 0
-    }
-    #[inline]
-    pub fn meta_right_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_META_RIGHT_ON != 0
-    }
-    #[inline]
-    pub fn caps_lock_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_CAPS_LOCK_ON != 0
-    }
-    #[inline]
-    pub fn num_lock_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_NUM_LOCK_ON != 0
-    }
-    #[inline]
-    pub fn scroll_lock_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_SCROLL_LOCK_ON != 0
-    }
-}
-
 /// A motion event.
 ///
 /// For general discussion of motion events in Android, see [the relevant
@@ -115,170 +40,6 @@ pub struct MotionEvent<'a> {
     ga_event: &'a GameActivityMotionEvent,
 }
 
-/// A motion action.
-///
-/// See [the NDK
-/// docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-29)
-#[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
-#[repr(u32)]
-pub enum MotionAction {
-    Down = ndk_sys::AMOTION_EVENT_ACTION_DOWN,
-    Up = ndk_sys::AMOTION_EVENT_ACTION_UP,
-    Move = ndk_sys::AMOTION_EVENT_ACTION_MOVE,
-    Cancel = ndk_sys::AMOTION_EVENT_ACTION_CANCEL,
-    Outside = ndk_sys::AMOTION_EVENT_ACTION_OUTSIDE,
-    PointerDown = ndk_sys::AMOTION_EVENT_ACTION_POINTER_DOWN,
-    PointerUp = ndk_sys::AMOTION_EVENT_ACTION_POINTER_UP,
-    HoverMove = ndk_sys::AMOTION_EVENT_ACTION_HOVER_MOVE,
-    Scroll = ndk_sys::AMOTION_EVENT_ACTION_SCROLL,
-    HoverEnter = ndk_sys::AMOTION_EVENT_ACTION_HOVER_ENTER,
-    HoverExit = ndk_sys::AMOTION_EVENT_ACTION_HOVER_EXIT,
-    ButtonPress = ndk_sys::AMOTION_EVENT_ACTION_BUTTON_PRESS,
-    ButtonRelease = ndk_sys::AMOTION_EVENT_ACTION_BUTTON_RELEASE,
-}
-
-/// An axis of a motion event.
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-32)
-#[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
-#[repr(u32)]
-pub enum Axis {
-    X = ndk_sys::AMOTION_EVENT_AXIS_X,
-    Y = ndk_sys::AMOTION_EVENT_AXIS_Y,
-    Pressure = ndk_sys::AMOTION_EVENT_AXIS_PRESSURE,
-    Size = ndk_sys::AMOTION_EVENT_AXIS_SIZE,
-    TouchMajor = ndk_sys::AMOTION_EVENT_AXIS_TOUCH_MAJOR,
-    TouchMinor = ndk_sys::AMOTION_EVENT_AXIS_TOUCH_MINOR,
-    ToolMajor = ndk_sys::AMOTION_EVENT_AXIS_TOOL_MAJOR,
-    ToolMinor = ndk_sys::AMOTION_EVENT_AXIS_TOOL_MINOR,
-    Orientation = ndk_sys::AMOTION_EVENT_AXIS_ORIENTATION,
-    Vscroll = ndk_sys::AMOTION_EVENT_AXIS_VSCROLL,
-    Hscroll = ndk_sys::AMOTION_EVENT_AXIS_HSCROLL,
-    Z = ndk_sys::AMOTION_EVENT_AXIS_Z,
-    Rx = ndk_sys::AMOTION_EVENT_AXIS_RX,
-    Ry = ndk_sys::AMOTION_EVENT_AXIS_RY,
-    Rz = ndk_sys::AMOTION_EVENT_AXIS_RZ,
-    HatX = ndk_sys::AMOTION_EVENT_AXIS_HAT_X,
-    HatY = ndk_sys::AMOTION_EVENT_AXIS_HAT_Y,
-    Ltrigger = ndk_sys::AMOTION_EVENT_AXIS_LTRIGGER,
-    Rtrigger = ndk_sys::AMOTION_EVENT_AXIS_RTRIGGER,
-    Throttle = ndk_sys::AMOTION_EVENT_AXIS_THROTTLE,
-    Rudder = ndk_sys::AMOTION_EVENT_AXIS_RUDDER,
-    Wheel = ndk_sys::AMOTION_EVENT_AXIS_WHEEL,
-    Gas = ndk_sys::AMOTION_EVENT_AXIS_GAS,
-    Brake = ndk_sys::AMOTION_EVENT_AXIS_BRAKE,
-    Distance = ndk_sys::AMOTION_EVENT_AXIS_DISTANCE,
-    Tilt = ndk_sys::AMOTION_EVENT_AXIS_TILT,
-    Scroll = ndk_sys::AMOTION_EVENT_AXIS_SCROLL,
-    RelativeX = ndk_sys::AMOTION_EVENT_AXIS_RELATIVE_X,
-    RelativeY = ndk_sys::AMOTION_EVENT_AXIS_RELATIVE_Y,
-    Generic1 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_1,
-    Generic2 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_2,
-    Generic3 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_3,
-    Generic4 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_4,
-    Generic5 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_5,
-    Generic6 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_6,
-    Generic7 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_7,
-    Generic8 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_8,
-    Generic9 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_9,
-    Generic10 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_10,
-    Generic11 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_11,
-    Generic12 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_12,
-    Generic13 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_13,
-    Generic14 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_14,
-    Generic15 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_15,
-    Generic16 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_16,
-}
-
-/// The tool type of a pointer.
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-48)
-#[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
-#[repr(u32)]
-pub enum ToolType {
-    Unknown = ndk_sys::AMOTION_EVENT_TOOL_TYPE_UNKNOWN,
-    Finger = ndk_sys::AMOTION_EVENT_TOOL_TYPE_FINGER,
-    Stylus = ndk_sys::AMOTION_EVENT_TOOL_TYPE_STYLUS,
-    Mouse = ndk_sys::AMOTION_EVENT_TOOL_TYPE_MOUSE,
-    Eraser = ndk_sys::AMOTION_EVENT_TOOL_TYPE_ERASER,
-    Palm = ndk_sys::AMOTION_EVENT_TOOL_TYPE_PALM,
-}
-
-/// A bitfield representing the state of buttons during a motion event.
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-33)
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct ButtonState(pub u32);
-
-impl ButtonState {
-    #[inline]
-    pub fn primary(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_PRIMARY != 0
-    }
-    #[inline]
-    pub fn secondary(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_SECONDARY != 0
-    }
-    #[inline]
-    pub fn teriary(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_TERTIARY != 0
-    }
-    #[inline]
-    pub fn back(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_BACK != 0
-    }
-    #[inline]
-    pub fn forward(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_FORWARD != 0
-    }
-    #[inline]
-    pub fn stylus_primary(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_STYLUS_PRIMARY != 0
-    }
-    #[inline]
-    pub fn stylus_secondary(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_STYLUS_SECONDARY != 0
-    }
-}
-
-/// A bitfield representing which edges were touched by a motion event.
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-31)
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct EdgeFlags(pub u32);
-
-impl EdgeFlags {
-    #[inline]
-    pub fn top(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_EDGE_FLAG_TOP != 0
-    }
-    #[inline]
-    pub fn bottom(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_EDGE_FLAG_BOTTOM != 0
-    }
-    #[inline]
-    pub fn left(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_EDGE_FLAG_LEFT != 0
-    }
-    #[inline]
-    pub fn right(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_EDGE_FLAG_RIGHT != 0
-    }
-}
-
-/// Flags associated with this [`MotionEvent`].
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-30)
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct MotionEventFlags(pub u32);
-
-impl MotionEventFlags {
-    #[inline]
-    pub fn window_is_obscured(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED != 0
-    }
-}
-
 impl<'a> MotionEvent<'a> {
     pub(crate) fn new(ga_event: &'a GameActivityMotionEvent) -> Self {
         Self { ga_event }
@@ -930,314 +691,6 @@ pub struct KeyEvent<'a> {
     ga_event: &'a GameActivityKeyEvent,
 }
 
-/// Key actions.
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-27)
-#[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
-#[repr(u32)]
-pub enum KeyAction {
-    Down = ndk_sys::AKEY_EVENT_ACTION_DOWN,
-    Up = ndk_sys::AKEY_EVENT_ACTION_UP,
-    Multiple = ndk_sys::AKEY_EVENT_ACTION_MULTIPLE,
-}
-
-/// Key codes.
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-39)
-#[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
-#[repr(u32)]
-pub enum Keycode {
-    Unknown = ndk_sys::AKEYCODE_UNKNOWN,
-    SoftLeft = ndk_sys::AKEYCODE_SOFT_LEFT,
-    SoftRight = ndk_sys::AKEYCODE_SOFT_RIGHT,
-    Home = ndk_sys::AKEYCODE_HOME,
-    Back = ndk_sys::AKEYCODE_BACK,
-    Call = ndk_sys::AKEYCODE_CALL,
-    Endcall = ndk_sys::AKEYCODE_ENDCALL,
-    Keycode0 = ndk_sys::AKEYCODE_0,
-    Keycode1 = ndk_sys::AKEYCODE_1,
-    Keycode2 = ndk_sys::AKEYCODE_2,
-    Keycode3 = ndk_sys::AKEYCODE_3,
-    Keycode4 = ndk_sys::AKEYCODE_4,
-    Keycode5 = ndk_sys::AKEYCODE_5,
-    Keycode6 = ndk_sys::AKEYCODE_6,
-    Keycode7 = ndk_sys::AKEYCODE_7,
-    Keycode8 = ndk_sys::AKEYCODE_8,
-    Keycode9 = ndk_sys::AKEYCODE_9,
-    Star = ndk_sys::AKEYCODE_STAR,
-    Pound = ndk_sys::AKEYCODE_POUND,
-    DpadUp = ndk_sys::AKEYCODE_DPAD_UP,
-    DpadDown = ndk_sys::AKEYCODE_DPAD_DOWN,
-    DpadLeft = ndk_sys::AKEYCODE_DPAD_LEFT,
-    DpadRight = ndk_sys::AKEYCODE_DPAD_RIGHT,
-    DpadCenter = ndk_sys::AKEYCODE_DPAD_CENTER,
-    VolumeUp = ndk_sys::AKEYCODE_VOLUME_UP,
-    VolumeDown = ndk_sys::AKEYCODE_VOLUME_DOWN,
-    Power = ndk_sys::AKEYCODE_POWER,
-    Camera = ndk_sys::AKEYCODE_CAMERA,
-    Clear = ndk_sys::AKEYCODE_CLEAR,
-    A = ndk_sys::AKEYCODE_A,
-    B = ndk_sys::AKEYCODE_B,
-    C = ndk_sys::AKEYCODE_C,
-    D = ndk_sys::AKEYCODE_D,
-    E = ndk_sys::AKEYCODE_E,
-    F = ndk_sys::AKEYCODE_F,
-    G = ndk_sys::AKEYCODE_G,
-    H = ndk_sys::AKEYCODE_H,
-    I = ndk_sys::AKEYCODE_I,
-    J = ndk_sys::AKEYCODE_J,
-    K = ndk_sys::AKEYCODE_K,
-    L = ndk_sys::AKEYCODE_L,
-    M = ndk_sys::AKEYCODE_M,
-    N = ndk_sys::AKEYCODE_N,
-    O = ndk_sys::AKEYCODE_O,
-    P = ndk_sys::AKEYCODE_P,
-    Q = ndk_sys::AKEYCODE_Q,
-    R = ndk_sys::AKEYCODE_R,
-    S = ndk_sys::AKEYCODE_S,
-    T = ndk_sys::AKEYCODE_T,
-    U = ndk_sys::AKEYCODE_U,
-    V = ndk_sys::AKEYCODE_V,
-    W = ndk_sys::AKEYCODE_W,
-    X = ndk_sys::AKEYCODE_X,
-    Y = ndk_sys::AKEYCODE_Y,
-    Z = ndk_sys::AKEYCODE_Z,
-    Comma = ndk_sys::AKEYCODE_COMMA,
-    Period = ndk_sys::AKEYCODE_PERIOD,
-    AltLeft = ndk_sys::AKEYCODE_ALT_LEFT,
-    AltRight = ndk_sys::AKEYCODE_ALT_RIGHT,
-    ShiftLeft = ndk_sys::AKEYCODE_SHIFT_LEFT,
-    ShiftRight = ndk_sys::AKEYCODE_SHIFT_RIGHT,
-    Tab = ndk_sys::AKEYCODE_TAB,
-    Space = ndk_sys::AKEYCODE_SPACE,
-    Sym = ndk_sys::AKEYCODE_SYM,
-    Explorer = ndk_sys::AKEYCODE_EXPLORER,
-    Envelope = ndk_sys::AKEYCODE_ENVELOPE,
-    Enter = ndk_sys::AKEYCODE_ENTER,
-    Del = ndk_sys::AKEYCODE_DEL,
-    Grave = ndk_sys::AKEYCODE_GRAVE,
-    Minus = ndk_sys::AKEYCODE_MINUS,
-    Equals = ndk_sys::AKEYCODE_EQUALS,
-    LeftBracket = ndk_sys::AKEYCODE_LEFT_BRACKET,
-    RightBracket = ndk_sys::AKEYCODE_RIGHT_BRACKET,
-    Backslash = ndk_sys::AKEYCODE_BACKSLASH,
-    Semicolon = ndk_sys::AKEYCODE_SEMICOLON,
-    Apostrophe = ndk_sys::AKEYCODE_APOSTROPHE,
-    Slash = ndk_sys::AKEYCODE_SLASH,
-    At = ndk_sys::AKEYCODE_AT,
-    Num = ndk_sys::AKEYCODE_NUM,
-    Headsethook = ndk_sys::AKEYCODE_HEADSETHOOK,
-    Focus = ndk_sys::AKEYCODE_FOCUS,
-    Plus = ndk_sys::AKEYCODE_PLUS,
-    Menu = ndk_sys::AKEYCODE_MENU,
-    Notification = ndk_sys::AKEYCODE_NOTIFICATION,
-    Search = ndk_sys::AKEYCODE_SEARCH,
-    MediaPlayPause = ndk_sys::AKEYCODE_MEDIA_PLAY_PAUSE,
-    MediaStop = ndk_sys::AKEYCODE_MEDIA_STOP,
-    MediaNext = ndk_sys::AKEYCODE_MEDIA_NEXT,
-    MediaPrevious = ndk_sys::AKEYCODE_MEDIA_PREVIOUS,
-    MediaRewind = ndk_sys::AKEYCODE_MEDIA_REWIND,
-    MediaFastForward = ndk_sys::AKEYCODE_MEDIA_FAST_FORWARD,
-    Mute = ndk_sys::AKEYCODE_MUTE,
-    PageUp = ndk_sys::AKEYCODE_PAGE_UP,
-    PageDown = ndk_sys::AKEYCODE_PAGE_DOWN,
-    Pictsymbols = ndk_sys::AKEYCODE_PICTSYMBOLS,
-    SwitchCharset = ndk_sys::AKEYCODE_SWITCH_CHARSET,
-    ButtonA = ndk_sys::AKEYCODE_BUTTON_A,
-    ButtonB = ndk_sys::AKEYCODE_BUTTON_B,
-    ButtonC = ndk_sys::AKEYCODE_BUTTON_C,
-    ButtonX = ndk_sys::AKEYCODE_BUTTON_X,
-    ButtonY = ndk_sys::AKEYCODE_BUTTON_Y,
-    ButtonZ = ndk_sys::AKEYCODE_BUTTON_Z,
-    ButtonL1 = ndk_sys::AKEYCODE_BUTTON_L1,
-    ButtonR1 = ndk_sys::AKEYCODE_BUTTON_R1,
-    ButtonL2 = ndk_sys::AKEYCODE_BUTTON_L2,
-    ButtonR2 = ndk_sys::AKEYCODE_BUTTON_R2,
-    ButtonThumbl = ndk_sys::AKEYCODE_BUTTON_THUMBL,
-    ButtonThumbr = ndk_sys::AKEYCODE_BUTTON_THUMBR,
-    ButtonStart = ndk_sys::AKEYCODE_BUTTON_START,
-    ButtonSelect = ndk_sys::AKEYCODE_BUTTON_SELECT,
-    ButtonMode = ndk_sys::AKEYCODE_BUTTON_MODE,
-    Escape = ndk_sys::AKEYCODE_ESCAPE,
-    ForwardDel = ndk_sys::AKEYCODE_FORWARD_DEL,
-    CtrlLeft = ndk_sys::AKEYCODE_CTRL_LEFT,
-    CtrlRight = ndk_sys::AKEYCODE_CTRL_RIGHT,
-    CapsLock = ndk_sys::AKEYCODE_CAPS_LOCK,
-    ScrollLock = ndk_sys::AKEYCODE_SCROLL_LOCK,
-    MetaLeft = ndk_sys::AKEYCODE_META_LEFT,
-    MetaRight = ndk_sys::AKEYCODE_META_RIGHT,
-    Function = ndk_sys::AKEYCODE_FUNCTION,
-    Sysrq = ndk_sys::AKEYCODE_SYSRQ,
-    Break = ndk_sys::AKEYCODE_BREAK,
-    MoveHome = ndk_sys::AKEYCODE_MOVE_HOME,
-    MoveEnd = ndk_sys::AKEYCODE_MOVE_END,
-    Insert = ndk_sys::AKEYCODE_INSERT,
-    Forward = ndk_sys::AKEYCODE_FORWARD,
-    MediaPlay = ndk_sys::AKEYCODE_MEDIA_PLAY,
-    MediaPause = ndk_sys::AKEYCODE_MEDIA_PAUSE,
-    MediaClose = ndk_sys::AKEYCODE_MEDIA_CLOSE,
-    MediaEject = ndk_sys::AKEYCODE_MEDIA_EJECT,
-    MediaRecord = ndk_sys::AKEYCODE_MEDIA_RECORD,
-    F1 = ndk_sys::AKEYCODE_F1,
-    F2 = ndk_sys::AKEYCODE_F2,
-    F3 = ndk_sys::AKEYCODE_F3,
-    F4 = ndk_sys::AKEYCODE_F4,
-    F5 = ndk_sys::AKEYCODE_F5,
-    F6 = ndk_sys::AKEYCODE_F6,
-    F7 = ndk_sys::AKEYCODE_F7,
-    F8 = ndk_sys::AKEYCODE_F8,
-    F9 = ndk_sys::AKEYCODE_F9,
-    F10 = ndk_sys::AKEYCODE_F10,
-    F11 = ndk_sys::AKEYCODE_F11,
-    F12 = ndk_sys::AKEYCODE_F12,
-    NumLock = ndk_sys::AKEYCODE_NUM_LOCK,
-    Numpad0 = ndk_sys::AKEYCODE_NUMPAD_0,
-    Numpad1 = ndk_sys::AKEYCODE_NUMPAD_1,
-    Numpad2 = ndk_sys::AKEYCODE_NUMPAD_2,
-    Numpad3 = ndk_sys::AKEYCODE_NUMPAD_3,
-    Numpad4 = ndk_sys::AKEYCODE_NUMPAD_4,
-    Numpad5 = ndk_sys::AKEYCODE_NUMPAD_5,
-    Numpad6 = ndk_sys::AKEYCODE_NUMPAD_6,
-    Numpad7 = ndk_sys::AKEYCODE_NUMPAD_7,
-    Numpad8 = ndk_sys::AKEYCODE_NUMPAD_8,
-    Numpad9 = ndk_sys::AKEYCODE_NUMPAD_9,
-    NumpadDivide = ndk_sys::AKEYCODE_NUMPAD_DIVIDE,
-    NumpadMultiply = ndk_sys::AKEYCODE_NUMPAD_MULTIPLY,
-    NumpadSubtract = ndk_sys::AKEYCODE_NUMPAD_SUBTRACT,
-    NumpadAdd = ndk_sys::AKEYCODE_NUMPAD_ADD,
-    NumpadDot = ndk_sys::AKEYCODE_NUMPAD_DOT,
-    NumpadComma = ndk_sys::AKEYCODE_NUMPAD_COMMA,
-    NumpadEnter = ndk_sys::AKEYCODE_NUMPAD_ENTER,
-    NumpadEquals = ndk_sys::AKEYCODE_NUMPAD_EQUALS,
-    NumpadLeftParen = ndk_sys::AKEYCODE_NUMPAD_LEFT_PAREN,
-    NumpadRightParen = ndk_sys::AKEYCODE_NUMPAD_RIGHT_PAREN,
-    VolumeMute = ndk_sys::AKEYCODE_VOLUME_MUTE,
-    Info = ndk_sys::AKEYCODE_INFO,
-    ChannelUp = ndk_sys::AKEYCODE_CHANNEL_UP,
-    ChannelDown = ndk_sys::AKEYCODE_CHANNEL_DOWN,
-    ZoomIn = ndk_sys::AKEYCODE_ZOOM_IN,
-    ZoomOut = ndk_sys::AKEYCODE_ZOOM_OUT,
-    Tv = ndk_sys::AKEYCODE_TV,
-    Window = ndk_sys::AKEYCODE_WINDOW,
-    Guide = ndk_sys::AKEYCODE_GUIDE,
-    Dvr = ndk_sys::AKEYCODE_DVR,
-    Bookmark = ndk_sys::AKEYCODE_BOOKMARK,
-    Captions = ndk_sys::AKEYCODE_CAPTIONS,
-    Settings = ndk_sys::AKEYCODE_SETTINGS,
-    TvPower = ndk_sys::AKEYCODE_TV_POWER,
-    TvInput = ndk_sys::AKEYCODE_TV_INPUT,
-    StbPower = ndk_sys::AKEYCODE_STB_POWER,
-    StbInput = ndk_sys::AKEYCODE_STB_INPUT,
-    AvrPower = ndk_sys::AKEYCODE_AVR_POWER,
-    AvrInput = ndk_sys::AKEYCODE_AVR_INPUT,
-    ProgRed = ndk_sys::AKEYCODE_PROG_RED,
-    ProgGreen = ndk_sys::AKEYCODE_PROG_GREEN,
-    ProgYellow = ndk_sys::AKEYCODE_PROG_YELLOW,
-    ProgBlue = ndk_sys::AKEYCODE_PROG_BLUE,
-    AppSwitch = ndk_sys::AKEYCODE_APP_SWITCH,
-    Button1 = ndk_sys::AKEYCODE_BUTTON_1,
-    Button2 = ndk_sys::AKEYCODE_BUTTON_2,
-    Button3 = ndk_sys::AKEYCODE_BUTTON_3,
-    Button4 = ndk_sys::AKEYCODE_BUTTON_4,
-    Button5 = ndk_sys::AKEYCODE_BUTTON_5,
-    Button6 = ndk_sys::AKEYCODE_BUTTON_6,
-    Button7 = ndk_sys::AKEYCODE_BUTTON_7,
-    Button8 = ndk_sys::AKEYCODE_BUTTON_8,
-    Button9 = ndk_sys::AKEYCODE_BUTTON_9,
-    Button10 = ndk_sys::AKEYCODE_BUTTON_10,
-    Button11 = ndk_sys::AKEYCODE_BUTTON_11,
-    Button12 = ndk_sys::AKEYCODE_BUTTON_12,
-    Button13 = ndk_sys::AKEYCODE_BUTTON_13,
-    Button14 = ndk_sys::AKEYCODE_BUTTON_14,
-    Button15 = ndk_sys::AKEYCODE_BUTTON_15,
-    Button16 = ndk_sys::AKEYCODE_BUTTON_16,
-    LanguageSwitch = ndk_sys::AKEYCODE_LANGUAGE_SWITCH,
-    MannerMode = ndk_sys::AKEYCODE_MANNER_MODE,
-    Keycode3dMode = ndk_sys::AKEYCODE_3D_MODE,
-    Contacts = ndk_sys::AKEYCODE_CONTACTS,
-    Calendar = ndk_sys::AKEYCODE_CALENDAR,
-    Music = ndk_sys::AKEYCODE_MUSIC,
-    Calculator = ndk_sys::AKEYCODE_CALCULATOR,
-    ZenkakuHankaku = ndk_sys::AKEYCODE_ZENKAKU_HANKAKU,
-    Eisu = ndk_sys::AKEYCODE_EISU,
-    Muhenkan = ndk_sys::AKEYCODE_MUHENKAN,
-    Henkan = ndk_sys::AKEYCODE_HENKAN,
-    KatakanaHiragana = ndk_sys::AKEYCODE_KATAKANA_HIRAGANA,
-    Yen = ndk_sys::AKEYCODE_YEN,
-    Ro = ndk_sys::AKEYCODE_RO,
-    Kana = ndk_sys::AKEYCODE_KANA,
-    Assist = ndk_sys::AKEYCODE_ASSIST,
-    BrightnessDown = ndk_sys::AKEYCODE_BRIGHTNESS_DOWN,
-    BrightnessUp = ndk_sys::AKEYCODE_BRIGHTNESS_UP,
-    MediaAudioTrack = ndk_sys::AKEYCODE_MEDIA_AUDIO_TRACK,
-    Sleep = ndk_sys::AKEYCODE_SLEEP,
-    Wakeup = ndk_sys::AKEYCODE_WAKEUP,
-    Pairing = ndk_sys::AKEYCODE_PAIRING,
-    MediaTopMenu = ndk_sys::AKEYCODE_MEDIA_TOP_MENU,
-    Keycode11 = ndk_sys::AKEYCODE_11,
-    Keycode12 = ndk_sys::AKEYCODE_12,
-    LastChannel = ndk_sys::AKEYCODE_LAST_CHANNEL,
-    TvDataService = ndk_sys::AKEYCODE_TV_DATA_SERVICE,
-    VoiceAssist = ndk_sys::AKEYCODE_VOICE_ASSIST,
-    TvRadioService = ndk_sys::AKEYCODE_TV_RADIO_SERVICE,
-    TvTeletext = ndk_sys::AKEYCODE_TV_TELETEXT,
-    TvNumberEntry = ndk_sys::AKEYCODE_TV_NUMBER_ENTRY,
-    TvTerrestrialAnalog = ndk_sys::AKEYCODE_TV_TERRESTRIAL_ANALOG,
-    TvTerrestrialDigital = ndk_sys::AKEYCODE_TV_TERRESTRIAL_DIGITAL,
-    TvSatellite = ndk_sys::AKEYCODE_TV_SATELLITE,
-    TvSatelliteBs = ndk_sys::AKEYCODE_TV_SATELLITE_BS,
-    TvSatelliteCs = ndk_sys::AKEYCODE_TV_SATELLITE_CS,
-    TvSatelliteService = ndk_sys::AKEYCODE_TV_SATELLITE_SERVICE,
-    TvNetwork = ndk_sys::AKEYCODE_TV_NETWORK,
-    TvAntennaCable = ndk_sys::AKEYCODE_TV_ANTENNA_CABLE,
-    TvInputHdmi1 = ndk_sys::AKEYCODE_TV_INPUT_HDMI_1,
-    TvInputHdmi2 = ndk_sys::AKEYCODE_TV_INPUT_HDMI_2,
-    TvInputHdmi3 = ndk_sys::AKEYCODE_TV_INPUT_HDMI_3,
-    TvInputHdmi4 = ndk_sys::AKEYCODE_TV_INPUT_HDMI_4,
-    TvInputComposite1 = ndk_sys::AKEYCODE_TV_INPUT_COMPOSITE_1,
-    TvInputComposite2 = ndk_sys::AKEYCODE_TV_INPUT_COMPOSITE_2,
-    TvInputComponent1 = ndk_sys::AKEYCODE_TV_INPUT_COMPONENT_1,
-    TvInputComponent2 = ndk_sys::AKEYCODE_TV_INPUT_COMPONENT_2,
-    TvInputVga1 = ndk_sys::AKEYCODE_TV_INPUT_VGA_1,
-    TvAudioDescription = ndk_sys::AKEYCODE_TV_AUDIO_DESCRIPTION,
-    TvAudioDescriptionMixUp = ndk_sys::AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP,
-    TvAudioDescriptionMixDown = ndk_sys::AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN,
-    TvZoomMode = ndk_sys::AKEYCODE_TV_ZOOM_MODE,
-    TvContentsMenu = ndk_sys::AKEYCODE_TV_CONTENTS_MENU,
-    TvMediaContextMenu = ndk_sys::AKEYCODE_TV_MEDIA_CONTEXT_MENU,
-    TvTimerProgramming = ndk_sys::AKEYCODE_TV_TIMER_PROGRAMMING,
-    Help = ndk_sys::AKEYCODE_HELP,
-    NavigatePrevious = ndk_sys::AKEYCODE_NAVIGATE_PREVIOUS,
-    NavigateNext = ndk_sys::AKEYCODE_NAVIGATE_NEXT,
-    NavigateIn = ndk_sys::AKEYCODE_NAVIGATE_IN,
-    NavigateOut = ndk_sys::AKEYCODE_NAVIGATE_OUT,
-    StemPrimary = ndk_sys::AKEYCODE_STEM_PRIMARY,
-    Stem1 = ndk_sys::AKEYCODE_STEM_1,
-    Stem2 = ndk_sys::AKEYCODE_STEM_2,
-    Stem3 = ndk_sys::AKEYCODE_STEM_3,
-    DpadUpLeft = ndk_sys::AKEYCODE_DPAD_UP_LEFT,
-    DpadDownLeft = ndk_sys::AKEYCODE_DPAD_DOWN_LEFT,
-    DpadUpRight = ndk_sys::AKEYCODE_DPAD_UP_RIGHT,
-    DpadDownRight = ndk_sys::AKEYCODE_DPAD_DOWN_RIGHT,
-    MediaSkipForward = ndk_sys::AKEYCODE_MEDIA_SKIP_FORWARD,
-    MediaSkipBackward = ndk_sys::AKEYCODE_MEDIA_SKIP_BACKWARD,
-    MediaStepForward = ndk_sys::AKEYCODE_MEDIA_STEP_FORWARD,
-    MediaStepBackward = ndk_sys::AKEYCODE_MEDIA_STEP_BACKWARD,
-    SoftSleep = ndk_sys::AKEYCODE_SOFT_SLEEP,
-    Cut = ndk_sys::AKEYCODE_CUT,
-    Copy = ndk_sys::AKEYCODE_COPY,
-    Paste = ndk_sys::AKEYCODE_PASTE,
-    SystemNavigationUp = ndk_sys::AKEYCODE_SYSTEM_NAVIGATION_UP,
-    SystemNavigationDown = ndk_sys::AKEYCODE_SYSTEM_NAVIGATION_DOWN,
-    SystemNavigationLeft = ndk_sys::AKEYCODE_SYSTEM_NAVIGATION_LEFT,
-    SystemNavigationRight = ndk_sys::AKEYCODE_SYSTEM_NAVIGATION_RIGHT,
-    AllApps = ndk_sys::AKEYCODE_ALL_APPS,
-    Refresh = ndk_sys::AKEYCODE_REFRESH,
-    ThumbsUp = ndk_sys::AKEYCODE_THUMBS_UP,
-    ThumbsDown = ndk_sys::AKEYCODE_THUMBS_DOWN,
-    ProfileSwitch = ndk_sys::AKEYCODE_PROFILE_SWITCH,
-}
-
 impl<'a> KeyEvent<'a> {
     pub(crate) fn new(ga_event: &'a GameActivityKeyEvent) -> Self {
         Self { ga_event }
@@ -1329,59 +782,6 @@ impl<'a> KeyEvent<'a> {
     }
 }
 
-/// Flags associated with [`KeyEvent`].
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-28)
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct KeyEventFlags(pub u32);
-
-impl KeyEventFlags {
-    #[inline]
-    pub fn cancelled(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_CANCELED != 0
-    }
-    #[inline]
-    pub fn cancelled_long_press(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_CANCELED_LONG_PRESS != 0
-    }
-    #[inline]
-    pub fn editor_action(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_EDITOR_ACTION != 0
-    }
-    #[inline]
-    pub fn fallback(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_FALLBACK != 0
-    }
-    #[inline]
-    pub fn from_system(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_FROM_SYSTEM != 0
-    }
-    #[inline]
-    pub fn keep_touch_mode(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_KEEP_TOUCH_MODE != 0
-    }
-    #[inline]
-    pub fn long_press(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_LONG_PRESS != 0
-    }
-    #[inline]
-    pub fn soft_keyboard(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_SOFT_KEYBOARD != 0
-    }
-    #[inline]
-    pub fn tracking(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_TRACKING != 0
-    }
-    #[inline]
-    pub fn virtual_hard_key(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY != 0
-    }
-    #[inline]
-    pub fn woke_here(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_WOKE_HERE != 0
-    }
-}
-
 impl<'a> KeyEvent<'a> {
     /// Flags associated with this [`KeyEvent`].
     ///
diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index 88a9fd6..02b3e37 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -27,7 +27,7 @@ use ndk::configuration::Configuration;
 use ndk::native_window::NativeWindow;
 
 use crate::error::InternalResult;
-use crate::input::{KeyCharacterMap, KeyCharacterMapBinding};
+use crate::input::{Axis, KeyCharacterMap, KeyCharacterMapBinding};
 use crate::jni_utils::{self, CloneJavaVM};
 use crate::util::{abort_on_panic, android_log, log_panic};
 use crate::{
@@ -38,7 +38,7 @@ mod ffi;
 
 pub mod input;
 use crate::input::{TextInputState, TextSpan};
-use input::{Axis, InputEvent, KeyEvent, MotionEvent};
+use input::{InputEvent, KeyEvent, MotionEvent};
 
 // The only time it's safe to update the android_app->savedState pointer is
 // while handling a SaveState event, so this API is only exposed for those
diff --git a/android-activity/src/input.rs b/android-activity/src/input.rs
index f62a088..743244f 100644
--- a/android-activity/src/input.rs
+++ b/android-activity/src/input.rs
@@ -87,6 +87,679 @@ impl From<Source> for Class {
     }
 }
 
+/// A bitfield representing the state of modifier keys during an event.
+///
+/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-25)
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct MetaState(pub u32);
+
+impl MetaState {
+    #[inline]
+    pub fn alt_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_ALT_ON != 0
+    }
+    #[inline]
+    pub fn alt_left_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_ALT_LEFT_ON != 0
+    }
+    #[inline]
+    pub fn alt_right_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_ALT_RIGHT_ON != 0
+    }
+    #[inline]
+    pub fn shift_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_SHIFT_ON != 0
+    }
+    #[inline]
+    pub fn shift_left_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_SHIFT_LEFT_ON != 0
+    }
+    #[inline]
+    pub fn shift_right_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_SHIFT_RIGHT_ON != 0
+    }
+    #[inline]
+    pub fn sym_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_SYM_ON != 0
+    }
+    #[inline]
+    pub fn function_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_FUNCTION_ON != 0
+    }
+    #[inline]
+    pub fn ctrl_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_CTRL_ON != 0
+    }
+    #[inline]
+    pub fn ctrl_left_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_CTRL_LEFT_ON != 0
+    }
+    #[inline]
+    pub fn ctrl_right_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_CTRL_RIGHT_ON != 0
+    }
+    #[inline]
+    pub fn meta_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_META_ON != 0
+    }
+    #[inline]
+    pub fn meta_left_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_META_LEFT_ON != 0
+    }
+    #[inline]
+    pub fn meta_right_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_META_RIGHT_ON != 0
+    }
+    #[inline]
+    pub fn caps_lock_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_CAPS_LOCK_ON != 0
+    }
+    #[inline]
+    pub fn num_lock_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_NUM_LOCK_ON != 0
+    }
+    #[inline]
+    pub fn scroll_lock_on(self) -> bool {
+        self.0 & ndk_sys::AMETA_SCROLL_LOCK_ON != 0
+    }
+}
+
+impl From<ndk::event::MetaState> for MetaState {
+    fn from(value: ndk::event::MetaState) -> Self {
+        Self(value.0)
+    }
+}
+
+/// A motion action.
+///
+/// See [the NDK
+/// docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-29)
+#[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
+#[repr(u32)]
+pub enum MotionAction {
+    Down = ndk_sys::AMOTION_EVENT_ACTION_DOWN,
+    Up = ndk_sys::AMOTION_EVENT_ACTION_UP,
+    Move = ndk_sys::AMOTION_EVENT_ACTION_MOVE,
+    Cancel = ndk_sys::AMOTION_EVENT_ACTION_CANCEL,
+    Outside = ndk_sys::AMOTION_EVENT_ACTION_OUTSIDE,
+    PointerDown = ndk_sys::AMOTION_EVENT_ACTION_POINTER_DOWN,
+    PointerUp = ndk_sys::AMOTION_EVENT_ACTION_POINTER_UP,
+    HoverMove = ndk_sys::AMOTION_EVENT_ACTION_HOVER_MOVE,
+    Scroll = ndk_sys::AMOTION_EVENT_ACTION_SCROLL,
+    HoverEnter = ndk_sys::AMOTION_EVENT_ACTION_HOVER_ENTER,
+    HoverExit = ndk_sys::AMOTION_EVENT_ACTION_HOVER_EXIT,
+    ButtonPress = ndk_sys::AMOTION_EVENT_ACTION_BUTTON_PRESS,
+    ButtonRelease = ndk_sys::AMOTION_EVENT_ACTION_BUTTON_RELEASE,
+}
+
+impl From<ndk::event::MotionAction> for MotionAction {
+    fn from(value: ndk::event::MotionAction) -> Self {
+        let inner: u32 = value.into();
+        inner.try_into().unwrap() // TODO: use into() when we bump the MSRV to 1.68
+    }
+}
+
+/// An axis of a motion event.
+///
+/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-32)
+#[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
+#[repr(u32)]
+pub enum Axis {
+    X = ndk_sys::AMOTION_EVENT_AXIS_X,
+    Y = ndk_sys::AMOTION_EVENT_AXIS_Y,
+    Pressure = ndk_sys::AMOTION_EVENT_AXIS_PRESSURE,
+    Size = ndk_sys::AMOTION_EVENT_AXIS_SIZE,
+    TouchMajor = ndk_sys::AMOTION_EVENT_AXIS_TOUCH_MAJOR,
+    TouchMinor = ndk_sys::AMOTION_EVENT_AXIS_TOUCH_MINOR,
+    ToolMajor = ndk_sys::AMOTION_EVENT_AXIS_TOOL_MAJOR,
+    ToolMinor = ndk_sys::AMOTION_EVENT_AXIS_TOOL_MINOR,
+    Orientation = ndk_sys::AMOTION_EVENT_AXIS_ORIENTATION,
+    Vscroll = ndk_sys::AMOTION_EVENT_AXIS_VSCROLL,
+    Hscroll = ndk_sys::AMOTION_EVENT_AXIS_HSCROLL,
+    Z = ndk_sys::AMOTION_EVENT_AXIS_Z,
+    Rx = ndk_sys::AMOTION_EVENT_AXIS_RX,
+    Ry = ndk_sys::AMOTION_EVENT_AXIS_RY,
+    Rz = ndk_sys::AMOTION_EVENT_AXIS_RZ,
+    HatX = ndk_sys::AMOTION_EVENT_AXIS_HAT_X,
+    HatY = ndk_sys::AMOTION_EVENT_AXIS_HAT_Y,
+    Ltrigger = ndk_sys::AMOTION_EVENT_AXIS_LTRIGGER,
+    Rtrigger = ndk_sys::AMOTION_EVENT_AXIS_RTRIGGER,
+    Throttle = ndk_sys::AMOTION_EVENT_AXIS_THROTTLE,
+    Rudder = ndk_sys::AMOTION_EVENT_AXIS_RUDDER,
+    Wheel = ndk_sys::AMOTION_EVENT_AXIS_WHEEL,
+    Gas = ndk_sys::AMOTION_EVENT_AXIS_GAS,
+    Brake = ndk_sys::AMOTION_EVENT_AXIS_BRAKE,
+    Distance = ndk_sys::AMOTION_EVENT_AXIS_DISTANCE,
+    Tilt = ndk_sys::AMOTION_EVENT_AXIS_TILT,
+    Scroll = ndk_sys::AMOTION_EVENT_AXIS_SCROLL,
+    RelativeX = ndk_sys::AMOTION_EVENT_AXIS_RELATIVE_X,
+    RelativeY = ndk_sys::AMOTION_EVENT_AXIS_RELATIVE_Y,
+    Generic1 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_1,
+    Generic2 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_2,
+    Generic3 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_3,
+    Generic4 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_4,
+    Generic5 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_5,
+    Generic6 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_6,
+    Generic7 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_7,
+    Generic8 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_8,
+    Generic9 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_9,
+    Generic10 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_10,
+    Generic11 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_11,
+    Generic12 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_12,
+    Generic13 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_13,
+    Generic14 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_14,
+    Generic15 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_15,
+    Generic16 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_16,
+}
+
+impl From<ndk::event::Axis> for Axis {
+    fn from(value: ndk::event::Axis) -> Self {
+        let inner: u32 = value.into();
+        inner.try_into().unwrap() // TODO: replace with into() when we can bump MSRV to 1.68!
+    }
+}
+
+/// The tool type of a pointer.
+///
+/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-48)
+#[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
+#[repr(u32)]
+pub enum ToolType {
+    /// Unknown tool type.
+    ///
+    /// This constant is used when the tool type is not known or is not relevant, such as for a trackball or other non-pointing device.
+    Unknown = ndk_sys::AMOTION_EVENT_TOOL_TYPE_UNKNOWN,
+
+    /// The tool is a finger.
+    Finger = ndk_sys::AMOTION_EVENT_TOOL_TYPE_FINGER,
+
+    /// The tool is a stylus.
+    Stylus = ndk_sys::AMOTION_EVENT_TOOL_TYPE_STYLUS,
+
+    ///  The tool is a mouse.
+    Mouse = ndk_sys::AMOTION_EVENT_TOOL_TYPE_MOUSE,
+
+    /// The tool is an eraser or a stylus being used in an inverted posture.
+    Eraser = ndk_sys::AMOTION_EVENT_TOOL_TYPE_ERASER,
+
+    /// The tool is a palm and should be rejected
+    Palm = ndk_sys::AMOTION_EVENT_TOOL_TYPE_PALM,
+}
+
+/// A bitfield representing the state of buttons during a motion event.
+///
+/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-33)
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct ButtonState(pub u32);
+
+impl ButtonState {
+    #[inline]
+    pub fn primary(self) -> bool {
+        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_PRIMARY != 0
+    }
+    #[inline]
+    pub fn secondary(self) -> bool {
+        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_SECONDARY != 0
+    }
+    #[inline]
+    pub fn teriary(self) -> bool {
+        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_TERTIARY != 0
+    }
+    #[inline]
+    pub fn back(self) -> bool {
+        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_BACK != 0
+    }
+    #[inline]
+    pub fn forward(self) -> bool {
+        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_FORWARD != 0
+    }
+    #[inline]
+    pub fn stylus_primary(self) -> bool {
+        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_STYLUS_PRIMARY != 0
+    }
+    #[inline]
+    pub fn stylus_secondary(self) -> bool {
+        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_STYLUS_SECONDARY != 0
+    }
+}
+
+impl From<ndk::event::ButtonState> for ButtonState {
+    fn from(value: ndk::event::ButtonState) -> Self {
+        Self(value.0)
+    }
+}
+
+/// A bitfield representing which edges were touched by a motion event.
+///
+/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-31)
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct EdgeFlags(pub u32);
+
+impl EdgeFlags {
+    #[inline]
+    pub fn top(self) -> bool {
+        self.0 & ndk_sys::AMOTION_EVENT_EDGE_FLAG_TOP != 0
+    }
+    #[inline]
+    pub fn bottom(self) -> bool {
+        self.0 & ndk_sys::AMOTION_EVENT_EDGE_FLAG_BOTTOM != 0
+    }
+    #[inline]
+    pub fn left(self) -> bool {
+        self.0 & ndk_sys::AMOTION_EVENT_EDGE_FLAG_LEFT != 0
+    }
+    #[inline]
+    pub fn right(self) -> bool {
+        self.0 & ndk_sys::AMOTION_EVENT_EDGE_FLAG_RIGHT != 0
+    }
+}
+
+impl From<ndk::event::EdgeFlags> for EdgeFlags {
+    fn from(value: ndk::event::EdgeFlags) -> Self {
+        Self(value.0)
+    }
+}
+
+/// Flags associated with this [`MotionEvent`].
+///
+/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-30)
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct MotionEventFlags(pub u32);
+
+impl MotionEventFlags {
+    #[inline]
+    pub fn window_is_obscured(self) -> bool {
+        self.0 & ndk_sys::AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED != 0
+    }
+}
+
+impl From<ndk::event::MotionEventFlags> for MotionEventFlags {
+    fn from(value: ndk::event::MotionEventFlags) -> Self {
+        Self(value.0)
+    }
+}
+
+/// Key actions.
+///
+/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-27)
+#[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
+#[repr(u32)]
+pub enum KeyAction {
+    Down = ndk_sys::AKEY_EVENT_ACTION_DOWN,
+    Up = ndk_sys::AKEY_EVENT_ACTION_UP,
+    Multiple = ndk_sys::AKEY_EVENT_ACTION_MULTIPLE,
+}
+
+impl From<ndk::event::KeyAction> for KeyAction {
+    fn from(value: ndk::event::KeyAction) -> Self {
+        let inner: u32 = value.into();
+        inner.try_into().unwrap() // TODO: replace with into() when we can bump MSRV to 1.68!
+    }
+}
+
+/// Key codes.
+///
+/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-39)
+#[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
+#[repr(u32)]
+pub enum Keycode {
+    Unknown = ndk_sys::AKEYCODE_UNKNOWN,
+    SoftLeft = ndk_sys::AKEYCODE_SOFT_LEFT,
+    SoftRight = ndk_sys::AKEYCODE_SOFT_RIGHT,
+    Home = ndk_sys::AKEYCODE_HOME,
+    Back = ndk_sys::AKEYCODE_BACK,
+    Call = ndk_sys::AKEYCODE_CALL,
+    Endcall = ndk_sys::AKEYCODE_ENDCALL,
+    Keycode0 = ndk_sys::AKEYCODE_0,
+    Keycode1 = ndk_sys::AKEYCODE_1,
+    Keycode2 = ndk_sys::AKEYCODE_2,
+    Keycode3 = ndk_sys::AKEYCODE_3,
+    Keycode4 = ndk_sys::AKEYCODE_4,
+    Keycode5 = ndk_sys::AKEYCODE_5,
+    Keycode6 = ndk_sys::AKEYCODE_6,
+    Keycode7 = ndk_sys::AKEYCODE_7,
+    Keycode8 = ndk_sys::AKEYCODE_8,
+    Keycode9 = ndk_sys::AKEYCODE_9,
+    Star = ndk_sys::AKEYCODE_STAR,
+    Pound = ndk_sys::AKEYCODE_POUND,
+    DpadUp = ndk_sys::AKEYCODE_DPAD_UP,
+    DpadDown = ndk_sys::AKEYCODE_DPAD_DOWN,
+    DpadLeft = ndk_sys::AKEYCODE_DPAD_LEFT,
+    DpadRight = ndk_sys::AKEYCODE_DPAD_RIGHT,
+    DpadCenter = ndk_sys::AKEYCODE_DPAD_CENTER,
+    VolumeUp = ndk_sys::AKEYCODE_VOLUME_UP,
+    VolumeDown = ndk_sys::AKEYCODE_VOLUME_DOWN,
+    Power = ndk_sys::AKEYCODE_POWER,
+    Camera = ndk_sys::AKEYCODE_CAMERA,
+    Clear = ndk_sys::AKEYCODE_CLEAR,
+    A = ndk_sys::AKEYCODE_A,
+    B = ndk_sys::AKEYCODE_B,
+    C = ndk_sys::AKEYCODE_C,
+    D = ndk_sys::AKEYCODE_D,
+    E = ndk_sys::AKEYCODE_E,
+    F = ndk_sys::AKEYCODE_F,
+    G = ndk_sys::AKEYCODE_G,
+    H = ndk_sys::AKEYCODE_H,
+    I = ndk_sys::AKEYCODE_I,
+    J = ndk_sys::AKEYCODE_J,
+    K = ndk_sys::AKEYCODE_K,
+    L = ndk_sys::AKEYCODE_L,
+    M = ndk_sys::AKEYCODE_M,
+    N = ndk_sys::AKEYCODE_N,
+    O = ndk_sys::AKEYCODE_O,
+    P = ndk_sys::AKEYCODE_P,
+    Q = ndk_sys::AKEYCODE_Q,
+    R = ndk_sys::AKEYCODE_R,
+    S = ndk_sys::AKEYCODE_S,
+    T = ndk_sys::AKEYCODE_T,
+    U = ndk_sys::AKEYCODE_U,
+    V = ndk_sys::AKEYCODE_V,
+    W = ndk_sys::AKEYCODE_W,
+    X = ndk_sys::AKEYCODE_X,
+    Y = ndk_sys::AKEYCODE_Y,
+    Z = ndk_sys::AKEYCODE_Z,
+    Comma = ndk_sys::AKEYCODE_COMMA,
+    Period = ndk_sys::AKEYCODE_PERIOD,
+    AltLeft = ndk_sys::AKEYCODE_ALT_LEFT,
+    AltRight = ndk_sys::AKEYCODE_ALT_RIGHT,
+    ShiftLeft = ndk_sys::AKEYCODE_SHIFT_LEFT,
+    ShiftRight = ndk_sys::AKEYCODE_SHIFT_RIGHT,
+    Tab = ndk_sys::AKEYCODE_TAB,
+    Space = ndk_sys::AKEYCODE_SPACE,
+    Sym = ndk_sys::AKEYCODE_SYM,
+    Explorer = ndk_sys::AKEYCODE_EXPLORER,
+    Envelope = ndk_sys::AKEYCODE_ENVELOPE,
+    Enter = ndk_sys::AKEYCODE_ENTER,
+    Del = ndk_sys::AKEYCODE_DEL,
+    Grave = ndk_sys::AKEYCODE_GRAVE,
+    Minus = ndk_sys::AKEYCODE_MINUS,
+    Equals = ndk_sys::AKEYCODE_EQUALS,
+    LeftBracket = ndk_sys::AKEYCODE_LEFT_BRACKET,
+    RightBracket = ndk_sys::AKEYCODE_RIGHT_BRACKET,
+    Backslash = ndk_sys::AKEYCODE_BACKSLASH,
+    Semicolon = ndk_sys::AKEYCODE_SEMICOLON,
+    Apostrophe = ndk_sys::AKEYCODE_APOSTROPHE,
+    Slash = ndk_sys::AKEYCODE_SLASH,
+    At = ndk_sys::AKEYCODE_AT,
+    Num = ndk_sys::AKEYCODE_NUM,
+    Headsethook = ndk_sys::AKEYCODE_HEADSETHOOK,
+    Focus = ndk_sys::AKEYCODE_FOCUS,
+    Plus = ndk_sys::AKEYCODE_PLUS,
+    Menu = ndk_sys::AKEYCODE_MENU,
+    Notification = ndk_sys::AKEYCODE_NOTIFICATION,
+    Search = ndk_sys::AKEYCODE_SEARCH,
+    MediaPlayPause = ndk_sys::AKEYCODE_MEDIA_PLAY_PAUSE,
+    MediaStop = ndk_sys::AKEYCODE_MEDIA_STOP,
+    MediaNext = ndk_sys::AKEYCODE_MEDIA_NEXT,
+    MediaPrevious = ndk_sys::AKEYCODE_MEDIA_PREVIOUS,
+    MediaRewind = ndk_sys::AKEYCODE_MEDIA_REWIND,
+    MediaFastForward = ndk_sys::AKEYCODE_MEDIA_FAST_FORWARD,
+    Mute = ndk_sys::AKEYCODE_MUTE,
+    PageUp = ndk_sys::AKEYCODE_PAGE_UP,
+    PageDown = ndk_sys::AKEYCODE_PAGE_DOWN,
+    Pictsymbols = ndk_sys::AKEYCODE_PICTSYMBOLS,
+    SwitchCharset = ndk_sys::AKEYCODE_SWITCH_CHARSET,
+    ButtonA = ndk_sys::AKEYCODE_BUTTON_A,
+    ButtonB = ndk_sys::AKEYCODE_BUTTON_B,
+    ButtonC = ndk_sys::AKEYCODE_BUTTON_C,
+    ButtonX = ndk_sys::AKEYCODE_BUTTON_X,
+    ButtonY = ndk_sys::AKEYCODE_BUTTON_Y,
+    ButtonZ = ndk_sys::AKEYCODE_BUTTON_Z,
+    ButtonL1 = ndk_sys::AKEYCODE_BUTTON_L1,
+    ButtonR1 = ndk_sys::AKEYCODE_BUTTON_R1,
+    ButtonL2 = ndk_sys::AKEYCODE_BUTTON_L2,
+    ButtonR2 = ndk_sys::AKEYCODE_BUTTON_R2,
+    ButtonThumbl = ndk_sys::AKEYCODE_BUTTON_THUMBL,
+    ButtonThumbr = ndk_sys::AKEYCODE_BUTTON_THUMBR,
+    ButtonStart = ndk_sys::AKEYCODE_BUTTON_START,
+    ButtonSelect = ndk_sys::AKEYCODE_BUTTON_SELECT,
+    ButtonMode = ndk_sys::AKEYCODE_BUTTON_MODE,
+    Escape = ndk_sys::AKEYCODE_ESCAPE,
+    ForwardDel = ndk_sys::AKEYCODE_FORWARD_DEL,
+    CtrlLeft = ndk_sys::AKEYCODE_CTRL_LEFT,
+    CtrlRight = ndk_sys::AKEYCODE_CTRL_RIGHT,
+    CapsLock = ndk_sys::AKEYCODE_CAPS_LOCK,
+    ScrollLock = ndk_sys::AKEYCODE_SCROLL_LOCK,
+    MetaLeft = ndk_sys::AKEYCODE_META_LEFT,
+    MetaRight = ndk_sys::AKEYCODE_META_RIGHT,
+    Function = ndk_sys::AKEYCODE_FUNCTION,
+    Sysrq = ndk_sys::AKEYCODE_SYSRQ,
+    Break = ndk_sys::AKEYCODE_BREAK,
+    MoveHome = ndk_sys::AKEYCODE_MOVE_HOME,
+    MoveEnd = ndk_sys::AKEYCODE_MOVE_END,
+    Insert = ndk_sys::AKEYCODE_INSERT,
+    Forward = ndk_sys::AKEYCODE_FORWARD,
+    MediaPlay = ndk_sys::AKEYCODE_MEDIA_PLAY,
+    MediaPause = ndk_sys::AKEYCODE_MEDIA_PAUSE,
+    MediaClose = ndk_sys::AKEYCODE_MEDIA_CLOSE,
+    MediaEject = ndk_sys::AKEYCODE_MEDIA_EJECT,
+    MediaRecord = ndk_sys::AKEYCODE_MEDIA_RECORD,
+    F1 = ndk_sys::AKEYCODE_F1,
+    F2 = ndk_sys::AKEYCODE_F2,
+    F3 = ndk_sys::AKEYCODE_F3,
+    F4 = ndk_sys::AKEYCODE_F4,
+    F5 = ndk_sys::AKEYCODE_F5,
+    F6 = ndk_sys::AKEYCODE_F6,
+    F7 = ndk_sys::AKEYCODE_F7,
+    F8 = ndk_sys::AKEYCODE_F8,
+    F9 = ndk_sys::AKEYCODE_F9,
+    F10 = ndk_sys::AKEYCODE_F10,
+    F11 = ndk_sys::AKEYCODE_F11,
+    F12 = ndk_sys::AKEYCODE_F12,
+    NumLock = ndk_sys::AKEYCODE_NUM_LOCK,
+    Numpad0 = ndk_sys::AKEYCODE_NUMPAD_0,
+    Numpad1 = ndk_sys::AKEYCODE_NUMPAD_1,
+    Numpad2 = ndk_sys::AKEYCODE_NUMPAD_2,
+    Numpad3 = ndk_sys::AKEYCODE_NUMPAD_3,
+    Numpad4 = ndk_sys::AKEYCODE_NUMPAD_4,
+    Numpad5 = ndk_sys::AKEYCODE_NUMPAD_5,
+    Numpad6 = ndk_sys::AKEYCODE_NUMPAD_6,
+    Numpad7 = ndk_sys::AKEYCODE_NUMPAD_7,
+    Numpad8 = ndk_sys::AKEYCODE_NUMPAD_8,
+    Numpad9 = ndk_sys::AKEYCODE_NUMPAD_9,
+    NumpadDivide = ndk_sys::AKEYCODE_NUMPAD_DIVIDE,
+    NumpadMultiply = ndk_sys::AKEYCODE_NUMPAD_MULTIPLY,
+    NumpadSubtract = ndk_sys::AKEYCODE_NUMPAD_SUBTRACT,
+    NumpadAdd = ndk_sys::AKEYCODE_NUMPAD_ADD,
+    NumpadDot = ndk_sys::AKEYCODE_NUMPAD_DOT,
+    NumpadComma = ndk_sys::AKEYCODE_NUMPAD_COMMA,
+    NumpadEnter = ndk_sys::AKEYCODE_NUMPAD_ENTER,
+    NumpadEquals = ndk_sys::AKEYCODE_NUMPAD_EQUALS,
+    NumpadLeftParen = ndk_sys::AKEYCODE_NUMPAD_LEFT_PAREN,
+    NumpadRightParen = ndk_sys::AKEYCODE_NUMPAD_RIGHT_PAREN,
+    VolumeMute = ndk_sys::AKEYCODE_VOLUME_MUTE,
+    Info = ndk_sys::AKEYCODE_INFO,
+    ChannelUp = ndk_sys::AKEYCODE_CHANNEL_UP,
+    ChannelDown = ndk_sys::AKEYCODE_CHANNEL_DOWN,
+    ZoomIn = ndk_sys::AKEYCODE_ZOOM_IN,
+    ZoomOut = ndk_sys::AKEYCODE_ZOOM_OUT,
+    Tv = ndk_sys::AKEYCODE_TV,
+    Window = ndk_sys::AKEYCODE_WINDOW,
+    Guide = ndk_sys::AKEYCODE_GUIDE,
+    Dvr = ndk_sys::AKEYCODE_DVR,
+    Bookmark = ndk_sys::AKEYCODE_BOOKMARK,
+    Captions = ndk_sys::AKEYCODE_CAPTIONS,
+    Settings = ndk_sys::AKEYCODE_SETTINGS,
+    TvPower = ndk_sys::AKEYCODE_TV_POWER,
+    TvInput = ndk_sys::AKEYCODE_TV_INPUT,
+    StbPower = ndk_sys::AKEYCODE_STB_POWER,
+    StbInput = ndk_sys::AKEYCODE_STB_INPUT,
+    AvrPower = ndk_sys::AKEYCODE_AVR_POWER,
+    AvrInput = ndk_sys::AKEYCODE_AVR_INPUT,
+    ProgRed = ndk_sys::AKEYCODE_PROG_RED,
+    ProgGreen = ndk_sys::AKEYCODE_PROG_GREEN,
+    ProgYellow = ndk_sys::AKEYCODE_PROG_YELLOW,
+    ProgBlue = ndk_sys::AKEYCODE_PROG_BLUE,
+    AppSwitch = ndk_sys::AKEYCODE_APP_SWITCH,
+    Button1 = ndk_sys::AKEYCODE_BUTTON_1,
+    Button2 = ndk_sys::AKEYCODE_BUTTON_2,
+    Button3 = ndk_sys::AKEYCODE_BUTTON_3,
+    Button4 = ndk_sys::AKEYCODE_BUTTON_4,
+    Button5 = ndk_sys::AKEYCODE_BUTTON_5,
+    Button6 = ndk_sys::AKEYCODE_BUTTON_6,
+    Button7 = ndk_sys::AKEYCODE_BUTTON_7,
+    Button8 = ndk_sys::AKEYCODE_BUTTON_8,
+    Button9 = ndk_sys::AKEYCODE_BUTTON_9,
+    Button10 = ndk_sys::AKEYCODE_BUTTON_10,
+    Button11 = ndk_sys::AKEYCODE_BUTTON_11,
+    Button12 = ndk_sys::AKEYCODE_BUTTON_12,
+    Button13 = ndk_sys::AKEYCODE_BUTTON_13,
+    Button14 = ndk_sys::AKEYCODE_BUTTON_14,
+    Button15 = ndk_sys::AKEYCODE_BUTTON_15,
+    Button16 = ndk_sys::AKEYCODE_BUTTON_16,
+    LanguageSwitch = ndk_sys::AKEYCODE_LANGUAGE_SWITCH,
+    MannerMode = ndk_sys::AKEYCODE_MANNER_MODE,
+    Keycode3dMode = ndk_sys::AKEYCODE_3D_MODE,
+    Contacts = ndk_sys::AKEYCODE_CONTACTS,
+    Calendar = ndk_sys::AKEYCODE_CALENDAR,
+    Music = ndk_sys::AKEYCODE_MUSIC,
+    Calculator = ndk_sys::AKEYCODE_CALCULATOR,
+    ZenkakuHankaku = ndk_sys::AKEYCODE_ZENKAKU_HANKAKU,
+    Eisu = ndk_sys::AKEYCODE_EISU,
+    Muhenkan = ndk_sys::AKEYCODE_MUHENKAN,
+    Henkan = ndk_sys::AKEYCODE_HENKAN,
+    KatakanaHiragana = ndk_sys::AKEYCODE_KATAKANA_HIRAGANA,
+    Yen = ndk_sys::AKEYCODE_YEN,
+    Ro = ndk_sys::AKEYCODE_RO,
+    Kana = ndk_sys::AKEYCODE_KANA,
+    Assist = ndk_sys::AKEYCODE_ASSIST,
+    BrightnessDown = ndk_sys::AKEYCODE_BRIGHTNESS_DOWN,
+    BrightnessUp = ndk_sys::AKEYCODE_BRIGHTNESS_UP,
+    MediaAudioTrack = ndk_sys::AKEYCODE_MEDIA_AUDIO_TRACK,
+    Sleep = ndk_sys::AKEYCODE_SLEEP,
+    Wakeup = ndk_sys::AKEYCODE_WAKEUP,
+    Pairing = ndk_sys::AKEYCODE_PAIRING,
+    MediaTopMenu = ndk_sys::AKEYCODE_MEDIA_TOP_MENU,
+    Keycode11 = ndk_sys::AKEYCODE_11,
+    Keycode12 = ndk_sys::AKEYCODE_12,
+    LastChannel = ndk_sys::AKEYCODE_LAST_CHANNEL,
+    TvDataService = ndk_sys::AKEYCODE_TV_DATA_SERVICE,
+    VoiceAssist = ndk_sys::AKEYCODE_VOICE_ASSIST,
+    TvRadioService = ndk_sys::AKEYCODE_TV_RADIO_SERVICE,
+    TvTeletext = ndk_sys::AKEYCODE_TV_TELETEXT,
+    TvNumberEntry = ndk_sys::AKEYCODE_TV_NUMBER_ENTRY,
+    TvTerrestrialAnalog = ndk_sys::AKEYCODE_TV_TERRESTRIAL_ANALOG,
+    TvTerrestrialDigital = ndk_sys::AKEYCODE_TV_TERRESTRIAL_DIGITAL,
+    TvSatellite = ndk_sys::AKEYCODE_TV_SATELLITE,
+    TvSatelliteBs = ndk_sys::AKEYCODE_TV_SATELLITE_BS,
+    TvSatelliteCs = ndk_sys::AKEYCODE_TV_SATELLITE_CS,
+    TvSatelliteService = ndk_sys::AKEYCODE_TV_SATELLITE_SERVICE,
+    TvNetwork = ndk_sys::AKEYCODE_TV_NETWORK,
+    TvAntennaCable = ndk_sys::AKEYCODE_TV_ANTENNA_CABLE,
+    TvInputHdmi1 = ndk_sys::AKEYCODE_TV_INPUT_HDMI_1,
+    TvInputHdmi2 = ndk_sys::AKEYCODE_TV_INPUT_HDMI_2,
+    TvInputHdmi3 = ndk_sys::AKEYCODE_TV_INPUT_HDMI_3,
+    TvInputHdmi4 = ndk_sys::AKEYCODE_TV_INPUT_HDMI_4,
+    TvInputComposite1 = ndk_sys::AKEYCODE_TV_INPUT_COMPOSITE_1,
+    TvInputComposite2 = ndk_sys::AKEYCODE_TV_INPUT_COMPOSITE_2,
+    TvInputComponent1 = ndk_sys::AKEYCODE_TV_INPUT_COMPONENT_1,
+    TvInputComponent2 = ndk_sys::AKEYCODE_TV_INPUT_COMPONENT_2,
+    TvInputVga1 = ndk_sys::AKEYCODE_TV_INPUT_VGA_1,
+    TvAudioDescription = ndk_sys::AKEYCODE_TV_AUDIO_DESCRIPTION,
+    TvAudioDescriptionMixUp = ndk_sys::AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP,
+    TvAudioDescriptionMixDown = ndk_sys::AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN,
+    TvZoomMode = ndk_sys::AKEYCODE_TV_ZOOM_MODE,
+    TvContentsMenu = ndk_sys::AKEYCODE_TV_CONTENTS_MENU,
+    TvMediaContextMenu = ndk_sys::AKEYCODE_TV_MEDIA_CONTEXT_MENU,
+    TvTimerProgramming = ndk_sys::AKEYCODE_TV_TIMER_PROGRAMMING,
+    Help = ndk_sys::AKEYCODE_HELP,
+    NavigatePrevious = ndk_sys::AKEYCODE_NAVIGATE_PREVIOUS,
+    NavigateNext = ndk_sys::AKEYCODE_NAVIGATE_NEXT,
+    NavigateIn = ndk_sys::AKEYCODE_NAVIGATE_IN,
+    NavigateOut = ndk_sys::AKEYCODE_NAVIGATE_OUT,
+    StemPrimary = ndk_sys::AKEYCODE_STEM_PRIMARY,
+    Stem1 = ndk_sys::AKEYCODE_STEM_1,
+    Stem2 = ndk_sys::AKEYCODE_STEM_2,
+    Stem3 = ndk_sys::AKEYCODE_STEM_3,
+    DpadUpLeft = ndk_sys::AKEYCODE_DPAD_UP_LEFT,
+    DpadDownLeft = ndk_sys::AKEYCODE_DPAD_DOWN_LEFT,
+    DpadUpRight = ndk_sys::AKEYCODE_DPAD_UP_RIGHT,
+    DpadDownRight = ndk_sys::AKEYCODE_DPAD_DOWN_RIGHT,
+    MediaSkipForward = ndk_sys::AKEYCODE_MEDIA_SKIP_FORWARD,
+    MediaSkipBackward = ndk_sys::AKEYCODE_MEDIA_SKIP_BACKWARD,
+    MediaStepForward = ndk_sys::AKEYCODE_MEDIA_STEP_FORWARD,
+    MediaStepBackward = ndk_sys::AKEYCODE_MEDIA_STEP_BACKWARD,
+    SoftSleep = ndk_sys::AKEYCODE_SOFT_SLEEP,
+    Cut = ndk_sys::AKEYCODE_CUT,
+    Copy = ndk_sys::AKEYCODE_COPY,
+    Paste = ndk_sys::AKEYCODE_PASTE,
+    SystemNavigationUp = ndk_sys::AKEYCODE_SYSTEM_NAVIGATION_UP,
+    SystemNavigationDown = ndk_sys::AKEYCODE_SYSTEM_NAVIGATION_DOWN,
+    SystemNavigationLeft = ndk_sys::AKEYCODE_SYSTEM_NAVIGATION_LEFT,
+    SystemNavigationRight = ndk_sys::AKEYCODE_SYSTEM_NAVIGATION_RIGHT,
+    AllApps = ndk_sys::AKEYCODE_ALL_APPS,
+    Refresh = ndk_sys::AKEYCODE_REFRESH,
+    ThumbsUp = ndk_sys::AKEYCODE_THUMBS_UP,
+    ThumbsDown = ndk_sys::AKEYCODE_THUMBS_DOWN,
+    ProfileSwitch = ndk_sys::AKEYCODE_PROFILE_SWITCH,
+}
+
+impl From<ndk::event::Keycode> for Keycode {
+    fn from(value: ndk::event::Keycode) -> Self {
+        let inner: u32 = value.into();
+        inner.try_into().unwrap() // TODO: replace with into() when we can bump MSRV to 1.68!
+    }
+}
+
+/// Flags associated with [`KeyEvent`].
+///
+/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-28)
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct KeyEventFlags(pub u32);
+
+impl KeyEventFlags {
+    #[inline]
+    pub fn cancelled(&self) -> bool {
+        self.0 & ndk_sys::AKEY_EVENT_FLAG_CANCELED != 0
+    }
+    #[inline]
+    pub fn cancelled_long_press(&self) -> bool {
+        self.0 & ndk_sys::AKEY_EVENT_FLAG_CANCELED_LONG_PRESS != 0
+    }
+    #[inline]
+    pub fn editor_action(&self) -> bool {
+        self.0 & ndk_sys::AKEY_EVENT_FLAG_EDITOR_ACTION != 0
+    }
+    #[inline]
+    pub fn fallback(&self) -> bool {
+        self.0 & ndk_sys::AKEY_EVENT_FLAG_FALLBACK != 0
+    }
+    #[inline]
+    pub fn from_system(&self) -> bool {
+        self.0 & ndk_sys::AKEY_EVENT_FLAG_FROM_SYSTEM != 0
+    }
+    #[inline]
+    pub fn keep_touch_mode(&self) -> bool {
+        self.0 & ndk_sys::AKEY_EVENT_FLAG_KEEP_TOUCH_MODE != 0
+    }
+    #[inline]
+    pub fn long_press(&self) -> bool {
+        self.0 & ndk_sys::AKEY_EVENT_FLAG_LONG_PRESS != 0
+    }
+    #[inline]
+    pub fn soft_keyboard(&self) -> bool {
+        self.0 & ndk_sys::AKEY_EVENT_FLAG_SOFT_KEYBOARD != 0
+    }
+    #[inline]
+    pub fn tracking(&self) -> bool {
+        self.0 & ndk_sys::AKEY_EVENT_FLAG_TRACKING != 0
+    }
+    #[inline]
+    pub fn virtual_hard_key(&self) -> bool {
+        self.0 & ndk_sys::AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY != 0
+    }
+    #[inline]
+    pub fn woke_here(&self) -> bool {
+        self.0 & ndk_sys::AKEY_EVENT_FLAG_WOKE_HERE != 0
+    }
+}
+
+impl From<ndk::event::KeyEventFlags> for KeyEventFlags {
+    fn from(value: ndk::event::KeyEventFlags) -> Self {
+        Self(value.0)
+    }
+}
+
 /// This struct holds a span within a region of text from `start` to `end`.
 ///
 /// The `start` index may be greater than the `end` index (swapping `start` and `end` will represent the same span)
diff --git a/android-activity/src/input/sdk.rs b/android-activity/src/input/sdk.rs
index 4d1e84b..f03a41b 100644
--- a/android-activity/src/input/sdk.rs
+++ b/android-activity/src/input/sdk.rs
@@ -8,7 +8,7 @@ use jni::{
 use jni_sys::jint;
 
 use crate::{
-    activity_impl::input::{Keycode, MetaState},
+    input::{Keycode, MetaState},
     jni_utils::CloneJavaVM,
 };
 
diff --git a/android-activity/src/native_activity/input.rs b/android-activity/src/native_activity/input.rs
index 2056fe0..ca32b7f 100644
--- a/android-activity/src/native_activity/input.rs
+++ b/android-activity/src/native_activity/input.rs
@@ -1,11 +1,11 @@
 use std::marker::PhantomData;
 
-pub use ndk::event::{
-    Axis, ButtonState, EdgeFlags, KeyAction, KeyEventFlags, Keycode, MetaState, MotionAction,
-    MotionEventFlags, Pointer, PointersIter,
-};
+pub use ndk::event::{Pointer, PointersIter};
 
-use crate::input::{Class, Source};
+use crate::input::{
+    ButtonState, Class, EdgeFlags, KeyAction, Keycode, MetaState, MotionAction, MotionEventFlags,
+    Source,
+};
 
 /// A motion event
 ///
@@ -60,7 +60,7 @@ impl<'a> MotionEvent<'a> {
     /// See [the MotionEvent docs](https://developer.android.com/reference/android/view/MotionEvent#getActionMasked())
     #[inline]
     pub fn action(&self) -> MotionAction {
-        self.ndk_event.action()
+        self.ndk_event.action().into()
     }
 
     /// Returns the pointer index of an `Up` or `Down` event.
@@ -136,7 +136,7 @@ impl<'a> MotionEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getmetastate)
     #[inline]
     pub fn meta_state(&self) -> MetaState {
-        self.ndk_event.meta_state()
+        self.ndk_event.meta_state().into()
     }
 
     /// Returns the button state during this event, as a bitfield.
@@ -145,7 +145,7 @@ impl<'a> MotionEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getbuttonstate)
     #[inline]
     pub fn button_state(&self) -> ButtonState {
-        self.ndk_event.button_state()
+        self.ndk_event.button_state().into()
     }
 
     /// Returns the time of the start of this gesture, in the `java.lang.System.nanoTime()` time
@@ -164,7 +164,7 @@ impl<'a> MotionEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getedgeflags)
     #[inline]
     pub fn edge_flags(&self) -> EdgeFlags {
-        self.ndk_event.edge_flags()
+        self.ndk_event.edge_flags().into()
     }
 
     /// Returns the time of this event, in the `java.lang.System.nanoTime()` time base
@@ -182,7 +182,7 @@ impl<'a> MotionEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getflags)
     #[inline]
     pub fn flags(&self) -> MotionEventFlags {
-        self.ndk_event.flags()
+        self.ndk_event.flags().into()
     }
 
     /* Missing from GameActivity currently...
@@ -277,7 +277,7 @@ impl<'a> KeyEvent<'a> {
     /// See [the KeyEvent docs](https://developer.android.com/reference/android/view/KeyEvent#getAction())
     #[inline]
     pub fn action(&self) -> KeyAction {
-        self.ndk_event.action()
+        self.ndk_event.action().into()
     }
 
     /// Returns the last time the key was pressed.  This is on the scale of
@@ -306,7 +306,7 @@ impl<'a> KeyEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#akeyevent_getkeycode)
     #[inline]
     pub fn key_code(&self) -> Keycode {
-        self.ndk_event.key_code()
+        self.ndk_event.key_code().into()
     }
 
     /// Returns the number of repeats of a key.
@@ -333,7 +333,7 @@ impl<'a> KeyEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#akeyevent_getmetastate)
     #[inline]
     pub fn meta_state(&self) -> MetaState {
-        self.ndk_event.meta_state()
+        self.ndk_event.meta_state().into()
     }
 }
 
diff --git a/android-activity/src/native_activity/mod.rs b/android-activity/src/native_activity/mod.rs
index fee09b9..a18297c 100644
--- a/android-activity/src/native_activity/mod.rs
+++ b/android-activity/src/native_activity/mod.rs
@@ -14,7 +14,7 @@ use ndk::input_queue::InputQueue;
 use ndk::{asset::AssetManager, native_window::NativeWindow};
 
 use crate::error::{InternalAppError, InternalResult};
-use crate::input::{KeyCharacterMap, KeyCharacterMapBinding};
+use crate::input::{Axis, KeyCharacterMap, KeyCharacterMapBinding};
 use crate::input::{TextInputState, TextSpan};
 use crate::jni_utils::{self, CloneJavaVM};
 use crate::{
@@ -410,11 +410,11 @@ impl AndroidAppInner {
         Ok(key_map)
     }
 
-    pub fn enable_motion_axis(&self, _axis: input::Axis) {
+    pub fn enable_motion_axis(&self, _axis: Axis) {
         // NOP - The InputQueue API doesn't let us optimize which axis values are read
     }
 
-    pub fn disable_motion_axis(&self, _axis: input::Axis) {
+    pub fn disable_motion_axis(&self, _axis: Axis) {
         // NOP - The InputQueue API doesn't let us optimize which axis values are read
     }
 

From e2f69421a0667f88b9943a86cb8465e22903ffa2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Aug 2023 15:13:55 +0000
Subject: [PATCH 30/93] build(deps): update num_enum requirement from 0.6 to
 0.7

Updates the requirements on [num_enum](https://github.com/illicitonion/num_enum) to permit the latest version.
- [Commits](https://github.com/illicitonion/num_enum/commits)

---
updated-dependencies:
- dependency-name: num_enum
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 android-activity/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 9233f4c..a9abcde 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -43,7 +43,7 @@ ndk = "0.7"
 ndk-sys = "0.4"
 ndk-context = "0.1"
 android-properties = "0.2"
-num_enum = "0.6"
+num_enum = "0.7"
 bitflags = "2.0"
 libc = "0.2"
 thiserror = "1"

From 35fe600235bf8f3f9dc58f338267c006675e1d98 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Tue, 15 Aug 2023 18:51:22 +0100
Subject: [PATCH 31/93] native-activity: don't treat missing input queue as
 error

If an app tries to iterate input events while there's no input queue
(e.g. before onStart) then just behave like there are no events
available instead of returning an error.

This also reduces the logging level of some messages to reduce the
verbosity of info logs.
---
 android-activity/src/native_activity/mod.rs | 36 ++++++++++++---------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/android-activity/src/native_activity/mod.rs b/android-activity/src/native_activity/mod.rs
index a18297c..45da83e 100644
--- a/android-activity/src/native_activity/mod.rs
+++ b/android-activity/src/native_activity/mod.rs
@@ -13,7 +13,7 @@ use log::{error, trace};
 use ndk::input_queue::InputQueue;
 use ndk::{asset::AssetManager, native_window::NativeWindow};
 
-use crate::error::{InternalAppError, InternalResult};
+use crate::error::InternalResult;
 use crate::input::{Axis, KeyCharacterMap, KeyCharacterMapBinding};
 use crate::input::{TextInputState, TextSpan};
 use crate::jni_utils::{self, CloneJavaVM};
@@ -434,11 +434,10 @@ impl AndroidAppInner {
         let queue = self
             .native_activity
             .looper_attached_input_queue(self.looper(), LOOPER_ID_INPUT);
-        let queue = match queue {
-            Some(queue) => queue,
-            None => return Err(InternalAppError::InputUnavailable),
-        };
 
+        // Note: we don't treat it as an error if there is no queue, so if applications
+        // iterate input before a queue has been created (e.g. before onStart) then
+        // it will simply behave like there are no events available currently.
         let receiver = Arc::new(InputReceiver { queue });
 
         *guard = Some(Arc::downgrade(&receiver));
@@ -463,7 +462,7 @@ impl AndroidAppInner {
 
 #[derive(Debug)]
 pub(crate) struct InputReceiver {
-    queue: InputQueue,
+    queue: Option<InputQueue>,
 }
 
 impl<'a> From<Arc<InputReceiver>> for InputIteratorInner<'a> {
@@ -486,6 +485,15 @@ impl<'a> InputIteratorInner<'a> {
     where
         F: FnOnce(&input::InputEvent) -> InputStatus,
     {
+        // XXX: would use `let Some(queue) = &self.receiver.queue else { return
+        // false; }` but we're stuck supporting Rust 1.64 for Winit currently
+        let queue = if let Some(queue) = &self.receiver.queue {
+            queue
+        } else {
+            log::trace!("no queue available for events");
+            return false;
+        };
+
         // Note: we basically ignore errors from get_event() currently. Looking
         // at the source code for Android's InputQueue, the only error that
         // can be returned here is 'WOULD_BLOCK', which we want to just treat as
@@ -493,10 +501,10 @@ impl<'a> InputIteratorInner<'a> {
         //
         // ref: https://github.com/aosp-mirror/platform_frameworks_base/blob/master/core/jni/android_view_InputQueue.cpp
         //
-        if let Ok(Some(ndk_event)) = self.receiver.queue.get_event() {
-            log::info!("queue: got event: {ndk_event:?}");
+        if let Ok(Some(ndk_event)) = queue.get_event() {
+            log::trace!("queue: got event: {ndk_event:?}");
 
-            if let Some(ndk_event) = self.receiver.queue.pre_dispatch(ndk_event) {
+            if let Some(ndk_event) = queue.pre_dispatch(ndk_event) {
                 let event = match ndk_event {
                     ndk::event::InputEvent::MotionEvent(e) => {
                         input::InputEvent::MotionEvent(input::MotionEvent::new(e))
@@ -524,20 +532,18 @@ impl<'a> InputIteratorInner<'a> {
                     Ok(handled) => handled,
                     Err(payload) => {
                         log::error!("Calling `finish_event` after panic in input event handler, to try and avoid being killed via an ANR");
-                        self.receiver.queue.finish_event(ndk_event, false);
+                        queue.finish_event(ndk_event, false);
                         std::panic::resume_unwind(payload);
                     }
                 };
 
-                log::info!("queue: finishing event");
-                self.receiver
-                    .queue
-                    .finish_event(ndk_event, handled == InputStatus::Handled);
+                log::trace!("queue: finishing event");
+                queue.finish_event(ndk_event, handled == InputStatus::Handled);
             }
 
             true
         } else {
-            log::info!("queue: no more events");
+            log::trace!("queue: no more events");
             false
         }
     }

From 2a61f84c700048e3308ec285d4c17a52743f362d Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Tue, 15 Aug 2023 18:57:10 +0100
Subject: [PATCH 32/93] Remove examples/agdk-mainloop/.idea

---
 examples/agdk-mainloop/.idea/misc.xml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 examples/agdk-mainloop/.idea/misc.xml

diff --git a/examples/agdk-mainloop/.idea/misc.xml b/examples/agdk-mainloop/.idea/misc.xml
deleted file mode 100644
index fb0d77e..0000000
--- a/examples/agdk-mainloop/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-</project>
\ No newline at end of file

From e91176cb08fc863dc7908bf270befe8843fd9b38 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Tue, 15 Aug 2023 18:56:15 +0100
Subject: [PATCH 33/93] CI: assume NDK + Java in official Ubuntu images

---
 .github/workflows/ci.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dc71ede..336a9bb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -40,15 +40,6 @@ jobs:
         # currently requires this crate to be buildable with 1.64
         run: cargo install cargo-ndk --version "^2"
 
-      - name: Setup Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-
       - name: Build game-activity
         working-directory: android-activity
         run: >

From c9f57a734f87556e19742f8c8123c28184303594 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Tue, 15 Aug 2023 19:29:37 +0100
Subject: [PATCH 34/93] Release 0.5.0-beta.0

---
 android-activity/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index a9abcde..4258717 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "android-activity"
-version = "0.4.3"
+version = "0.5.0-beta.0"
 edition = "2021"
 keywords = ["android", "ndk"]
 readme = "../README.md"

From 499d09595b6ff41d00dd35afae8c04acc4dfccc6 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Sat, 24 Jun 2023 00:45:43 +0200
Subject: [PATCH 35/93] Upgrade to `ndk-sys 0.5.0-beta.0`, `ndk-0.8.0 beta.0`

---
 Cargo.toml                                   |  8 ++------
 android-activity/Cargo.toml                  |  4 ++--
 android-activity/src/lib.rs                  |  4 ++--
 android-activity/src/native_activity/glue.rs | 13 ++++++-------
 android-activity/src/native_activity/mod.rs  |  6 +++---
 examples/agdk-mainloop/Cargo.toml            |  4 ++--
 examples/na-mainloop/Cargo.toml              |  6 +++---
 7 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index fc8008d..95c8a86 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,4 @@
 [workspace]
-members = [
-    "android-activity"
-]
+members = ["android-activity"]
 
-exclude = [
-    "examples",
-]
+exclude = ["examples"]
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index a9abcde..bb5310f 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -39,8 +39,8 @@ log = "0.4"
 jni-sys = "0.3"
 cesu8 = "1"
 jni = "0.21"
-ndk = "0.7"
-ndk-sys = "0.4"
+ndk-sys = "0.5.0-beta.0"
+ndk = "0.8.0-beta.0"
 ndk-context = "0.1"
 android-properties = "0.2"
 num_enum = "0.7"
diff --git a/android-activity/src/lib.rs b/android-activity/src/lib.rs
index 8b9c46e..cbbe7d2 100644
--- a/android-activity/src/lib.rs
+++ b/android-activity/src/lib.rs
@@ -537,14 +537,14 @@ impl AndroidApp {
     /// [`ALooper_pollAll`]: ndk::looper::ThreadLooper::poll_all
     pub fn poll_events<F>(&self, timeout: Option<Duration>, callback: F)
     where
-        F: FnMut(PollEvent),
+        F: FnMut(PollEvent<'_>),
     {
         self.inner.read().unwrap().poll_events(timeout, callback);
     }
 
     /// Creates a means to wake up the main loop while it is blocked waiting for
     /// events within [`AndroidApp::poll_events()`].
-    pub fn create_waker(&self) -> activity_impl::AndroidAppWaker {
+    pub fn create_waker(&self) -> AndroidAppWaker {
         self.inner.read().unwrap().create_waker()
     }
 
diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index 495c813..d26af76 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -216,7 +216,7 @@ pub enum NativeThreadState {
 pub struct NativeActivityState {
     pub msg_read: libc::c_int,
     pub msg_write: libc::c_int,
-    pub config: super::ConfigurationRef,
+    pub config: ConfigurationRef,
     pub saved_state: Vec<u8>,
     pub input_queue: *mut ndk_sys::AInputQueue,
     pub window: Option<NativeWindow>,
@@ -343,9 +343,8 @@ impl WaitableNativeActivityState {
             }
         }
 
-        let saved_state = unsafe {
-            std::slice::from_raw_parts(saved_state_in as *const u8, saved_state_size as _)
-        };
+        let saved_state =
+            unsafe { std::slice::from_raw_parts(saved_state_in as *const u8, saved_state_size) };
 
         let config = unsafe {
             let config = ndk_sys::AConfiguration_new();
@@ -517,7 +516,7 @@ impl WaitableNativeActivityState {
         // given via a `malloc()` allocated pointer since it will automatically
         // `free()` the state after it has been converted to a buffer for the JVM.
         if !guard.saved_state.is_empty() {
-            let saved_state_size = guard.saved_state.len() as _;
+            let saved_state_size = guard.saved_state.len();
             let saved_state_src_ptr = guard.saved_state.as_ptr();
             unsafe {
                 let saved_state = libc::malloc(saved_state_size);
@@ -681,7 +680,7 @@ unsafe extern "C" fn on_resume(activity: *mut ndk_sys::ANativeActivity) {
 
 unsafe extern "C" fn on_save_instance_state(
     activity: *mut ndk_sys::ANativeActivity,
-    out_len: *mut ndk_sys::size_t,
+    out_len: *mut usize,
 ) -> *mut libc::c_void {
     abort_on_panic(|| {
         log::debug!("SaveInstanceState: {:p}\n", activity);
@@ -689,7 +688,7 @@ unsafe extern "C" fn on_save_instance_state(
         let mut ret = ptr::null_mut();
         try_with_waitable_activity_ref(activity, |waitable_activity| {
             let (state, len) = waitable_activity.request_save_state();
-            *out_len = len as ndk_sys::size_t;
+            *out_len = len;
             ret = state
         });
 
diff --git a/android-activity/src/native_activity/mod.rs b/android-activity/src/native_activity/mod.rs
index 45da83e..f5c5cc1 100644
--- a/android-activity/src/native_activity/mod.rs
+++ b/android-activity/src/native_activity/mod.rs
@@ -185,14 +185,14 @@ impl AndroidAppInner {
 
     pub fn poll_events<F>(&self, timeout: Option<Duration>, mut callback: F)
     where
-        F: FnMut(PollEvent),
+        F: FnMut(PollEvent<'_>),
     {
         trace!("poll_events");
 
         unsafe {
             let mut fd: i32 = 0;
             let mut events: i32 = 0;
-            let mut source: *mut core::ffi::c_void = ptr::null_mut();
+            let mut source: *mut c_void = ptr::null_mut();
 
             let timeout_milliseconds = if let Some(timeout) = timeout {
                 timeout.as_millis() as i32
@@ -209,7 +209,7 @@ impl AndroidAppInner {
                 timeout_milliseconds,
                 &mut fd,
                 &mut events,
-                &mut source as *mut *mut core::ffi::c_void,
+                &mut source as *mut *mut c_void,
             );
             trace!("pollAll id = {id}");
             match id {
diff --git a/examples/agdk-mainloop/Cargo.toml b/examples/agdk-mainloop/Cargo.toml
index 536146f..acb84a9 100644
--- a/examples/agdk-mainloop/Cargo.toml
+++ b/examples/agdk-mainloop/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2021"
 log = "0.4"
 android_logger = "0.11.0"
 android-activity = { path="../../android-activity", features = ["game-activity"] }
-ndk-sys = "0.4"
-ndk = "0.7"
+ndk-sys = "0.5.0-beta.0"
+ndk = "0.8.0-beta.0"
 
 [lib]
 name="main"
diff --git a/examples/na-mainloop/Cargo.toml b/examples/na-mainloop/Cargo.toml
index 93da1d9..2014401 100644
--- a/examples/na-mainloop/Cargo.toml
+++ b/examples/na-mainloop/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2021"
 log = "0.4"
 android_logger = "0.11.0"
 android-activity = { path="../../android-activity", features = [ "native-activity" ] }
-ndk-sys = "0.4"
-ndk = "0.7"
+ndk-sys = "0.5.0-beta.0"
+ndk = "0.8.0-beta.0"
 
 [lib]
 #name="na_mainloop"
@@ -181,4 +181,4 @@ label = "Application Name"
 #port = "8080"
 #path = "/rust-windowing/android-ndk-rs/tree/master/cargo-apk"
 #path_prefix = "/rust-windowing/"
-#mime_type = "image/jpeg"
\ No newline at end of file
+#mime_type = "image/jpeg"

From 75e9e8672d22e968dc9a9ee54d57dcca3660ebb1 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Tue, 15 Aug 2023 21:46:05 +0100
Subject: [PATCH 36/93] Release 0.5.0-beta.1

---
 android-activity/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index e41bc86..2fd1371 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "android-activity"
-version = "0.5.0-beta.0"
+version = "0.5.0-beta.1"
 edition = "2021"
 keywords = ["android", "ndk"]
 readme = "../README.md"

From 4f6d7d68de87ef94f53c2c9cd01f54bf3343449b Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Tue, 15 Aug 2023 22:36:28 +0100
Subject: [PATCH 37/93] CHANGELOG fixups

Some of the dates were wrong from copy&pasting, there was no changelog
entry for adding `InputEvent::TextEvent`, and the release date for
0.5.0-beta.0/1 was missing.
---
 android-activity/CHANGELOG.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/android-activity/CHANGELOG.md b/android-activity/CHANGELOG.md
index dd66796..5a636f2 100644
--- a/android-activity/CHANGELOG.md
+++ b/android-activity/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.0-beta.1] - 2023-08-15
+### Changed
+- Pulled in `ndk-sys 0.5.0-beta.0` and `ndk 0.8.0-beta.0` ([#113](https://github.com/rust-mobile/android-activity/pull/113))
+
+## [0.5.0-beta.0] - 2023-08-15
+
 ### Added
 - Added `KeyEvent::meta_state()` for being able to query the state of meta keys, needed for character mapping ([#102](https://github.com/rust-mobile/android-activity/pull/102))
 - Added `KeyCharacterMap` JNI bindings to the corresponding Android SDK API ([#102](https://github.com/rust-mobile/android-activity/pull/102))
@@ -63,6 +69,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     ```
 
     </details>
+- Added `TextEvent` Input Method event for supporting text editing via virtual keyboards ([#24](https://github.com/rust-mobile/android-activity/pull/24))
 
 ### Changed
 - GameActivity updated to 2.0.2 (requires the corresponding 2.0.2 `.aar` release from Google) ([#88](https://github.com/rust-mobile/android-activity/pull/88))
@@ -104,19 +111,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
     </details>
 
-## [0.4.3] - 2022-07-30
+## [0.4.3] - 2023-07-30
 ### Fixed
 - Fixed a deadlock in the `native-activity` backend while waiting for the native thread after getting an `onDestroy` callback from Java ([#94](https://github.com/rust-mobile/android-activity/pull/94))
 - Fixed numerous deadlocks in the `game-activity` backend with how it would wait for the native thread in various Java callbacks, after the app has returned from `android_main` ([#98](https://github.com/rust-mobile/android-activity/pull/98))
 
-## [0.4.2] - 2022-06-17
+## [0.4.2] - 2023-06-17
 ### Changed
 - The `Activity.finish()` method is now called when `android_main` returns so the `Activity` will be destroyed ([#67](https://github.com/rust-mobile/android-activity/issues/67))
 - The `native-activity` backend now propagates `NativeWindow` redraw/resize and `ContentRectChanged` callbacks to main loop ([#70](https://github.com/rust-mobile/android-activity/pull/70))
 - The `game-activity` implementation of `pointer_index()` was fixed to not always return `0` ([#80](https://github.com/rust-mobile/android-activity/pull/84))
 - Added `panic` guards around application's `android_main()` and native code that could potentially unwind across a Java FFI boundary ([#68](https://github.com/rust-mobile/android-activity/pull/68))
 
-## [0.4.1] - 2022-02-16
+## [0.4.1] - 2023-02-16
 ### Added
 - Added `AndroidApp::vm_as_ptr()` to expose JNI `JavaVM` pointer ([#60](https://github.com/rust-mobile/android-activity/issues/60))
 - Added `AndroidApp::activity_as_ptr()` to expose Android `Activity` JNI reference as pointer ([#60](https://github.com/rust-mobile/android-activity/issues/60))

From 942053d88e251b56b9e248e2cacef1790d52186e Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Thu, 3 Aug 2023 17:01:27 +0100
Subject: [PATCH 38/93] Bump MSRV to 1.68

- Lets us build with cargo ndk 3+
- Lets us remove suppression for false-negative clippy warning about unsafe
  blocks in unsafe functions

- 1.68.0 notably also builds the standard library with a newer r25 NDK
  toolchain which avoid the need for awkward libgcc workarounds, so it's
  anyway a desirable baseline for Android projects.
---
 .github/workflows/ci.yml                     | 10 +++-------
 android-activity/Cargo.toml                  | 16 +++++-----------
 android-activity/src/game_activity/mod.rs    |  1 -
 android-activity/src/native_activity/glue.rs |  1 -
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 336a9bb..0bed57a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,9 +16,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # XXX: We are currently constrained by Winit's MSRV policy + CI system
-        # See Cargo.toml for details
-        rust_version: [1.64.0, stable]
+        # See top README for MSRV policy
+        rust_version: [1.68.0, stable]
     steps:
       - uses: actions/checkout@v3
 
@@ -35,10 +34,7 @@ jobs:
           i686-linux-android
 
       - name: Install cargo-ndk
-        # XXX: We have to use an old version of cargo-ndk that supports the
-        # libgcc linker workaround for rust < 1.68 because Winit's CI system
-        # currently requires this crate to be buildable with 1.64
-        run: cargo install cargo-ndk --version "^2"
+        run: cargo install cargo-ndk
 
       - name: Build game-activity
         working-directory: android-activity
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 2fd1371..d95e1c6 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -10,18 +10,12 @@ documentation = "https://docs.rs/android-activity"
 description = "Glue for building Rust applications on Android with NativeActivity or GameActivity"
 license = "MIT OR Apache-2.0"
 
-# XXX: Even though we have our own MSRV policy that says we only promise to
-# support stable releases over the last three months we actually end up
-# constrained by the MSRV policy of Winit, which is currently based on
-# supporting Alacritty on Debian Sid, and requires a > 10 month old Rust version
+# 1.68 was when Rust last updated the Android NDK version used to build the
+# standard library which avoids needing the -lunwind workaround in build tools.
 #
-# This Winit policiy is unfortunately in conflict with what makes sense for
-# Android because versions below 1.68 for Android requires awkward toolchain
-# linker workarounds, and can't even be compiled with newer versions of
-# `cargo ndk` that removed these linker workarounds.
-#
-# TODO: Open a PR for Winit's CI to test Android builds using a newer toolchain.
-rust-version = "1.64"
+# We depend on cargo-ndk for building which has dropped support for the above
+# linker workaround.
+rust-version = "1.68.0"
 
 [features]
 # Note: we don't enable any backend by default since features
diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index 02b3e37..ef487fa 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -909,7 +909,6 @@ extern "Rust" {
 // `app_main` function. This is run on a dedicated thread spawned
 // by android_native_app_glue.
 #[no_mangle]
-#[allow(unused_unsafe)] // Otherwise rust 1.64 moans about using unsafe{} in unsafe functions
 pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
     abort_on_panic(|| {
         // Maybe make this stdout/stderr redirection an optional / opt-in feature?...
diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index d26af76..679cd13 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -828,7 +828,6 @@ unsafe extern "C" fn on_content_rect_changed(
 
 /// This is the native entrypoint for our cdylib library that `ANativeActivity` will look for via `dlsym`
 #[no_mangle]
-#[allow(unused_unsafe)] // Otherwise rust 1.64 moans about using unsafe{} in unsafe functions
 extern "C" fn ANativeActivity_onCreate(
     activity: *mut ndk_sys::ANativeActivity,
     saved_state: *const libc::c_void,

From 0eefd623ed8d997ab1b506258a986c199fe93ba0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 18:36:49 +0000
Subject: [PATCH 39/93] build(deps): bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0bed57a..f7d73da 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
         # See top README for MSRV policy
         rust_version: [1.68.0, stable]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: hecrj/setup-rust-action@v1
         with:
@@ -85,7 +85,7 @@ jobs:
   format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions-rs/toolchain@v1
         with:

From 9930b9bf90a9fd547aaf71e5f78a98e13c2a4439 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 26 Sep 2023 08:26:20 +0200
Subject: [PATCH 40/93] Avoid exposing Pointer and PointersIter from ndk

---
 android-activity/src/game_activity/input.rs   |  75 +++----------
 android-activity/src/input.rs                 | 106 ++++++++++++++++++
 android-activity/src/native_activity/input.rs |  84 +++++++++++++-
 3 files changed, 202 insertions(+), 63 deletions(-)

diff --git a/android-activity/src/game_activity/input.rs b/android-activity/src/game_activity/input.rs
index b5d5407..957e24b 100644
--- a/android-activity/src/game_activity/input.rs
+++ b/android-activity/src/game_activity/input.rs
@@ -18,7 +18,7 @@ use std::convert::TryInto;
 use crate::activity_impl::ffi::{GameActivityKeyEvent, GameActivityMotionEvent};
 use crate::input::{
     Axis, ButtonState, Class, EdgeFlags, KeyAction, KeyEventFlags, Keycode, MetaState,
-    MotionAction, MotionEventFlags, Source, ToolType,
+    MotionAction, MotionEventFlags, Pointer, PointersIter, Source, ToolType,
 };
 
 // Note: try to keep this wrapper API compatible with the AInputEvent API if possible
@@ -116,9 +116,11 @@ impl<'a> MotionEvent<'a> {
     #[inline]
     pub fn pointers(&self) -> PointersIter<'_> {
         PointersIter {
-            event: self,
-            next_index: 0,
-            count: self.pointer_count(),
+            inner: PointersIterImpl {
+                event: self,
+                next_index: 0,
+                count: self.pointer_count(),
+            },
         }
     }
 
@@ -130,7 +132,9 @@ impl<'a> MotionEvent<'a> {
         if index >= self.pointer_count() {
             panic!("Pointer index {} is out of bounds", index);
         }
-        Pointer { event: self, index }
+        Pointer {
+            inner: PointerImpl { event: self, index },
+        }
     }
 
     /*
@@ -251,12 +255,12 @@ impl<'a> MotionEvent<'a> {
 
 /// A view into the data of a specific pointer in a motion event.
 #[derive(Debug)]
-pub struct Pointer<'a> {
+pub(crate) struct PointerImpl<'a> {
     event: &'a MotionEvent<'a>,
     index: usize,
 }
 
-impl<'a> Pointer<'a> {
+impl<'a> PointerImpl<'a> {
     #[inline]
     pub fn pointer_index(&self) -> usize {
         self.index
@@ -274,16 +278,6 @@ impl<'a> Pointer<'a> {
         pointer.axisValues[axis as u32 as usize]
     }
 
-    #[inline]
-    pub fn orientation(&self) -> f32 {
-        self.axis_value(Axis::Orientation)
-    }
-
-    #[inline]
-    pub fn pressure(&self) -> f32 {
-        self.axis_value(Axis::Pressure)
-    }
-
     #[inline]
     pub fn raw_x(&self) -> f32 {
         let pointer = &self.event.ga_event.pointers[self.index];
@@ -296,41 +290,6 @@ impl<'a> Pointer<'a> {
         pointer.rawY
     }
 
-    #[inline]
-    pub fn x(&self) -> f32 {
-        self.axis_value(Axis::X)
-    }
-
-    #[inline]
-    pub fn y(&self) -> f32 {
-        self.axis_value(Axis::Y)
-    }
-
-    #[inline]
-    pub fn size(&self) -> f32 {
-        self.axis_value(Axis::Size)
-    }
-
-    #[inline]
-    pub fn tool_major(&self) -> f32 {
-        self.axis_value(Axis::ToolMajor)
-    }
-
-    #[inline]
-    pub fn tool_minor(&self) -> f32 {
-        self.axis_value(Axis::ToolMinor)
-    }
-
-    #[inline]
-    pub fn touch_major(&self) -> f32 {
-        self.axis_value(Axis::TouchMajor)
-    }
-
-    #[inline]
-    pub fn touch_minor(&self) -> f32 {
-        self.axis_value(Axis::TouchMinor)
-    }
-
     #[inline]
     pub fn tool_type(&self) -> ToolType {
         let pointer = &self.event.ga_event.pointers[self.index];
@@ -341,19 +300,21 @@ impl<'a> Pointer<'a> {
 
 /// An iterator over the pointers in a [`MotionEvent`].
 #[derive(Debug)]
-pub struct PointersIter<'a> {
+pub(crate) struct PointersIterImpl<'a> {
     event: &'a MotionEvent<'a>,
     next_index: usize,
     count: usize,
 }
 
-impl<'a> Iterator for PointersIter<'a> {
+impl<'a> Iterator for PointersIterImpl<'a> {
     type Item = Pointer<'a>;
     fn next(&mut self) -> Option<Pointer<'a>> {
         if self.next_index < self.count {
             let ptr = Pointer {
-                event: self.event,
-                index: self.next_index,
+                inner: PointerImpl {
+                    event: self.event,
+                    index: self.next_index,
+                },
             };
             self.next_index += 1;
             Some(ptr)
@@ -368,7 +329,7 @@ impl<'a> Iterator for PointersIter<'a> {
     }
 }
 
-impl<'a> ExactSizeIterator for PointersIter<'a> {
+impl<'a> ExactSizeIterator for PointersIterImpl<'a> {
     fn len(&self) -> usize {
         self.count - self.next_index
     }
diff --git a/android-activity/src/input.rs b/android-activity/src/input.rs
index 743244f..55390f8 100644
--- a/android-activity/src/input.rs
+++ b/android-activity/src/input.rs
@@ -816,3 +816,109 @@ impl<'a> InputIterator<'a> {
         self.inner.next(callback)
     }
 }
+
+/// A view into the data of a specific pointer in a motion event.
+#[derive(Debug)]
+pub struct Pointer<'a> {
+    pub(crate) inner: PointerImpl<'a>,
+}
+
+impl<'a> Pointer<'a> {
+    #[inline]
+    pub fn pointer_index(&self) -> usize {
+        self.inner.pointer_index()
+    }
+
+    #[inline]
+    pub fn pointer_id(&self) -> i32 {
+        self.inner.pointer_id()
+    }
+
+    #[inline]
+    pub fn axis_value(&self, axis: Axis) -> f32 {
+        self.inner.axis_value(axis)
+    }
+
+    #[inline]
+    pub fn orientation(&self) -> f32 {
+        self.axis_value(Axis::Orientation)
+    }
+
+    #[inline]
+    pub fn pressure(&self) -> f32 {
+        self.axis_value(Axis::Pressure)
+    }
+
+    #[inline]
+    pub fn raw_x(&self) -> f32 {
+        self.inner.raw_x()
+    }
+
+    #[inline]
+    pub fn raw_y(&self) -> f32 {
+        self.inner.raw_y()
+    }
+
+    #[inline]
+    pub fn x(&self) -> f32 {
+        self.axis_value(Axis::X)
+    }
+
+    #[inline]
+    pub fn y(&self) -> f32 {
+        self.axis_value(Axis::Y)
+    }
+
+    #[inline]
+    pub fn size(&self) -> f32 {
+        self.axis_value(Axis::Size)
+    }
+
+    #[inline]
+    pub fn tool_major(&self) -> f32 {
+        self.axis_value(Axis::ToolMajor)
+    }
+
+    #[inline]
+    pub fn tool_minor(&self) -> f32 {
+        self.axis_value(Axis::ToolMinor)
+    }
+
+    #[inline]
+    pub fn touch_major(&self) -> f32 {
+        self.axis_value(Axis::TouchMajor)
+    }
+
+    #[inline]
+    pub fn touch_minor(&self) -> f32 {
+        self.axis_value(Axis::TouchMinor)
+    }
+
+    #[inline]
+    pub fn tool_type(&self) -> ToolType {
+        self.inner.tool_type()
+    }
+}
+
+/// An iterator over the pointers in a [`MotionEvent`].
+#[derive(Debug)]
+pub struct PointersIter<'a> {
+    pub(crate) inner: PointersIterImpl<'a>,
+}
+
+impl<'a> Iterator for PointersIter<'a> {
+    type Item = Pointer<'a>;
+    fn next(&mut self) -> Option<Pointer<'a>> {
+        self.inner.next()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.inner.size_hint()
+    }
+}
+
+impl<'a> ExactSizeIterator for PointersIter<'a> {
+    fn len(&self) -> usize {
+        self.inner.len()
+    }
+}
diff --git a/android-activity/src/native_activity/input.rs b/android-activity/src/native_activity/input.rs
index ca32b7f..8a2d0b2 100644
--- a/android-activity/src/native_activity/input.rs
+++ b/android-activity/src/native_activity/input.rs
@@ -1,10 +1,8 @@
 use std::marker::PhantomData;
 
-pub use ndk::event::{Pointer, PointersIter};
-
 use crate::input::{
-    ButtonState, Class, EdgeFlags, KeyAction, Keycode, MetaState, MotionAction, MotionEventFlags,
-    Source,
+    Axis, ButtonState, Class, EdgeFlags, KeyAction, Keycode, MetaState, MotionAction,
+    MotionEventFlags, Pointer, PointersIter, Source, ToolType,
 };
 
 /// A motion event
@@ -99,7 +97,11 @@ impl<'a> MotionEvent<'a> {
     /// An iterator over the pointers in this motion event
     #[inline]
     pub fn pointers(&self) -> PointersIter<'_> {
-        self.ndk_event.pointers()
+        PointersIter {
+            inner: PointersIterImpl {
+                ndk_pointers_iter: self.ndk_event.pointers(),
+            },
+        }
     }
 
     /// The pointer at a given pointer index. Panics if the pointer index is out of bounds.
@@ -107,7 +109,11 @@ impl<'a> MotionEvent<'a> {
     /// If you need to loop over all the pointers, prefer the [`pointers()`](Self::pointers) method.
     #[inline]
     pub fn pointer_at_index(&self, index: usize) -> Pointer<'_> {
-        self.ndk_event.pointer_at_index(index)
+        Pointer {
+            inner: PointerImpl {
+                ndk_pointer: self.ndk_event.pointer_at_index(index),
+            },
+        }
     }
 
     /*
@@ -224,6 +230,72 @@ impl<'a> MotionEvent<'a> {
     }
 }
 
+/// A view into the data of a specific pointer in a motion event.
+#[derive(Debug)]
+pub(crate) struct PointerImpl<'a> {
+    ndk_pointer: ndk::event::Pointer<'a>,
+}
+
+impl<'a> PointerImpl<'a> {
+    #[inline]
+    pub fn pointer_index(&self) -> usize {
+        self.ndk_pointer.pointer_index()
+    }
+
+    #[inline]
+    pub fn pointer_id(&self) -> i32 {
+        self.ndk_pointer.pointer_id()
+    }
+
+    #[inline]
+    pub fn axis_value(&self, axis: Axis) -> f32 {
+        let value: u32 = axis.into();
+        let ndk_axis = value.try_into().unwrap();
+        self.ndk_pointer.axis_value(ndk_axis)
+    }
+
+    #[inline]
+    pub fn raw_x(&self) -> f32 {
+        self.ndk_pointer.raw_x()
+    }
+
+    #[inline]
+    pub fn raw_y(&self) -> f32 {
+        self.ndk_pointer.raw_y()
+    }
+
+    #[inline]
+    pub fn tool_type(&self) -> ToolType {
+        let value: u32 = self.ndk_pointer.tool_type().into();
+        value.try_into().unwrap()
+    }
+}
+
+/// An iterator over the pointers in a [`MotionEvent`].
+#[derive(Debug)]
+pub(crate) struct PointersIterImpl<'a> {
+    ndk_pointers_iter: ndk::event::PointersIter<'a>,
+}
+
+impl<'a> Iterator for PointersIterImpl<'a> {
+    type Item = Pointer<'a>;
+    fn next(&mut self) -> Option<Pointer<'a>> {
+        self.ndk_pointers_iter.next().map(|ndk_pointer| Pointer {
+            inner: PointerImpl { ndk_pointer },
+        })
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.ndk_pointers_iter.size_hint()
+    }
+}
+
+impl<'a> ExactSizeIterator for PointersIterImpl<'a> {
+    fn len(&self) -> usize {
+        self.ndk_pointers_iter.len()
+    }
+}
+
 /// A key event
 ///
 /// For general discussion of key events in Android, see [the relevant

From f2132c4dab73fae743b50e2ed3ae6f5854753936 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 26 Sep 2023 08:48:19 +0200
Subject: [PATCH 41/93] Enable CI on all branches

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0bed57a..d8a5401 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: ci
 
 on:
   push:
-    branches: [main]
+    branches: '*'
   pull_request:
 
 env:

From 2ecaab9f15fd3334a2d3ca90fa31073b3014d3b7 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Sun, 15 Oct 2023 01:10:11 +0200
Subject: [PATCH 42/93] Upgrade to stable `ndk 0.8` and `ndk-sys 0.5` releases

---
 android-activity/Cargo.toml                  | 4 ++--
 android-activity/src/native_activity/glue.rs | 2 +-
 android-activity/src/native_activity/mod.rs  | 9 ++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index d95e1c6..8b8aa9b 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -33,8 +33,8 @@ log = "0.4"
 jni-sys = "0.3"
 cesu8 = "1"
 jni = "0.21"
-ndk-sys = "0.5.0-beta.0"
-ndk = "0.8.0-beta.0"
+ndk-sys = "0.5.0"
+ndk = "0.8.0"
 ndk-context = "0.1"
 android-properties = "0.2"
 num_enum = "0.7"
diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index 679cd13..d7014d1 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -909,7 +909,7 @@ extern "C" fn ANativeActivity_onCreate(
                     // code to look up non-standard Java classes.
                     android_main(app);
                 })
-                .unwrap_or_else(|panic| log_panic(panic));
+                .unwrap_or_else(log_panic);
 
                 // Let JVM know that our Activity can be destroyed before detaching from the JVM
                 //
diff --git a/android-activity/src/native_activity/mod.rs b/android-activity/src/native_activity/mod.rs
index f5c5cc1..7776e3b 100644
--- a/android-activity/src/native_activity/mod.rs
+++ b/android-activity/src/native_activity/mod.rs
@@ -494,14 +494,13 @@ impl<'a> InputIteratorInner<'a> {
             return false;
         };
 
-        // Note: we basically ignore errors from get_event() currently. Looking
-        // at the source code for Android's InputQueue, the only error that
-        // can be returned here is 'WOULD_BLOCK', which we want to just treat as
-        // meaning the queue is empty.
+        // Note: we basically ignore errors from event() currently. Looking at the source code for
+        // Android's InputQueue, the only error that can be returned here is 'WOULD_BLOCK', which we
+        // want to just treat as meaning the queue is empty.
         //
         // ref: https://github.com/aosp-mirror/platform_frameworks_base/blob/master/core/jni/android_view_InputQueue.cpp
         //
-        if let Ok(Some(ndk_event)) = queue.get_event() {
+        if let Ok(Some(ndk_event)) = queue.event() {
             log::trace!("queue: got event: {ndk_event:?}");
 
             if let Some(ndk_event) = queue.pre_dispatch(ndk_event) {

From ce4413b2c6e16e5ce6123f7276b14bfb8bd450bc Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Wed, 16 Aug 2023 00:59:59 +0200
Subject: [PATCH 43/93] Close `logpipe` input file descriptor after `dup2()`

When the input file descriptor of the `pipe()` is `dup2()`'d into
`stdin` and `stdout` it is effectively copied, leaving the original file
descriptor open and leaking at the end of these statements.  Only the
output file descriptor has its ownership transferred to `File` and will
be cleaned up properly.

This should cause the reading end to read EOF and return zero bytes when
`stdin` and `stdout` is open, rather than remaining open "indefinitely"
(barring the whole process being taken down) as there will always be
that one file descriptor referencing the input end of the pipe.
---
 android-activity/src/game_activity/mod.rs    | 16 ++++++---
 android-activity/src/native_activity/glue.rs | 37 +++++++++++---------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index ef487fa..5809e9b 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -912,13 +912,19 @@ extern "Rust" {
 pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
     abort_on_panic(|| {
         // Maybe make this stdout/stderr redirection an optional / opt-in feature?...
-        let mut logpipe: [RawFd; 2] = Default::default();
-        libc::pipe(logpipe.as_mut_ptr());
-        libc::dup2(logpipe[1], libc::STDOUT_FILENO);
-        libc::dup2(logpipe[1], libc::STDERR_FILENO);
+
+        let file = {
+            let mut logpipe: [RawFd; 2] = Default::default();
+            libc::pipe2(logpipe.as_mut_ptr(), libc::O_CLOEXEC);
+            libc::dup2(logpipe[1], libc::STDOUT_FILENO);
+            libc::dup2(logpipe[1], libc::STDERR_FILENO);
+            libc::close(logpipe[1]);
+
+            File::from_raw_fd(logpipe[0])
+        };
+
         thread::spawn(move || {
             let tag = CStr::from_bytes_with_nul(b"RustStdoutStderr\0").unwrap();
-            let file = File::from_raw_fd(logpipe[0]);
             let mut reader = BufReader::new(file);
             let mut buffer = String::new();
             loop {
diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index d7014d1..003eaa5 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -835,28 +835,31 @@ extern "C" fn ANativeActivity_onCreate(
 ) {
     abort_on_panic(|| {
         // Maybe make this stdout/stderr redirection an optional / opt-in feature?...
-        unsafe {
+        let file = unsafe {
             let mut logpipe: [RawFd; 2] = Default::default();
-            libc::pipe(logpipe.as_mut_ptr());
+            libc::pipe2(logpipe.as_mut_ptr(), libc::O_CLOEXEC);
             libc::dup2(logpipe[1], libc::STDOUT_FILENO);
             libc::dup2(logpipe[1], libc::STDERR_FILENO);
-            std::thread::spawn(move || {
-                let tag = CStr::from_bytes_with_nul(b"RustStdoutStderr\0").unwrap();
-                let file = File::from_raw_fd(logpipe[0]);
-                let mut reader = BufReader::new(file);
-                let mut buffer = String::new();
-                loop {
-                    buffer.clear();
-                    if let Ok(len) = reader.read_line(&mut buffer) {
-                        if len == 0 {
-                            break;
-                        } else if let Ok(msg) = CString::new(buffer.clone()) {
-                            android_log(Level::Info, tag, &msg);
-                        }
+            libc::close(logpipe[1]);
+
+            File::from_raw_fd(logpipe[0])
+        };
+
+        std::thread::spawn(move || {
+            let tag = CStr::from_bytes_with_nul(b"RustStdoutStderr\0").unwrap();
+            let mut reader = BufReader::new(file);
+            let mut buffer = String::new();
+            loop {
+                buffer.clear();
+                if let Ok(len) = reader.read_line(&mut buffer) {
+                    if len == 0 {
+                        break;
+                    } else if let Ok(msg) = CString::new(buffer.clone()) {
+                        android_log(Level::Info, tag, &msg);
                     }
                 }
-            });
-        }
+            }
+        });
 
         log::trace!(
             "Creating: {:p}, saved_state = {:p}, save_state_size = {}",

From 969ba5adf9fb0670035c2841a8ee964c58c58ac0 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Sun, 15 Oct 2023 17:42:29 +0100
Subject: [PATCH 44/93] Improve forwards compatibility of input API

This adds a `#[doc(hidden)]` `__Unknown(u32)` variant to the various
enums to keep them extensible without requiring API breaks.

We need to consider that most enums that are based on Android SDK enums
may be extended across different versions of Android (i.e. effectively
at runtime) or extended in new versions of `android-activity` when we
pull in the latest NDK/SDK constants.

In particular in the case that there is some unknown variant we at least
want to be able to preserve the integer value to allow the values to be
either passed back into the SDK (it doesn't always matter whether we
know the semantics of a variant at compile time) or passed on to
something downstream that could be independently updated to know the
semantics.

We don't want it to be an API break to extend these enums in future
releases of `android-activity`.

It's not enough to rely on `#[non-exhaustive]` because that only really
helps when adding new variants in sync with android-activity releases.

On the other hand we also can't rely on a catch-all `Unknown(u32)` that
only really helps with unknown variants seen at runtime. (If code were
to have an exhaustive match that would include matching on `Unknown(_)`
values then they wouldn't be compatible with new versions of
android-activity that would promote unknown values to known ones).

What we aim for instead is to have a hidden catch-all variant that is
considered (practically) unmatchable so code is forced to have a
`unknown => {}` catch-all pattern match that will cover unknown variants
either in the form of Rust variants added in future versions or in the
form of an `__Unknown(u32)` integer that represents an unknown variant
seen at runtime.

Any `unknown => {}` pattern match can rely on `IntoPrimitive` to convert
the `unknown` variant to the integer that comes from the Android SDK in
case that values needs to be passed on, even without knowing it's
semantic meaning at compile time.

Instead of adding an `__Unknown(u32)` variant to the `Class` enum though
this enum has been removed in favour of adding methods like
`is_button_class()` and `is_pointer_class()` to the `Source` type, since
the class flags aren't guaranteed to be mutually exclusive and since
they are an attribute of the `Source`.

This removes some reliance `try_into().unwrap()` that was put in place
anticipating that we would support `into()` via `num_enum`, once we
could update our rust-version.
---
 android-activity/src/game_activity/input.rs   |  37 +---
 android-activity/src/game_activity/mod.rs     |   2 +
 android-activity/src/input.rs                 | 200 ++++++++++++------
 android-activity/src/input/sdk.rs             |  48 ++---
 android-activity/src/lib.rs                   |  43 ++++
 android-activity/src/native_activity/input.rs |  60 +++---
 6 files changed, 244 insertions(+), 146 deletions(-)

diff --git a/android-activity/src/game_activity/input.rs b/android-activity/src/game_activity/input.rs
index 957e24b..2f53612 100644
--- a/android-activity/src/game_activity/input.rs
+++ b/android-activity/src/game_activity/input.rs
@@ -13,12 +13,10 @@
 // The `Class` was also bound differently to `android-ndk-rs` considering how the class is defined
 // by masking bits from the `Source`.
 
-use std::convert::TryInto;
-
 use crate::activity_impl::ffi::{GameActivityKeyEvent, GameActivityMotionEvent};
 use crate::input::{
-    Axis, ButtonState, Class, EdgeFlags, KeyAction, KeyEventFlags, Keycode, MetaState,
-    MotionAction, MotionEventFlags, Pointer, PointersIter, Source, ToolType,
+    Axis, ButtonState, EdgeFlags, KeyAction, KeyEventFlags, Keycode, MetaState, MotionAction,
+    MotionEventFlags, Pointer, PointersIter, Source, ToolType,
 };
 
 // Note: try to keep this wrapper API compatible with the AInputEvent API if possible
@@ -50,14 +48,7 @@ impl<'a> MotionEvent<'a> {
     #[inline]
     pub fn source(&self) -> Source {
         let source = self.ga_event.source as u32;
-        source.try_into().unwrap_or(Source::Unknown)
-    }
-
-    /// Get the class of the event source.
-    ///
-    #[inline]
-    pub fn class(&self) -> Class {
-        Class::from(self.source())
+        source.into()
     }
 
     /// Get the device id associated with the event.
@@ -73,7 +64,7 @@ impl<'a> MotionEvent<'a> {
     #[inline]
     pub fn action(&self) -> MotionAction {
         let action = self.ga_event.action as u32 & ndk_sys::AMOTION_EVENT_ACTION_MASK;
-        action.try_into().unwrap()
+        action.into()
     }
 
     /// Returns the pointer index of an `Up` or `Down` event.
@@ -275,7 +266,8 @@ impl<'a> PointerImpl<'a> {
     #[inline]
     pub fn axis_value(&self, axis: Axis) -> f32 {
         let pointer = &self.event.ga_event.pointers[self.index];
-        pointer.axisValues[axis as u32 as usize]
+        let axis: u32 = axis.into();
+        pointer.axisValues[axis as usize]
     }
 
     #[inline]
@@ -294,7 +286,7 @@ impl<'a> PointerImpl<'a> {
     pub fn tool_type(&self) -> ToolType {
         let pointer = &self.event.ga_event.pointers[self.index];
         let tool_type = pointer.toolType as u32;
-        tool_type.try_into().unwrap()
+        tool_type.into()
     }
 }
 
@@ -662,14 +654,7 @@ impl<'a> KeyEvent<'a> {
     #[inline]
     pub fn source(&self) -> Source {
         let source = self.ga_event.source as u32;
-        source.try_into().unwrap_or(Source::Unknown)
-    }
-
-    /// Get the class of the event source.
-    ///
-    #[inline]
-    pub fn class(&self) -> Class {
-        Class::from(self.source())
+        source.into()
     }
 
     /// Get the device id associated with the event.
@@ -685,13 +670,13 @@ impl<'a> KeyEvent<'a> {
     #[inline]
     pub fn action(&self) -> KeyAction {
         let action = self.ga_event.action as u32;
-        action.try_into().unwrap()
+        action.into()
     }
 
     #[inline]
     pub fn action_button(&self) -> KeyAction {
         let action = self.ga_event.action as u32;
-        action.try_into().unwrap()
+        action.into()
     }
 
     /// Returns the last time the key was pressed.  This is on the scale of
@@ -721,7 +706,7 @@ impl<'a> KeyEvent<'a> {
     #[inline]
     pub fn key_code(&self) -> Keycode {
         let keycode = self.ga_event.keyCode as u32;
-        keycode.try_into().unwrap_or(Keycode::Unknown)
+        keycode.into()
     }
 
     /// Returns the number of repeats of a key.
diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index 5809e9b..f9904d1 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -548,10 +548,12 @@ impl AndroidAppInner {
     }
 
     pub fn enable_motion_axis(&mut self, axis: Axis) {
+        let axis: u32 = axis.into();
         unsafe { ffi::GameActivityPointerAxes_enableAxis(axis as i32) }
     }
 
     pub fn disable_motion_axis(&mut self, axis: Axis) {
+        let axis: u32 = axis.into();
         unsafe { ffi::GameActivityPointerAxes_disableAxis(axis as i32) }
     }
 
diff --git a/android-activity/src/input.rs b/android-activity/src/input.rs
index 55390f8..95fe17a 100644
--- a/android-activity/src/input.rs
+++ b/android-activity/src/input.rs
@@ -1,5 +1,4 @@
 use bitflags::bitflags;
-use num_enum::{IntoPrimitive, TryFromPrimitive};
 
 pub use crate::activity_impl::input::*;
 use crate::InputStatus;
@@ -10,7 +9,17 @@ pub use sdk::*;
 /// An enum representing the source of an [`MotionEvent`] or [`KeyEvent`]
 ///
 /// See [the InputDevice docs](https://developer.android.com/reference/android/view/InputDevice#SOURCE_ANY)
-#[derive(Debug, Clone, Copy, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
+///
+/// # Android Extensible Enum
+///
+/// This is a runtime [extensible enum](`crate#android-extensible-enums`) and
+/// should be handled similar to a `#[non_exhaustive]` enum to maintain
+/// forwards compatibility.
+///
+/// This implements `Into<u32>` and `From<u32>` for converting to/from Android
+/// SDK integer values.
+///
+#[derive(Debug, Clone, Copy, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
 #[repr(u32)]
 pub enum Source {
     BluetoothStylus = 0x0000c002,
@@ -36,9 +45,36 @@ pub enum Source {
     TouchNavigation = 0x00200000,
     Trackball = 0x00010004,
 
-    Unknown = 0,
-}
-
+    // We need to consider that the enum variants may be extended across
+    // different versions of Android (i.e. effectively at runtime) but at the
+    // same time we don't want it to be an API break to extend this enum in
+    // future releases of `android-activity` with new variants from the latest
+    // NDK/SDK.
+    //
+    // We can't just use `#[non_exhaustive]` because that only really helps
+    // when adding new variants in sync with android-activity releases.
+    //
+    // On the other hand we also can't rely on a catch-all `Unknown(u32)` that
+    // only really helps with unknown variants seen at runtime.
+    //
+    // What we aim for instead is to have a hidden catch-all variant that
+    // is considered (practically) unmatchable so code is forced to have
+    // a `unknown => {}` catch-all pattern match that will cover unknown variants
+    // either in the form of Rust variants added in future versions or
+    // in the form of an `__Unknown(u32)` integer that represents an unknown
+    // variant seen at runtime.
+    //
+    // Any `unknown => {}` pattern match can rely on `IntoPrimitive` to convert
+    // the `unknown` variant to the integer that comes from the Android SDK
+    // in case that values needs to be passed on, even without knowing its
+    // semantic meaning at compile time.
+    #[doc(hidden)]
+    #[num_enum(catch_all)]
+    __Unknown(u32),
+}
+
+// ndk_sys doesn't currently have the `TRACKBALL` flag so we define our
+// own internal class constants for now
 bitflags! {
     #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
     struct SourceFlags: u32 {
@@ -53,37 +89,31 @@ bitflags! {
     }
 }
 
-/// An enum representing the class of a [`MotionEvent`] or [`KeyEvent`] source
-///
-/// See [the InputDevice docs](https://developer.android.com/reference/android/view/InputDevice#SOURCE_CLASS_MASK)
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Class {
-    None,
-    Button,
-    Pointer,
-    Trackball,
-    Position,
-    Joystick,
-}
-
-impl From<u32> for Class {
-    fn from(source: u32) -> Self {
-        let class = SourceFlags::from_bits_truncate(source);
-        match class {
-            SourceFlags::BUTTON => Class::Button,
-            SourceFlags::POINTER => Class::Pointer,
-            SourceFlags::TRACKBALL => Class::Trackball,
-            SourceFlags::POSITION => Class::Position,
-            SourceFlags::JOYSTICK => Class::Joystick,
-            _ => Class::None,
-        }
+impl Source {
+    #[inline]
+    pub fn is_button_class(self) -> bool {
+        let class = SourceFlags::from_bits_truncate(self.into());
+        class.contains(SourceFlags::BUTTON)
     }
-}
-
-impl From<Source> for Class {
-    fn from(source: Source) -> Self {
-        let source: u32 = source.into();
-        source.into()
+    #[inline]
+    pub fn is_pointer_class(self) -> bool {
+        let class = SourceFlags::from_bits_truncate(self.into());
+        class.contains(SourceFlags::POINTER)
+    }
+    #[inline]
+    pub fn is_trackball_class(self) -> bool {
+        let class = SourceFlags::from_bits_truncate(self.into());
+        class.contains(SourceFlags::TRACKBALL)
+    }
+    #[inline]
+    pub fn is_position_class(self) -> bool {
+        let class = SourceFlags::from_bits_truncate(self.into());
+        class.contains(SourceFlags::POSITION)
+    }
+    #[inline]
+    pub fn is_joystick_class(self) -> bool {
+        let class = SourceFlags::from_bits_truncate(self.into());
+        class.contains(SourceFlags::JOYSTICK)
     }
 }
 
@@ -174,7 +204,17 @@ impl From<ndk::event::MetaState> for MetaState {
 ///
 /// See [the NDK
 /// docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-29)
-#[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
+///
+/// # Android Extensible Enum
+///
+/// This is a runtime [extensible enum](`crate#android-extensible-enums`) and
+/// should be handled similar to a `#[non_exhaustive]` enum to maintain
+/// forwards compatibility.
+///
+/// This implements `Into<u32>` and `From<u32>` for converting to/from Android
+/// SDK integer values.
+///
+#[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
 #[repr(u32)]
 pub enum MotionAction {
     Down = ndk_sys::AMOTION_EVENT_ACTION_DOWN,
@@ -190,19 +230,26 @@ pub enum MotionAction {
     HoverExit = ndk_sys::AMOTION_EVENT_ACTION_HOVER_EXIT,
     ButtonPress = ndk_sys::AMOTION_EVENT_ACTION_BUTTON_PRESS,
     ButtonRelease = ndk_sys::AMOTION_EVENT_ACTION_BUTTON_RELEASE,
-}
 
-impl From<ndk::event::MotionAction> for MotionAction {
-    fn from(value: ndk::event::MotionAction) -> Self {
-        let inner: u32 = value.into();
-        inner.try_into().unwrap() // TODO: use into() when we bump the MSRV to 1.68
-    }
+    #[doc(hidden)]
+    #[num_enum(catch_all)]
+    __Unknown(u32),
 }
 
 /// An axis of a motion event.
 ///
 /// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-32)
-#[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
+///
+/// # Android Extensible Enum
+///
+/// This is a runtime [extensible enum](`crate#android-extensible-enums`) and
+/// should be handled similar to a `#[non_exhaustive]` enum to maintain
+/// forwards compatibility.
+///
+/// This implements `Into<u32>` and `From<u32>` for converting to/from Android
+/// SDK integer values.
+///
+#[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
 #[repr(u32)]
 pub enum Axis {
     X = ndk_sys::AMOTION_EVENT_AXIS_X,
@@ -250,19 +297,26 @@ pub enum Axis {
     Generic14 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_14,
     Generic15 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_15,
     Generic16 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_16,
-}
 
-impl From<ndk::event::Axis> for Axis {
-    fn from(value: ndk::event::Axis) -> Self {
-        let inner: u32 = value.into();
-        inner.try_into().unwrap() // TODO: replace with into() when we can bump MSRV to 1.68!
-    }
+    #[doc(hidden)]
+    #[num_enum(catch_all)]
+    __Unknown(u32),
 }
 
 /// The tool type of a pointer.
 ///
 /// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-48)
-#[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
+///
+/// # Android Extensible Enum
+///
+/// This is a runtime [extensible enum](`crate#android-extensible-enums`) and
+/// should be handled similar to a `#[non_exhaustive]` enum to maintain
+/// forwards compatibility.
+///
+/// Implements `Into<u32>` and `From<u32>` for converting to/from Android SDK
+/// integer values.
+///
+#[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
 #[repr(u32)]
 pub enum ToolType {
     /// Unknown tool type.
@@ -284,6 +338,10 @@ pub enum ToolType {
 
     /// The tool is a palm and should be rejected
     Palm = ndk_sys::AMOTION_EVENT_TOOL_TYPE_PALM,
+
+    #[doc(hidden)]
+    #[num_enum(catch_all)]
+    __Unknown(u32),
 }
 
 /// A bitfield representing the state of buttons during a motion event.
@@ -382,25 +440,42 @@ impl From<ndk::event::MotionEventFlags> for MotionEventFlags {
 /// Key actions.
 ///
 /// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-27)
-#[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
+///
+/// # Android Extensible Enum
+///
+/// This is a runtime [extensible enum](`crate#android-extensible-enums`) and
+/// should be handled similar to a `#[non_exhaustive]` enum to maintain
+/// forwards compatibility.
+///
+/// Implements `Into<u32>` and `From<u32>` for converting to/from Android SDK
+/// integer values.
+///
+#[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
 #[repr(u32)]
 pub enum KeyAction {
     Down = ndk_sys::AKEY_EVENT_ACTION_DOWN,
     Up = ndk_sys::AKEY_EVENT_ACTION_UP,
     Multiple = ndk_sys::AKEY_EVENT_ACTION_MULTIPLE,
-}
 
-impl From<ndk::event::KeyAction> for KeyAction {
-    fn from(value: ndk::event::KeyAction) -> Self {
-        let inner: u32 = value.into();
-        inner.try_into().unwrap() // TODO: replace with into() when we can bump MSRV to 1.68!
-    }
+    #[doc(hidden)]
+    #[num_enum(catch_all)]
+    __Unknown(u32),
 }
 
 /// Key codes.
 ///
 /// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-39)
-#[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)]
+///
+/// # Android Extensible Enum
+///
+/// This is a runtime [extensible enum](`crate#android-extensible-enums`) and
+/// should be handled similar to a `#[non_exhaustive]` enum to maintain
+/// forwards compatibility.
+///
+/// Implements `Into<u32>` and `From<u32>` for converting to/from Android SDK
+/// integer values.
+///
+#[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
 #[repr(u32)]
 pub enum Keycode {
     Unknown = ndk_sys::AKEYCODE_UNKNOWN,
@@ -692,13 +767,10 @@ pub enum Keycode {
     ThumbsUp = ndk_sys::AKEYCODE_THUMBS_UP,
     ThumbsDown = ndk_sys::AKEYCODE_THUMBS_DOWN,
     ProfileSwitch = ndk_sys::AKEYCODE_PROFILE_SWITCH,
-}
 
-impl From<ndk::event::Keycode> for Keycode {
-    fn from(value: ndk::event::Keycode) -> Self {
-        let inner: u32 = value.into();
-        inner.try_into().unwrap() // TODO: replace with into() when we can bump MSRV to 1.68!
-    }
+    #[doc(hidden)]
+    #[num_enum(catch_all)]
+    __Unknown(u32),
 }
 
 /// Flags associated with [`KeyEvent`].
diff --git a/android-activity/src/input/sdk.rs b/android-activity/src/input/sdk.rs
index f03a41b..ad4517d 100644
--- a/android-activity/src/input/sdk.rs
+++ b/android-activity/src/input/sdk.rs
@@ -17,7 +17,22 @@ use crate::{
     jni_utils,
 };
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+/// An enum representing the types of keyboards that may generate key events
+///
+/// See [getKeyboardType() docs](https://developer.android.com/reference/android/view/KeyCharacterMap#getKeyboardType())
+///
+/// # Android Extensible Enum
+///
+/// This is a runtime [extensible enum](`crate#android-extensible-enums`) and
+/// should be handled similar to a `#[non_exhaustive]` enum to maintain
+/// forwards compatibility.
+///
+/// This implements `Into<u32>` and `From<u32>` for converting to/from Android
+/// SDK integer values.
+#[derive(
+    Debug, Clone, Copy, PartialEq, Eq, Hash, num_enum::FromPrimitive, num_enum::IntoPrimitive,
+)]
+#[repr(u32)]
 pub enum KeyboardType {
     /// A numeric (12-key) keyboard.
     ///
@@ -50,33 +65,9 @@ pub enum KeyboardType {
     /// A special function keyboard consists only of non-printing keys such as HOME and POWER that are not actually used for typing.
     SpecialFunction,
 
-    /// An unknown type of keyboard
-    Unknown(i32),
-}
-
-impl From<i32> for KeyboardType {
-    fn from(value: i32) -> Self {
-        match value {
-            1 => KeyboardType::Numeric,
-            2 => KeyboardType::Predictive,
-            3 => KeyboardType::Alpha,
-            4 => KeyboardType::Full,
-            5 => KeyboardType::SpecialFunction,
-            unknown => KeyboardType::Unknown(unknown),
-        }
-    }
-}
-impl From<KeyboardType> for i32 {
-    fn from(value: KeyboardType) -> i32 {
-        match value {
-            KeyboardType::Numeric => 1,
-            KeyboardType::Predictive => 2,
-            KeyboardType::Alpha => 3,
-            KeyboardType::Full => 4,
-            KeyboardType::SpecialFunction => 5,
-            KeyboardType::Unknown(unknown) => unknown,
-        }
-    }
+    #[doc(hidden)]
+    #[num_enum(catch_all)]
+    __Unknown(u32),
 }
 
 /// Either represents, a unicode character or combining accent from a
@@ -353,6 +344,7 @@ impl KeyCharacterMap {
         let keyboard_type = self
             .binding
             .get_keyboard_type(&mut env, self.key_map.as_obj())?;
+        let keyboard_type = keyboard_type as u32;
         Ok(keyboard_type.into())
     }
 }
diff --git a/android-activity/src/lib.rs b/android-activity/src/lib.rs
index cbbe7d2..448fc57 100644
--- a/android-activity/src/lib.rs
+++ b/android-activity/src/lib.rs
@@ -51,6 +51,49 @@
 //!
 //! These are undone after `android_main()` returns
 //!
+//! # Android Extensible Enums
+//!
+//! There are numerous enums in the `android-activity` API which are effectively
+//! bindings to enums declared in the Android SDK which need to be considered
+//! _runtime_ extensible.
+//!
+//! Any enum variants that come from the Android SDK may be extended in future
+//! versions of Android and your code could be exposed to new variants if you
+//! build an application that might be installed on new versions of Android.
+//!
+//! This crate follows a convention of adding a hidden `__Unknown(u32)` variant
+//! to these enum to ensure we can always do lossless conversions between the
+//! integers from the SDK and our corresponding Rust enums. This can be
+//! important in case you need to pass certain variants back to the SDK
+//! regardless of whether you knew about that variants specific semantics at
+//! compile time.
+//!
+//! You should never include this `__Unknown(u32)` variant within any exhaustive
+//! pattern match and should instead treat the enums like `#[non_exhaustive]`
+//! enums that require you to add a catch-all for any `unknown => {}` values.
+//!
+//! Any code that would exhaustively include the `__Unknown(u32)` variant when
+//! pattern matching can not be guaranteed to be forwards compatible with new
+//! releases of `android-activity` which may add new Rust variants to these
+//! enums without requiring a breaking semver bump.
+//!
+//! You can (infallibly) convert these enums to and from primitive `u32` values
+//! using `.into()`:
+//!
+//! For example, here is how you could ensure forwards compatibility with both
+//! compile-time and runtime extensions of a `SomeEnum` enum:
+//!
+//! ```rust
+//! match some_enum {
+//!     SomeEnum::Foo => {},
+//!     SomeEnum::Bar => {},
+//!     unhandled => {
+//!         let sdk_val: u32 = unhandled.into();
+//!         println!("Unhandled enum variant {some_enum:?} has SDK value: {sdk_val}");
+//!     }
+//! }
+//! ```
+//!
 //! [`Activity`]: https://developer.android.com/reference/android/app/Activity
 //! [`NativeActivity`]: https://developer.android.com/reference/android/app/NativeActivity
 //! [ndk_concepts]: https://developer.android.com/ndk/guides/concepts#naa
diff --git a/android-activity/src/native_activity/input.rs b/android-activity/src/native_activity/input.rs
index 8a2d0b2..ddf9928 100644
--- a/android-activity/src/native_activity/input.rs
+++ b/android-activity/src/native_activity/input.rs
@@ -1,8 +1,8 @@
 use std::marker::PhantomData;
 
 use crate::input::{
-    Axis, ButtonState, Class, EdgeFlags, KeyAction, Keycode, MetaState, MotionAction,
-    MotionEventFlags, Pointer, PointersIter, Source, ToolType,
+    Axis, ButtonState, EdgeFlags, KeyAction, Keycode, MetaState, MotionAction, MotionEventFlags,
+    Pointer, PointersIter, Source, ToolType,
 };
 
 /// A motion event
@@ -32,18 +32,11 @@ impl<'a> MotionEvent<'a> {
     pub fn source(&self) -> Source {
         // XXX: we use `AInputEvent_getSource` directly (instead of calling
         // ndk_event.source()) since we have our own `Source` enum that we
-        // share between backends, which may not exactly match the ndk crate's
-        // `Source` enum.
+        // share between backends, which may also capture unknown variants
+        // added in new versions of Android.
         let source =
             unsafe { ndk_sys::AInputEvent_getSource(self.ndk_event.ptr().as_ptr()) as u32 };
-        source.try_into().unwrap_or(Source::Unknown)
-    }
-
-    /// Get the class of the event source.
-    ///
-    #[inline]
-    pub fn class(&self) -> Class {
-        Class::from(self.source())
+        source.into()
     }
 
     /// Get the device id associated with the event.
@@ -58,7 +51,11 @@ impl<'a> MotionEvent<'a> {
     /// See [the MotionEvent docs](https://developer.android.com/reference/android/view/MotionEvent#getActionMasked())
     #[inline]
     pub fn action(&self) -> MotionAction {
-        self.ndk_event.action().into()
+        // XXX: we use `AInputEvent_getAction` directly since we have our own
+        // `KeyAction` enum that we share between backends, which may also
+        // capture unknown variants added in new versions of Android.
+        let action = unsafe { ndk_sys::AKeyEvent_getAction(self.ndk_event.ptr().as_ptr()) as u32 };
+        action.into()
     }
 
     /// Returns the pointer index of an `Up` or `Down` event.
@@ -250,8 +247,13 @@ impl<'a> PointerImpl<'a> {
     #[inline]
     pub fn axis_value(&self, axis: Axis) -> f32 {
         let value: u32 = axis.into();
-        let ndk_axis = value.try_into().unwrap();
-        self.ndk_pointer.axis_value(ndk_axis)
+        if let Ok(ndk_axis) = value.try_into() {
+            self.ndk_pointer.axis_value(ndk_axis)
+        } else {
+            // FIXME: We should also be able to query `Axis::__Unknown(u32)` values
+            // that can't currently be queried via the `ndk` `Pointer` API
+            0.0f32
+        }
     }
 
     #[inline]
@@ -267,7 +269,7 @@ impl<'a> PointerImpl<'a> {
     #[inline]
     pub fn tool_type(&self) -> ToolType {
         let value: u32 = self.ndk_pointer.tool_type().into();
-        value.try_into().unwrap()
+        value.into()
     }
 }
 
@@ -323,18 +325,11 @@ impl<'a> KeyEvent<'a> {
     pub fn source(&self) -> Source {
         // XXX: we use `AInputEvent_getSource` directly (instead of calling
         // ndk_event.source()) since we have our own `Source` enum that we
-        // share between backends, which may not exactly match the ndk crate's
-        // `Source` enum.
+        // share between backends, which may also capture unknown variants
+        // added in new versions of Android.
         let source =
             unsafe { ndk_sys::AInputEvent_getSource(self.ndk_event.ptr().as_ptr()) as u32 };
-        source.try_into().unwrap_or(Source::Unknown)
-    }
-
-    /// Get the class of the event source.
-    ///
-    #[inline]
-    pub fn class(&self) -> Class {
-        Class::from(self.source())
+        source.into()
     }
 
     /// Get the device id associated with the event.
@@ -349,7 +344,11 @@ impl<'a> KeyEvent<'a> {
     /// See [the KeyEvent docs](https://developer.android.com/reference/android/view/KeyEvent#getAction())
     #[inline]
     pub fn action(&self) -> KeyAction {
-        self.ndk_event.action().into()
+        // XXX: we use `AInputEvent_getAction` directly since we have our own
+        // `KeyAction` enum that we share between backends, which may also
+        // capture unknown variants added in new versions of Android.
+        let action = unsafe { ndk_sys::AKeyEvent_getAction(self.ndk_event.ptr().as_ptr()) as u32 };
+        action.into()
     }
 
     /// Returns the last time the key was pressed.  This is on the scale of
@@ -378,7 +377,12 @@ impl<'a> KeyEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#akeyevent_getkeycode)
     #[inline]
     pub fn key_code(&self) -> Keycode {
-        self.ndk_event.key_code().into()
+        // XXX: we use `AInputEvent_getKeyCode` directly since we have our own
+        // `Keycode` enum that we share between backends, which may also
+        // capture unknown variants added in new versions of Android.
+        let keycode =
+            unsafe { ndk_sys::AKeyEvent_getKeyCode(self.ndk_event.ptr().as_ptr()) as u32 };
+        keycode.into()
     }
 
     /// Returns the number of repeats of a key.

From a92237fab4a5f9658933ce18d9f529ee52114220 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 16 Oct 2023 20:05:34 +0100
Subject: [PATCH 45/93] Add `non_exhaustive` to input enums

This change was meant to be squashed into #131 before landing
---
 android-activity/src/input.rs     | 6 ++++++
 android-activity/src/input/sdk.rs | 1 +
 2 files changed, 7 insertions(+)

diff --git a/android-activity/src/input.rs b/android-activity/src/input.rs
index 95fe17a..326219c 100644
--- a/android-activity/src/input.rs
+++ b/android-activity/src/input.rs
@@ -20,6 +20,7 @@ pub use sdk::*;
 /// SDK integer values.
 ///
 #[derive(Debug, Clone, Copy, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
+#[non_exhaustive]
 #[repr(u32)]
 pub enum Source {
     BluetoothStylus = 0x0000c002,
@@ -215,6 +216,7 @@ impl From<ndk::event::MetaState> for MetaState {
 /// SDK integer values.
 ///
 #[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
+#[non_exhaustive]
 #[repr(u32)]
 pub enum MotionAction {
     Down = ndk_sys::AMOTION_EVENT_ACTION_DOWN,
@@ -250,6 +252,7 @@ pub enum MotionAction {
 /// SDK integer values.
 ///
 #[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
+#[non_exhaustive]
 #[repr(u32)]
 pub enum Axis {
     X = ndk_sys::AMOTION_EVENT_AXIS_X,
@@ -317,6 +320,7 @@ pub enum Axis {
 /// integer values.
 ///
 #[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
+#[non_exhaustive]
 #[repr(u32)]
 pub enum ToolType {
     /// Unknown tool type.
@@ -451,6 +455,7 @@ impl From<ndk::event::MotionEventFlags> for MotionEventFlags {
 /// integer values.
 ///
 #[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
+#[non_exhaustive]
 #[repr(u32)]
 pub enum KeyAction {
     Down = ndk_sys::AKEY_EVENT_ACTION_DOWN,
@@ -476,6 +481,7 @@ pub enum KeyAction {
 /// integer values.
 ///
 #[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
+#[non_exhaustive]
 #[repr(u32)]
 pub enum Keycode {
     Unknown = ndk_sys::AKEYCODE_UNKNOWN,
diff --git a/android-activity/src/input/sdk.rs b/android-activity/src/input/sdk.rs
index ad4517d..688b512 100644
--- a/android-activity/src/input/sdk.rs
+++ b/android-activity/src/input/sdk.rs
@@ -32,6 +32,7 @@ use crate::{
 #[derive(
     Debug, Clone, Copy, PartialEq, Eq, Hash, num_enum::FromPrimitive, num_enum::IntoPrimitive,
 )]
+#[non_exhaustive]
 #[repr(u32)]
 pub enum KeyboardType {
     /// A numeric (12-key) keyboard.

From 74d966985435d3624749be6e1451edf171ce38f5 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 16 Oct 2023 10:50:31 +0100
Subject: [PATCH 46/93] Document that AndroidApp is cheaply clonable

Fixes: #125
---
 android-activity/src/lib.rs | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/android-activity/src/lib.rs b/android-activity/src/lib.rs
index 448fc57..f38fc67 100644
--- a/android-activity/src/lib.rs
+++ b/android-activity/src/lib.rs
@@ -35,6 +35,18 @@
 //! marshalled between the Java thread that owns the `Activity` and the native
 //! thread that runs the `android_main()` code.
 //!
+//! # Cheaply Clonable [`AndroidApp`]
+//!
+//! [`AndroidApp`] is intended to be something that can be cheaply passed around
+//! by referenced within an application. It is reference counted and can be
+//! cheaply cloned.
+//!
+//! # `Send` and `Sync` [`AndroidApp`]
+//!
+//! Although an [`AndroidApp`] implements `Send` and `Sync` you do need to take
+//! into consideration that some APIs, such as [`AndroidApp::poll_events()`] are
+//! explicitly documented to only be usable from your `android_main()` thread.
+//!
 //! # Main Thread Initialization
 //!
 //! Before `android_main()` is called, the following application state
@@ -489,6 +501,18 @@ bitflags! {
 /// marshalled between the Java thread that owns the `Activity` and the native
 /// thread that runs the `android_main()` code.
 ///
+/// # Cheaply Clonable [`AndroidApp`]
+///
+/// [`AndroidApp`] is intended to be something that can be cheaply passed around
+/// by referenced within an application. It is reference counted and can be
+/// cheaply cloned.
+///
+/// # `Send` and `Sync` [`AndroidApp`]
+///
+/// Although an [`AndroidApp`] implements `Send` and `Sync` you do need to take
+/// into consideration that some APIs, such as [`AndroidApp::poll_events()`] are
+/// explicitly documented to only be usable from your `android_main()` thread.
+///
 #[derive(Debug, Clone)]
 pub struct AndroidApp {
     pub(crate) inner: Arc<RwLock<AndroidAppInner>>,

From b590ec5484d50770ad46dd98595ddf17f8dd2472 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 16 Oct 2023 16:30:07 +0100
Subject: [PATCH 47/93] Set workspace.resolver = "2" and avoid cargo warning

---
 Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Cargo.toml b/Cargo.toml
index 95c8a86..5673fe4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = ["android-activity"]
 
 exclude = ["examples"]

From d16cb793506ba4813010c008c27e83e4b4bc6257 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 15:34:36 +0000
Subject: [PATCH 48/93] build(deps): bump hecrj/setup-rust-action from 1 to 2

Bumps [hecrj/setup-rust-action](https://github.com/hecrj/setup-rust-action) from 1 to 2.
- [Release notes](https://github.com/hecrj/setup-rust-action/releases)
- [Commits](https://github.com/hecrj/setup-rust-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: hecrj/setup-rust-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7cdc1f0..b74a9a5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: hecrj/setup-rust-action@v1
+      - uses: hecrj/setup-rust-action@v2
         with:
           rust-version: ${{ matrix.rust_version }}
 

From add58dbb2ec41eabd492a7eeeee20ffc968b206d Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 16 Oct 2023 23:38:22 +0100
Subject: [PATCH 49/93] native-activity: Fix copy&paste mistake in
 MotionEvent::action()

---
 android-activity/src/native_activity/input.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/android-activity/src/native_activity/input.rs b/android-activity/src/native_activity/input.rs
index ddf9928..551b18d 100644
--- a/android-activity/src/native_activity/input.rs
+++ b/android-activity/src/native_activity/input.rs
@@ -51,10 +51,10 @@ impl<'a> MotionEvent<'a> {
     /// See [the MotionEvent docs](https://developer.android.com/reference/android/view/MotionEvent#getActionMasked())
     #[inline]
     pub fn action(&self) -> MotionAction {
-        // XXX: we use `AInputEvent_getAction` directly since we have our own
-        // `KeyAction` enum that we share between backends, which may also
+        // XXX: we use `AMotionEvent_getAction` directly since we have our own
+        // `MotionAction` enum that we share between backends, which may also
         // capture unknown variants added in new versions of Android.
-        let action = unsafe { ndk_sys::AKeyEvent_getAction(self.ndk_event.ptr().as_ptr()) as u32 };
+        let action = unsafe { ndk_sys::AMotionEvent_getAction(self.ndk_event.ptr().as_ptr()) as u32 };
         action.into()
     }
 

From 2a917ca5c4749623590412fe5e0dba49ec27b904 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 16 Oct 2023 23:40:25 +0100
Subject: [PATCH 50/93] Expose MotionEvent::action_button() state

This exposes the button associated with a button press or release
action.
---
 android-activity/src/game_activity/input.rs   | 16 ++++++++--
 android-activity/src/input.rs                 | 31 +++++++++++++++++++
 android-activity/src/native_activity/input.rs | 20 ++++++++++--
 3 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/android-activity/src/game_activity/input.rs b/android-activity/src/game_activity/input.rs
index 2f53612..fdf8326 100644
--- a/android-activity/src/game_activity/input.rs
+++ b/android-activity/src/game_activity/input.rs
@@ -15,8 +15,8 @@
 
 use crate::activity_impl::ffi::{GameActivityKeyEvent, GameActivityMotionEvent};
 use crate::input::{
-    Axis, ButtonState, EdgeFlags, KeyAction, KeyEventFlags, Keycode, MetaState, MotionAction,
-    MotionEventFlags, Pointer, PointersIter, Source, ToolType,
+    Axis, Button, ButtonState, EdgeFlags, KeyAction, KeyEventFlags, Keycode, MetaState,
+    MotionAction, MotionEventFlags, Pointer, PointersIter, Source, ToolType,
 };
 
 // Note: try to keep this wrapper API compatible with the AInputEvent API if possible
@@ -67,6 +67,18 @@ impl<'a> MotionEvent<'a> {
         action.into()
     }
 
+    /// Returns which button has been modified during a press or release action.
+    ///
+    /// For actions other than [`MotionAction::ButtonPress`] and
+    /// [`MotionAction::ButtonRelease`] the returned value is undefined.
+    ///
+    /// See [the MotionEvent docs](https://developer.android.com/reference/android/view/MotionEvent#getActionButton())
+    #[inline]
+    pub fn action_button(&self) -> Button {
+        let action = self.ga_event.actionButton as u32;
+        action.into()
+    }
+
     /// Returns the pointer index of an `Up` or `Down` event.
     ///
     /// Pointer indices can change per motion event.  For an identifier that stays the same, see
diff --git a/android-activity/src/input.rs b/android-activity/src/input.rs
index 326219c..85a0b9f 100644
--- a/android-activity/src/input.rs
+++ b/android-activity/src/input.rs
@@ -238,6 +238,37 @@ pub enum MotionAction {
     __Unknown(u32),
 }
 
+/// Identifies buttons that are associated with motion events.
+///
+/// See [the NDK
+/// docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-47)
+///
+/// # Android Extensible Enum
+///
+/// This is a runtime [extensible enum](`crate#android-extensible-enums`) and
+/// should be handled similar to a `#[non_exhaustive]` enum to maintain
+/// forwards compatibility.
+///
+/// This implements `Into<u32>` and `From<u32>` for converting to/from Android
+/// SDK integer values.
+///
+#[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
+#[non_exhaustive]
+#[repr(u32)]
+pub enum Button {
+    Back = ndk_sys::AMOTION_EVENT_BUTTON_BACK,
+    Forward = ndk_sys::AMOTION_EVENT_BUTTON_FORWARD,
+    Primary = ndk_sys::AMOTION_EVENT_BUTTON_PRIMARY,
+    Secondary = ndk_sys::AMOTION_EVENT_BUTTON_SECONDARY,
+    StylusPrimary = ndk_sys::AMOTION_EVENT_BUTTON_STYLUS_PRIMARY,
+    StylusSecondary = ndk_sys::AMOTION_EVENT_BUTTON_STYLUS_SECONDARY,
+    Tertiary = ndk_sys::AMOTION_EVENT_BUTTON_TERTIARY,
+
+    #[doc(hidden)]
+    #[num_enum(catch_all)]
+    __Unknown(u32),
+}
+
 /// An axis of a motion event.
 ///
 /// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-32)
diff --git a/android-activity/src/native_activity/input.rs b/android-activity/src/native_activity/input.rs
index 551b18d..fcab382 100644
--- a/android-activity/src/native_activity/input.rs
+++ b/android-activity/src/native_activity/input.rs
@@ -1,8 +1,8 @@
 use std::marker::PhantomData;
 
 use crate::input::{
-    Axis, ButtonState, EdgeFlags, KeyAction, Keycode, MetaState, MotionAction, MotionEventFlags,
-    Pointer, PointersIter, Source, ToolType,
+    Axis, Button, ButtonState, EdgeFlags, KeyAction, Keycode, MetaState, MotionAction,
+    MotionEventFlags, Pointer, PointersIter, Source, ToolType,
 };
 
 /// A motion event
@@ -54,10 +54,24 @@ impl<'a> MotionEvent<'a> {
         // XXX: we use `AMotionEvent_getAction` directly since we have our own
         // `MotionAction` enum that we share between backends, which may also
         // capture unknown variants added in new versions of Android.
-        let action = unsafe { ndk_sys::AMotionEvent_getAction(self.ndk_event.ptr().as_ptr()) as u32 };
+        let action =
+            unsafe { ndk_sys::AMotionEvent_getAction(self.ndk_event.ptr().as_ptr()) as u32 };
         action.into()
     }
 
+    /// Returns which button has been modified during a press or release action.
+    ///
+    /// For actions other than [`MotionAction::ButtonPress`] and
+    /// [`MotionAction::ButtonRelease`] the returned value is undefined.
+    ///
+    /// See [the MotionEvent docs](https://developer.android.com/reference/android/view/MotionEvent#getActionButton())
+    #[inline]
+    pub fn action_button(&self) -> Button {
+        let action_button =
+            unsafe { ndk_sys::AMotionEvent_getActionButton(self.ndk_event.ptr().as_ptr()) as u32 };
+        action_button.into()
+    }
+
     /// Returns the pointer index of an `Up` or `Down` event.
     ///
     /// Pointer indices can change per motion event.  For an identifier that stays the same, see

From 6e036c99e44ae043a334e949f4645f5fcf7d2e2a Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 16 Oct 2023 20:25:30 +0100
Subject: [PATCH 51/93] Update CHANGELOG

---
 android-activity/CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/android-activity/CHANGELOG.md b/android-activity/CHANGELOG.md
index 5a636f2..5f54509 100644
--- a/android-activity/CHANGELOG.md
+++ b/android-activity/CHANGELOG.md
@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.0] - 2023-10-16
+### Added
+- Added `MotionEvent::action_button()` exposing the button associated with button press/release actions ()
+
+### Changed
+- rust-version bumped to 0.68 ([#123](https://github.com/rust-mobile/android-activity/pull/123))
+- *Breaking*: updates to `ndk 0.8` and `ndk-sys 0.5` ([#128](https://github.com/rust-mobile/android-activity/pull/128))
+- The `Pointer` and `PointerIter` types from the `ndk` crate are no longer directly exposed in the public API ([#122](https://github.com/rust-mobile/android-activity/pull/122))
+- All input API enums based on Android SDK enums have been made runtime extensible via hidden `__Unknown(u32)` variants ([#131](https://github.com/rust-mobile/android-activity/pull/131))
+
 ## [0.5.0-beta.1] - 2023-08-15
 ### Changed
 - Pulled in `ndk-sys 0.5.0-beta.0` and `ndk 0.8.0-beta.0` ([#113](https://github.com/rust-mobile/android-activity/pull/113))

From 6af4d6122791d77d35939dbd140ee5971f0b6673 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 16 Oct 2023 21:26:52 +0100
Subject: [PATCH 52/93] Remove redundant examples/na-mainloop/.idea directory

---
 examples/na-mainloop/.idea/.gitignore   |  3 ---
 examples/na-mainloop/.idea/compiler.xml |  6 ------
 examples/na-mainloop/.idea/gradle.xml   | 19 -------------------
 examples/na-mainloop/.idea/misc.xml     | 18 ------------------
 examples/na-mainloop/.idea/vcs.xml      |  7 -------
 5 files changed, 53 deletions(-)
 delete mode 100644 examples/na-mainloop/.idea/.gitignore
 delete mode 100644 examples/na-mainloop/.idea/compiler.xml
 delete mode 100644 examples/na-mainloop/.idea/gradle.xml
 delete mode 100644 examples/na-mainloop/.idea/misc.xml
 delete mode 100644 examples/na-mainloop/.idea/vcs.xml

diff --git a/examples/na-mainloop/.idea/.gitignore b/examples/na-mainloop/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/examples/na-mainloop/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/examples/na-mainloop/.idea/compiler.xml b/examples/na-mainloop/.idea/compiler.xml
deleted file mode 100644
index fb7f4a8..0000000
--- a/examples/na-mainloop/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/examples/na-mainloop/.idea/gradle.xml b/examples/na-mainloop/.idea/gradle.xml
deleted file mode 100644
index a2d7c21..0000000
--- a/examples/na-mainloop/.idea/gradle.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/examples/na-mainloop/.idea/misc.xml b/examples/na-mainloop/.idea/misc.xml
deleted file mode 100644
index a6198f0..0000000
--- a/examples/na-mainloop/.idea/misc.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DesignSurface">
-    <option name="filePathToZoomLevelMap">
-      <map>
-        <entry key="..\:/Users/Robert/src/agdk-rust/examples/na-mainloop/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.2595" />
-        <entry key="..\:/Users/Robert/src/agdk-rust/examples/na-mainloop/app/src/main/res/drawable/ic_launcher_background.xml" value="0.2595" />
-        <entry key="..\:/Users/Robert/src/agdk-rust/examples/na-mainloop/app/src/main/res/layout/activity_main.xml" value="0.25416666666666665" />
-      </map>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/examples/na-mainloop/.idea/vcs.xml b/examples/na-mainloop/.idea/vcs.xml
deleted file mode 100644
index fdf1fc8..0000000
--- a/examples/na-mainloop/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

From a7dc90d9bb049c16365ea5a64ac4c5828497dd3c Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 16 Oct 2023 20:26:58 +0100
Subject: [PATCH 53/93] Release 0.5.0

---
 android-activity/Cargo.toml       | 2 +-
 examples/agdk-mainloop/Cargo.toml | 4 ++--
 examples/na-mainloop/Cargo.toml   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 8b8aa9b..c6f2584 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "android-activity"
-version = "0.5.0-beta.1"
+version = "0.5.0"
 edition = "2021"
 keywords = ["android", "ndk"]
 readme = "../README.md"
diff --git a/examples/agdk-mainloop/Cargo.toml b/examples/agdk-mainloop/Cargo.toml
index acb84a9..c003445 100644
--- a/examples/agdk-mainloop/Cargo.toml
+++ b/examples/agdk-mainloop/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2021"
 log = "0.4"
 android_logger = "0.11.0"
 android-activity = { path="../../android-activity", features = ["game-activity"] }
-ndk-sys = "0.5.0-beta.0"
-ndk = "0.8.0-beta.0"
+ndk-sys = "0.5.0"
+ndk = "0.8.0"
 
 [lib]
 name="main"
diff --git a/examples/na-mainloop/Cargo.toml b/examples/na-mainloop/Cargo.toml
index 2014401..131b865 100644
--- a/examples/na-mainloop/Cargo.toml
+++ b/examples/na-mainloop/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2021"
 log = "0.4"
 android_logger = "0.11.0"
 android-activity = { path="../../android-activity", features = [ "native-activity" ] }
-ndk-sys = "0.5.0-beta.0"
-ndk = "0.8.0-beta.0"
+ndk-sys = "0.5.0"
+ndk = "0.8.0"
 
 [lib]
 #name="na_mainloop"

From 98aef994190e64691f0a443e4e8988f62e51a99e Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Wed, 25 Oct 2023 23:15:21 +0200
Subject: [PATCH 54/93] Disable `ndk` default features to remove
 `raw-window-handle 0.6` (#142)

The `ndk` crate enables `raw-window-handle 0.6` by default (because of
https://github.com/rust-mobile/ndk/pull/434#issuecomment-1752089087)
which might not be used by consumers of the `android-activity` crate
at all, or might (still) be a mismatching version. Even if the `rwh_0x`
features are additive, figuring that out leads to cryptic errors and it
is best to turn off these defaults completely and leave it to the user
to turn it back on in their own `[dependencies]` section if desired.
---
 android-activity/Cargo.toml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index c6f2584..1441a0b 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -34,7 +34,7 @@ jni-sys = "0.3"
 cesu8 = "1"
 jni = "0.21"
 ndk-sys = "0.5.0"
-ndk = "0.8.0"
+ndk = { version = "0.8.0", default-features = false }
 ndk-context = "0.1"
 android-properties = "0.2"
 num_enum = "0.7"
@@ -54,3 +54,6 @@ targets = [
 ]
 
 rustdoc-args = ["--cfg", "docsrs"]
+
+[dev-dependencies]
+ndk = "0.8.0"

From 100d5bc1d4ca51e83f9a359092823bb9effbd30a Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Sat, 28 Oct 2023 20:23:22 +0200
Subject: [PATCH 55/93] README: Update crate version in `Cargo.toml` example

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7c49732..783bbd8 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,8 @@ Cargo.toml
 ```toml
 [dependencies]
 log = "0.4"
-android_logger = "0.11"
-android-activity = { version = "0.4", features = [ "native-activity" ] }
+android_logger = "0.13"
+android-activity = { version = "0.5", features = [ "native-activity" ] }
 
 [lib]
 crate_type = ["cdylib"]
@@ -126,8 +126,8 @@ Middleware libraries can instead look at using the [ndk-context](https://crates.
 The steps to switch a simple standalone application over from `ndk-glue` to `android-activity` (still based on `NativeActivity`) should be:
 
 1. Remove `ndk-glue` from your Cargo.toml
-2. Add a dependency on `android-activity`, like `android-activity = { version="0.4", features = [ "native-activity" ] }`
-3. Optionally add a dependency on `android_logger = "0.11.0"`
+2. Add a dependency on `android-activity`, like `android-activity = { version="0.5", features = [ "native-activity" ] }`
+3. Optionally add a dependency on `android_logger = "0.13.0"`
 4. Update the `main` entry point to look like this:
 
 ```rust

From e14d2c1debf342b4288c7f9c0a3419238fec16ed Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Sat, 4 Nov 2023 22:40:15 +0100
Subject: [PATCH 56/93] README: Fix MSRV badge

---
 .github/workflows/ci.yml | 8 ++++----
 README.md                | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b74a9a5..ab0d5de 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,13 +17,13 @@ jobs:
       fail-fast: false
       matrix:
         # See top README for MSRV policy
-        rust_version: [1.68.0, stable]
+        rust-version: [1.68.0, stable]
     steps:
       - uses: actions/checkout@v4
 
       - uses: hecrj/setup-rust-action@v2
         with:
-          rust-version: ${{ matrix.rust_version }}
+          rust-version: ${{ matrix.rust-version }}
 
       - name: Install Rust targets
         run: >
@@ -57,7 +57,7 @@ jobs:
           build --features native-activity
 
       - name: Build agdk-mainloop example
-        if: matrix.rust_version == 'stable'
+        if: matrix.rust-version == 'stable'
         working-directory: examples/agdk-mainloop
         run: >
           cargo ndk
@@ -68,7 +68,7 @@ jobs:
           -o app/src/main/jniLibs/ -- build
 
       - name: Build na-mainloop example
-        if: matrix.rust_version == 'stable'
+        if: matrix.rust-version == 'stable'
         working-directory: examples/na-mainloop
         run: >
           cargo ndk
diff --git a/README.md b/README.md
index 783bbd8..910fda9 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![ci](https://github.com/rust-mobile/android-activity/actions/workflows/ci.yml/badge.svg)](https://github.com/rust-mobile/android-activity/actions/workflows/ci.yml)
 [![crates.io](https://img.shields.io/crates/v/android-activity.svg)](https://crates.io/crates/android-activity)
 [![Docs](https://docs.rs/android-activity/badge.svg)](https://docs.rs/android-activity)
-[![MSRV](https://img.shields.io/badge/rustc-1.64.0+-ab6000.svg)](https://blog.rust-lang.org/2022/09/22/Rust-1.64.0.html)
+[![MSRV](https://img.shields.io/badge/rustc-1.68.0+-ab6000.svg)](https://blog.rust-lang.org/2023/03/09/Rust-1.68.0.html)
 
 ## Overview
 
@@ -157,8 +157,8 @@ Prior to working on android-activity, the existing glue crates available for bui
 ## MSRV
 
 We aim to (at least) support stable releases of Rust from the last three months. Rust has a 6 week release cycle which means we will support the last three stable releases.
-For example, when Rust 1.69 is released we would limit our `rust_version` to 1.67.
+For example, when Rust 1.69 is released we would limit our `rust-version` to 1.67.
 
-We will only bump the `rust_version` at the point where we either depend on a new features or a dependency has increased its MSRV, and we won't be greedy. In other words we will only set the MSRV to the lowest version that's _needed_.
+We will only bump the `rust-version` at the point where we either depend on a new features or a dependency has increased its MSRV, and we won't be greedy. In other words we will only set the MSRV to the lowest version that's _needed_.
 
-MSRV updates are not considered to be inherently semver breaking (unless a new feature is exposed in the public API) and so a `rust_version` change may happen in patch releases.
+MSRV updates are not considered to be inherently semver breaking (unless a new feature is exposed in the public API) and so a `rust-version` change may happen in patch releases.

From c2f467c17418c9279341f7a8d80dd407d5e53e92 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 26 Oct 2023 11:58:51 +0200
Subject: [PATCH 57/93] Name spawned threads

Name spawned threads to make things more clear during debugging and
profiling.
---
 android-activity/src/game_activity/mod.rs    | 34 ++++++++++++--------
 android-activity/src/native_activity/glue.rs | 34 ++++++++++++--------
 2 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index f9904d1..3465449 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -925,21 +925,24 @@ pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
             File::from_raw_fd(logpipe[0])
         };
 
-        thread::spawn(move || {
-            let tag = CStr::from_bytes_with_nul(b"RustStdoutStderr\0").unwrap();
-            let mut reader = BufReader::new(file);
-            let mut buffer = String::new();
-            loop {
-                buffer.clear();
-                if let Ok(len) = reader.read_line(&mut buffer) {
-                    if len == 0 {
-                        break;
-                    } else if let Ok(msg) = CString::new(buffer.clone()) {
-                        android_log(Level::Info, tag, &msg);
+        thread::Builder::new()
+            .name("android-stdio".to_string())
+            .spawn(move || {
+                let tag = CStr::from_bytes_with_nul(b"RustStdoutStderr\0").unwrap();
+                let mut reader = BufReader::new(file);
+                let mut buffer = String::new();
+                loop {
+                    buffer.clear();
+                    if let Ok(len) = reader.read_line(&mut buffer) {
+                        if len == 0 {
+                            break;
+                        } else if let Ok(msg) = CString::new(buffer.clone()) {
+                            android_log(Level::Info, tag, &msg);
+                        }
                     }
                 }
-            }
-        });
+            })
+            .unwrap();
 
         let jvm = unsafe {
             let jvm = (*(*native_app).activity).vm;
@@ -955,6 +958,11 @@ pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
         };
 
         unsafe {
+            // Name thread - this needs to happen here after attaching to a JVM thread,
+            // since that changes the thread name to something like "Thread-2".
+            let thread_name = CStr::from_bytes_with_nul(b"android-main\0").unwrap();
+            libc::pthread_setname_np(libc::pthread_self(), thread_name.as_ptr());
+
             let app = AndroidApp::from_ptr(NonNull::new(native_app).unwrap(), jvm.clone());
 
             // We want to specifically catch any panic from the application's android_main
diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index 003eaa5..eaa2b17 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -845,21 +845,24 @@ extern "C" fn ANativeActivity_onCreate(
             File::from_raw_fd(logpipe[0])
         };
 
-        std::thread::spawn(move || {
-            let tag = CStr::from_bytes_with_nul(b"RustStdoutStderr\0").unwrap();
-            let mut reader = BufReader::new(file);
-            let mut buffer = String::new();
-            loop {
-                buffer.clear();
-                if let Ok(len) = reader.read_line(&mut buffer) {
-                    if len == 0 {
-                        break;
-                    } else if let Ok(msg) = CString::new(buffer.clone()) {
-                        android_log(Level::Info, tag, &msg);
+        std::thread::Builder::new()
+            .name("android-stdio".to_string())
+            .spawn(move || {
+                let tag = CStr::from_bytes_with_nul(b"RustStdoutStderr\0").unwrap();
+                let mut reader = BufReader::new(file);
+                let mut buffer = String::new();
+                loop {
+                    buffer.clear();
+                    if let Ok(len) = reader.read_line(&mut buffer) {
+                        if len == 0 {
+                            break;
+                        } else if let Ok(msg) = CString::new(buffer.clone()) {
+                            android_log(Level::Info, tag, &msg);
+                        }
                     }
                 }
-            }
-        });
+            })
+            .unwrap();
 
         log::trace!(
             "Creating: {:p}, saved_state = {:p}, save_state_size = {}",
@@ -899,6 +902,11 @@ extern "C" fn ANativeActivity_onCreate(
             rust_glue.notify_main_thread_running();
 
             unsafe {
+                // Name thread - this needs to happen here after attaching to a JVM thread,
+                // since that changes the thread name to something like "Thread-2".
+                let thread_name = CStr::from_bytes_with_nul(b"android-main\0").unwrap();
+                libc::pthread_setname_np(libc::pthread_self(), thread_name.as_ptr());
+
                 // We want to specifically catch any panic from the application's android_main
                 // so we can finish + destroy the Activity gracefully via the JVM
                 catch_unwind(|| {

From d9af67008a03118027c72a1285cfb362b6fe510d Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 20 Nov 2023 12:48:37 +0100
Subject: [PATCH 58/93] Rename threads

---
 android-activity/src/game_activity/mod.rs    | 4 ++--
 android-activity/src/native_activity/glue.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index 3465449..56df05b 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -926,7 +926,7 @@ pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
         };
 
         thread::Builder::new()
-            .name("android-stdio".to_string())
+            .name("stdio-to-logcat".to_string())
             .spawn(move || {
                 let tag = CStr::from_bytes_with_nul(b"RustStdoutStderr\0").unwrap();
                 let mut reader = BufReader::new(file);
@@ -960,7 +960,7 @@ pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
         unsafe {
             // Name thread - this needs to happen here after attaching to a JVM thread,
             // since that changes the thread name to something like "Thread-2".
-            let thread_name = CStr::from_bytes_with_nul(b"android-main\0").unwrap();
+            let thread_name = CStr::from_bytes_with_nul(b"android_main\0").unwrap();
             libc::pthread_setname_np(libc::pthread_self(), thread_name.as_ptr());
 
             let app = AndroidApp::from_ptr(NonNull::new(native_app).unwrap(), jvm.clone());
diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index eaa2b17..8680982 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -846,7 +846,7 @@ extern "C" fn ANativeActivity_onCreate(
         };
 
         std::thread::Builder::new()
-            .name("android-stdio".to_string())
+            .name("stdio-to-logcat".to_string())
             .spawn(move || {
                 let tag = CStr::from_bytes_with_nul(b"RustStdoutStderr\0").unwrap();
                 let mut reader = BufReader::new(file);
@@ -904,7 +904,7 @@ extern "C" fn ANativeActivity_onCreate(
             unsafe {
                 // Name thread - this needs to happen here after attaching to a JVM thread,
                 // since that changes the thread name to something like "Thread-2".
-                let thread_name = CStr::from_bytes_with_nul(b"android-main\0").unwrap();
+                let thread_name = CStr::from_bytes_with_nul(b"android_main\0").unwrap();
                 libc::pthread_setname_np(libc::pthread_self(), thread_name.as_ptr());
 
                 // We want to specifically catch any panic from the application's android_main

From a84722ff2352da0f06e4fe698a65c6d01885cbd9 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Sat, 4 Nov 2023 22:49:07 +0100
Subject: [PATCH 59/93] Clean up a `let-else` that is possible in Rust 1.68

---
 android-activity/src/game_activity/mod.rs   | 12 +++++-------
 android-activity/src/lib.rs                 |  2 ++
 android-activity/src/native_activity/mod.rs |  6 +-----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index f9904d1..c5e6c97 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -768,18 +768,16 @@ impl<'a> From<Arc<InputReceiver>> for InputIteratorInner<'a> {
         let buffered = unsafe {
             let app_ptr = receiver.native_app.as_ptr();
             let input_buffer = ffi::android_app_swap_input_buffers(app_ptr);
-            if input_buffer.is_null() {
-                None
-            } else {
-                let buffer = InputBuffer::from_ptr(NonNull::new_unchecked(input_buffer));
+            NonNull::new(input_buffer).map(|input_buffer| {
+                let buffer = InputBuffer::from_ptr(input_buffer);
                 let keys_iter = KeyEventsLendingIterator::new(&buffer);
                 let motion_iter = MotionEventsLendingIterator::new(&buffer);
-                Some(BufferedEvents::<'a> {
+                BufferedEvents::<'a> {
                     buffer,
                     keys_iter,
                     motion_iter,
-                })
-            }
+                }
+            })
         };
 
         let native_app = receiver.native_app.clone();
diff --git a/android-activity/src/lib.rs b/android-activity/src/lib.rs
index f38fc67..6095108 100644
--- a/android-activity/src/lib.rs
+++ b/android-activity/src/lib.rs
@@ -112,6 +112,8 @@
 //! [`GameActivity`]: https://developer.android.com/games/agdk/integrate-game-activity
 //! [Looper]: https://developer.android.com/reference/android/os/Looper
 
+#![deny(clippy::manual_let_else)]
+
 use std::hash::Hash;
 use std::sync::Arc;
 use std::sync::RwLock;
diff --git a/android-activity/src/native_activity/mod.rs b/android-activity/src/native_activity/mod.rs
index 7776e3b..8a95cc0 100644
--- a/android-activity/src/native_activity/mod.rs
+++ b/android-activity/src/native_activity/mod.rs
@@ -485,11 +485,7 @@ impl<'a> InputIteratorInner<'a> {
     where
         F: FnOnce(&input::InputEvent) -> InputStatus,
     {
-        // XXX: would use `let Some(queue) = &self.receiver.queue else { return
-        // false; }` but we're stuck supporting Rust 1.64 for Winit currently
-        let queue = if let Some(queue) = &self.receiver.queue {
-            queue
-        } else {
+        let Some(queue) = &self.receiver.queue else {
             log::trace!("no queue available for events");
             return false;
         };

From af341897a2d239dc031ee8999b5549af0bc039d1 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Mon, 16 Oct 2023 18:38:02 +0200
Subject: [PATCH 60/93] Generalize log-forwarding setup and stop thread on IO
 errors

When `read_line()` starts returning `Err` the current `if let Ok`
condition ignores those, likely causing the `loop` to spin indefinitely
while this function keeps returning errors.

Note that we don't currently store the join handle for this thread
anywhere, so won't see the error surface either (just like how the join
handle for the main thread is never checked).  Perhaps we should call
`log::error!()` to make the user aware that their IO logging has
mysteriously terminated.
---
 android-activity/src/game_activity/mod.rs    | 46 ++++---------------
 android-activity/src/native_activity/glue.rs | 35 +--------------
 android-activity/src/util.rs                 | 47 +++++++++++++++++++-
 3 files changed, 55 insertions(+), 73 deletions(-)

diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index f9904d1..1414766 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -1,21 +1,17 @@
 #![cfg(feature = "game-activity")]
 
 use std::collections::HashMap;
-use std::ffi::{CStr, CString};
-use std::fs::File;
-use std::io::{BufRead, BufReader};
 use std::marker::PhantomData;
 use std::ops::Deref;
-use std::os::unix::prelude::*;
 use std::panic::catch_unwind;
+use std::ptr;
 use std::ptr::NonNull;
 use std::sync::Weak;
 use std::sync::{Arc, Mutex, RwLock};
 use std::time::Duration;
-use std::{ptr, thread};
 
 use libc::c_void;
-use log::{error, trace, Level};
+use log::{error, trace};
 
 use jni_sys::*;
 
@@ -29,9 +25,9 @@ use ndk::native_window::NativeWindow;
 use crate::error::InternalResult;
 use crate::input::{Axis, KeyCharacterMap, KeyCharacterMapBinding};
 use crate::jni_utils::{self, CloneJavaVM};
-use crate::util::{abort_on_panic, android_log, log_panic};
+use crate::util::{abort_on_panic, forward_stdio_to_logcat, log_panic, try_get_path_from_ptr};
 use crate::{
-    util, AndroidApp, ConfigurationRef, InputStatus, MainEvent, PollEvent, Rect, WindowManagerFlags,
+    AndroidApp, ConfigurationRef, InputStatus, MainEvent, PollEvent, Rect, WindowManagerFlags,
 };
 
 mod ffi;
@@ -617,21 +613,21 @@ impl AndroidAppInner {
     pub fn internal_data_path(&self) -> Option<std::path::PathBuf> {
         unsafe {
             let app_ptr = self.native_app.as_ptr();
-            util::try_get_path_from_ptr((*(*app_ptr).activity).internalDataPath)
+            try_get_path_from_ptr((*(*app_ptr).activity).internalDataPath)
         }
     }
 
     pub fn external_data_path(&self) -> Option<std::path::PathBuf> {
         unsafe {
             let app_ptr = self.native_app.as_ptr();
-            util::try_get_path_from_ptr((*(*app_ptr).activity).externalDataPath)
+            try_get_path_from_ptr((*(*app_ptr).activity).externalDataPath)
         }
     }
 
     pub fn obb_path(&self) -> Option<std::path::PathBuf> {
         unsafe {
             let app_ptr = self.native_app.as_ptr();
-            util::try_get_path_from_ptr((*(*app_ptr).activity).obbPath)
+            try_get_path_from_ptr((*(*app_ptr).activity).obbPath)
         }
     }
 }
@@ -913,33 +909,7 @@ extern "Rust" {
 #[no_mangle]
 pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
     abort_on_panic(|| {
-        // Maybe make this stdout/stderr redirection an optional / opt-in feature?...
-
-        let file = {
-            let mut logpipe: [RawFd; 2] = Default::default();
-            libc::pipe2(logpipe.as_mut_ptr(), libc::O_CLOEXEC);
-            libc::dup2(logpipe[1], libc::STDOUT_FILENO);
-            libc::dup2(logpipe[1], libc::STDERR_FILENO);
-            libc::close(logpipe[1]);
-
-            File::from_raw_fd(logpipe[0])
-        };
-
-        thread::spawn(move || {
-            let tag = CStr::from_bytes_with_nul(b"RustStdoutStderr\0").unwrap();
-            let mut reader = BufReader::new(file);
-            let mut buffer = String::new();
-            loop {
-                buffer.clear();
-                if let Ok(len) = reader.read_line(&mut buffer) {
-                    if len == 0 {
-                        break;
-                    } else if let Ok(msg) = CString::new(buffer.clone()) {
-                        android_log(Level::Info, tag, &msg);
-                    }
-                }
-            }
-        });
+        let _join_log_forwarder = forward_stdio_to_logcat();
 
         let jvm = unsafe {
             let jvm = (*(*native_app).activity).vm;
diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index 003eaa5..30f4843 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -3,23 +3,17 @@
 //! synchronization between the two threads.
 
 use std::{
-    ffi::{CStr, CString},
-    fs::File,
-    io::{BufRead, BufReader},
     ops::Deref,
-    os::unix::prelude::{FromRawFd, RawFd},
     panic::catch_unwind,
     ptr::{self, NonNull},
     sync::{Arc, Condvar, Mutex, Weak},
 };
 
-use log::Level;
 use ndk::{configuration::Configuration, input_queue::InputQueue, native_window::NativeWindow};
 
 use crate::{
     jni_utils::CloneJavaVM,
-    util::android_log,
-    util::{abort_on_panic, log_panic},
+    util::{abort_on_panic, forward_stdio_to_logcat, log_panic},
     ConfigurationRef,
 };
 
@@ -834,32 +828,7 @@ extern "C" fn ANativeActivity_onCreate(
     saved_state_size: libc::size_t,
 ) {
     abort_on_panic(|| {
-        // Maybe make this stdout/stderr redirection an optional / opt-in feature?...
-        let file = unsafe {
-            let mut logpipe: [RawFd; 2] = Default::default();
-            libc::pipe2(logpipe.as_mut_ptr(), libc::O_CLOEXEC);
-            libc::dup2(logpipe[1], libc::STDOUT_FILENO);
-            libc::dup2(logpipe[1], libc::STDERR_FILENO);
-            libc::close(logpipe[1]);
-
-            File::from_raw_fd(logpipe[0])
-        };
-
-        std::thread::spawn(move || {
-            let tag = CStr::from_bytes_with_nul(b"RustStdoutStderr\0").unwrap();
-            let mut reader = BufReader::new(file);
-            let mut buffer = String::new();
-            loop {
-                buffer.clear();
-                if let Ok(len) = reader.read_line(&mut buffer) {
-                    if len == 0 {
-                        break;
-                    } else if let Ok(msg) = CString::new(buffer.clone()) {
-                        android_log(Level::Info, tag, &msg);
-                    }
-                }
-            }
-        });
+        let _join_log_forwarder = forward_stdio_to_logcat();
 
         log::trace!(
             "Creating: {:p}, saved_state = {:p}, save_state_size = {}",
diff --git a/android-activity/src/util.rs b/android-activity/src/util.rs
index 6e04758..b7e774d 100644
--- a/android-activity/src/util.rs
+++ b/android-activity/src/util.rs
@@ -1,7 +1,12 @@
-use log::Level;
+use log::{error, Level};
 use std::{
     ffi::{CStr, CString},
-    os::raw::c_char,
+    fs::File,
+    io::{BufRead as _, BufReader, Result},
+    os::{
+        fd::{FromRawFd as _, RawFd},
+        raw::c_char,
+    },
 };
 
 pub fn try_get_path_from_ptr(path: *const c_char) -> Option<std::path::PathBuf> {
@@ -31,6 +36,44 @@ pub(crate) fn android_log(level: Level, tag: &CStr, msg: &CStr) {
     }
 }
 
+pub(crate) fn forward_stdio_to_logcat() -> std::thread::JoinHandle<Result<()>> {
+    // XXX: make this stdout/stderr redirection an optional / opt-in feature?...
+
+    let file = unsafe {
+        let mut logpipe: [RawFd; 2] = Default::default();
+        libc::pipe2(logpipe.as_mut_ptr(), libc::O_CLOEXEC);
+        libc::dup2(logpipe[1], libc::STDOUT_FILENO);
+        libc::dup2(logpipe[1], libc::STDERR_FILENO);
+        libc::close(logpipe[1]);
+
+        File::from_raw_fd(logpipe[0])
+    };
+
+    std::thread::Builder::new()
+        .name("stdio-to-logcat".to_string())
+        .spawn(move || -> Result<()> {
+            let tag = CStr::from_bytes_with_nul(b"RustStdoutStderr\0").unwrap();
+            let mut reader = BufReader::new(file);
+            let mut buffer = String::new();
+            loop {
+                buffer.clear();
+                let len = match reader.read_line(&mut buffer) {
+                    Ok(len) => len,
+                    Err(e) => {
+                        error!("Logcat forwarder failed to read stdin/stderr: {e:?}");
+                        break Err(e);
+                    }
+                };
+                if len == 0 {
+                    break Ok(());
+                } else if let Ok(msg) = CString::new(buffer.clone()) {
+                    android_log(Level::Info, tag, &msg);
+                }
+            }
+        })
+        .expect("Failed to start stdout/stderr to logcat forwarder thread")
+}
+
 pub(crate) fn log_panic(panic: Box<dyn std::any::Any + Send>) {
     let rust_panic = unsafe { CStr::from_bytes_with_nul_unchecked(b"RustPanic\0") };
 

From eeeb80209fb5daa2848b76c1fe1e1da08fe8f65e Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 20 Nov 2023 15:36:04 +0100
Subject: [PATCH 61/93] Fix error after merge conflict

---
 android-activity/src/game_activity/mod.rs    | 2 +-
 android-activity/src/native_activity/glue.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index c4e5561..5fc0a99 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -927,7 +927,7 @@ pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
         unsafe {
             // Name thread - this needs to happen here after attaching to a JVM thread,
             // since that changes the thread name to something like "Thread-2".
-            let thread_name = CStr::from_bytes_with_nul(b"android_main\0").unwrap();
+            let thread_name = std::ffi::CStr::from_bytes_with_nul(b"android_main\0").unwrap();
             libc::pthread_setname_np(libc::pthread_self(), thread_name.as_ptr());
 
             let app = AndroidApp::from_ptr(NonNull::new(native_app).unwrap(), jvm.clone());
diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index 8fdb280..2838d6a 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -870,7 +870,7 @@ extern "C" fn ANativeActivity_onCreate(
             unsafe {
                 // Name thread - this needs to happen here after attaching to a JVM thread,
                 // since that changes the thread name to something like "Thread-2".
-                let thread_name = CStr::from_bytes_with_nul(b"android_main\0").unwrap();
+                let thread_name = std::ffi::CStr::from_bytes_with_nul(b"android_main\0").unwrap();
                 libc::pthread_setname_np(libc::pthread_self(), thread_name.as_ptr());
 
                 // We want to specifically catch any panic from the application's android_main

From 672360c5e6ac55f2c9707885cd8938d23de79bfa Mon Sep 17 00:00:00 2001
From: Arthur Cosentino <arthurcose@gmail.com>
Date: Wed, 13 Dec 2023 09:05:59 -0500
Subject: [PATCH 62/93] Fix multitouch MotionActions processing as unknown in
 native activities

---
 android-activity/src/native_activity/input.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android-activity/src/native_activity/input.rs b/android-activity/src/native_activity/input.rs
index fcab382..3f15e35 100644
--- a/android-activity/src/native_activity/input.rs
+++ b/android-activity/src/native_activity/input.rs
@@ -55,7 +55,8 @@ impl<'a> MotionEvent<'a> {
         // `MotionAction` enum that we share between backends, which may also
         // capture unknown variants added in new versions of Android.
         let action =
-            unsafe { ndk_sys::AMotionEvent_getAction(self.ndk_event.ptr().as_ptr()) as u32 };
+            unsafe { ndk_sys::AMotionEvent_getAction(self.ndk_event.ptr().as_ptr()) as u32 }
+                & ndk_sys::AMOTION_EVENT_ACTION_MASK;
         action.into()
     }
 

From 5cb67a2b89a739abe6d014e69b3b23bbe8f01dd8 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Wed, 20 Dec 2023 17:10:20 +0000
Subject: [PATCH 63/93] Remove ndk dev-dependency added in #142

Although this crate has some examples that depend on the ndk, they
aren't regular Cargo examples, they are completely standalone apps
that depend on dev-dependencies.
---
 android-activity/Cargo.toml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 1441a0b..9ffc84d 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -54,6 +54,3 @@ targets = [
 ]
 
 rustdoc-args = ["--cfg", "docsrs"]
-
-[dev-dependencies]
-ndk = "0.8.0"

From 35e080baf036e26d55a430af2e52c479f6c0480b Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Wed, 20 Dec 2023 15:48:05 +0000
Subject: [PATCH 64/93] Release 0.5.1

---
 android-activity/CHANGELOG.md | 28 ++++++++++++++++++++++++++++
 android-activity/Cargo.toml   |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/android-activity/CHANGELOG.md b/android-activity/CHANGELOG.md
index 5f54509..4772175 100644
--- a/android-activity/CHANGELOG.md
+++ b/android-activity/CHANGELOG.md
@@ -6,6 +6,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.1] - 2023-12-20
+
+### Changed
+- Avoids depending on default features for `ndk` crate to avoid pulling in any `raw-window-handle` dependencies ([#142](https://github.com/rust-mobile/android-activity/pull/142))
+
+    **Note:** Technically, this could be observed as a breaking change in case you
+    were depending on the `rwh_06` feature that was enabled by default in the
+    `ndk` crate. This could be observed via the `NativeWindow` type (exposed via
+    `AndroidApp::native_window()`) no longer implementing `rwh_06::HasWindowHandle`.
+
+    In the unlikely case that you were depending on the `ndk`'s `rwh_06` API
+    being enabled by default via `android-activity`'s `ndk` dependency, your crate
+    should explicitly enable the `rwh_06` feature for the `ndk` crate.
+
+    As far as could be seen though, it's not expected that anything was
+    depending on this (e.g. anything based on Winit enables the `ndk` feature
+    based on an equivalent `winit` feature).
+
+    The benefit of the change is that it can help avoid a redundant
+    `raw-window-handle 0.6` dependency in projects that still need to use older
+    (non-default) `raw-window-handle` versions. (Though note that this may be
+    awkward to achieve in practice since other crates that depend on the `ndk`
+    are still likely to use default features and also pull in
+    `raw-window-handles 0.6`)
+
+- The IO thread now gets named `stdio-to-logcat` and main thread is named `android_main` ([#145](https://github.com/rust-mobile/android-activity/pull/145))
+- Improved IO error handling in `stdio-to-logcat` IO loop. ([#133](https://github.com/rust-mobile/android-activity/pull/133))
+
 ## [0.5.0] - 2023-10-16
 ### Added
 - Added `MotionEvent::action_button()` exposing the button associated with button press/release actions ()
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 9ffc84d..51fb3ce 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "android-activity"
-version = "0.5.0"
+version = "0.5.1"
 edition = "2021"
 keywords = ["android", "ndk"]
 readme = "../README.md"

From 526d39c1f3c227f577706f8f00d22ccc5b06f9e4 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@impossible.com>
Date: Tue, 30 Jan 2024 12:15:21 +0000
Subject: [PATCH 65/93] Release 0.5.2

---
 android-activity/CHANGELOG.md | 6 ++++++
 android-activity/Cargo.toml   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/android-activity/CHANGELOG.md b/android-activity/CHANGELOG.md
index 4772175..153b7d1 100644
--- a/android-activity/CHANGELOG.md
+++ b/android-activity/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [0.5.2] - 2024-01-30
+
+### Fixed
+- NativeActivity: OR with `EVENT_ACTION_MASK` when extracting action from `MotionEvent` - fixing multi-touch input ([#146](https://github.com/rust-mobile/android-activity/issues/146), [#147](https://github.com/rust-mobile/android-activity/pull/147))
+
 ## [0.5.1] - 2023-12-20
 
 ### Changed
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 51fb3ce..6a0e1b1 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "android-activity"
-version = "0.5.1"
+version = "0.5.2"
 edition = "2021"
 keywords = ["android", "ndk"]
 readme = "../README.md"

From 4b9b8d754ba01cac387bac0d7dc8ef02062e5523 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@impossible.com>
Date: Tue, 30 Jan 2024 12:33:21 +0000
Subject: [PATCH 66/93] Force cargo-ndk to only be built with stable toolchain

This fixes CI builds with rust 0.68 because cargo ndk depends on
cargo platform which depends on 0.70.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ab0d5de..d84960f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,7 +34,7 @@ jobs:
           i686-linux-android
 
       - name: Install cargo-ndk
-        run: cargo install cargo-ndk
+        run: cargo +stable install cargo-ndk
 
       - name: Build game-activity
         working-directory: android-activity

From e5b8242ff25f5534162159a40a5e52ea91f7dcb3 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Fri, 26 Apr 2024 15:45:44 +0100
Subject: [PATCH 67/93] Bump MSRV to 1.69.0 considering we can't build cargo
 ndk with 1.68

cargo ndk will fail to build with 1.68 due to a toml_edit dep.

Technically android-activity itself should still build with 1.68
but it's simpler to synchronize the `rust-version` with the minimum
version that we actually test in CI (where we need to build cargo ndk)
---
 .github/workflows/ci.yml      | 2 +-
 android-activity/CHANGELOG.md | 1 +
 android-activity/Cargo.toml   | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d84960f..9cbc87f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         # See top README for MSRV policy
-        rust-version: [1.68.0, stable]
+        rust-version: [1.69.0, stable]
     steps:
       - uses: actions/checkout@v4
 
diff --git a/android-activity/CHANGELOG.md b/android-activity/CHANGELOG.md
index 153b7d1..ebd6d39 100644
--- a/android-activity/CHANGELOG.md
+++ b/android-activity/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+- rust-version bumped to 1.69.0 ([#156](https://github.com/rust-mobile/android-activity/pull/156))
 
 
 ## [0.5.2] - 2024-01-30
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 6a0e1b1..a54e413 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -10,12 +10,12 @@ documentation = "https://docs.rs/android-activity"
 description = "Glue for building Rust applications on Android with NativeActivity or GameActivity"
 license = "MIT OR Apache-2.0"
 
-# 1.68 was when Rust last updated the Android NDK version used to build the
+# 1.69 was when Rust last updated the Android NDK version used to build the
 # standard library which avoids needing the -lunwind workaround in build tools.
 #
 # We depend on cargo-ndk for building which has dropped support for the above
 # linker workaround.
-rust-version = "1.68.0"
+rust-version = "1.69.0"
 
 [features]
 # Note: we don't enable any backend by default since features

From 6a0197c28fd1d5f32cf0294bd1385c57141b8f3b Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijn@traverseresearch.nl>
Date: Fri, 26 Apr 2024 16:07:34 +0200
Subject: [PATCH 68/93] Upgrade to `ndk-sys 0.6.0` and `ndk 0.9.0`

The next breaking `ndk` release puts a lot of emphasis in improving
`enum`s to finally be marked `non_exhaustive`, and carry possible future
values in `__Unknown(i32)` variants.  This removes the lossy conversions
that previously required `android-activity` to redefine its types, which
could all be removed again.

The `repr()` types have also been updated, as `enum` constants in C are
translated to `u32` by default in `bindgen` even though they're commonly
passed as `int` to every API function that consumes them.
---
 android-activity/Cargo.toml                   |  4 ++--
 android-activity/src/native_activity/input.rs | 12 ++++--------
 android-activity/src/native_activity/mod.rs   |  1 +
 examples/agdk-mainloop/Cargo.toml             |  4 ++--
 examples/na-mainloop/Cargo.toml               |  4 ++--
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index a54e413..07471d4 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -33,8 +33,8 @@ log = "0.4"
 jni-sys = "0.3"
 cesu8 = "1"
 jni = "0.21"
-ndk-sys = "0.5.0"
-ndk = { version = "0.8.0", default-features = false }
+ndk-sys = "0.6.0"
+ndk = { version = "0.9.0", default-features = false }
 ndk-context = "0.1"
 android-properties = "0.2"
 num_enum = "0.7"
diff --git a/android-activity/src/native_activity/input.rs b/android-activity/src/native_activity/input.rs
index 3f15e35..1a1565d 100644
--- a/android-activity/src/native_activity/input.rs
+++ b/android-activity/src/native_activity/input.rs
@@ -262,13 +262,8 @@ impl<'a> PointerImpl<'a> {
     #[inline]
     pub fn axis_value(&self, axis: Axis) -> f32 {
         let value: u32 = axis.into();
-        if let Ok(ndk_axis) = value.try_into() {
-            self.ndk_pointer.axis_value(ndk_axis)
-        } else {
-            // FIXME: We should also be able to query `Axis::__Unknown(u32)` values
-            // that can't currently be queried via the `ndk` `Pointer` API
-            0.0f32
-        }
+        let value = value as i32;
+        self.ndk_pointer.axis_value(value.into())
     }
 
     #[inline]
@@ -283,7 +278,8 @@ impl<'a> PointerImpl<'a> {
 
     #[inline]
     pub fn tool_type(&self) -> ToolType {
-        let value: u32 = self.ndk_pointer.tool_type().into();
+        let value: i32 = self.ndk_pointer.tool_type().into();
+        let value = value as u32;
         value.into()
     }
 }
diff --git a/android-activity/src/native_activity/mod.rs b/android-activity/src/native_activity/mod.rs
index 8a95cc0..2adcd52 100644
--- a/android-activity/src/native_activity/mod.rs
+++ b/android-activity/src/native_activity/mod.rs
@@ -507,6 +507,7 @@ impl<'a> InputIteratorInner<'a> {
                     ndk::event::InputEvent::KeyEvent(e) => {
                         input::InputEvent::KeyEvent(input::KeyEvent::new(e))
                     }
+                    _ => todo!("NDK added a new type"),
                 };
 
                 // `finish_event` needs to be called for each event otherwise
diff --git a/examples/agdk-mainloop/Cargo.toml b/examples/agdk-mainloop/Cargo.toml
index c003445..ebf1197 100644
--- a/examples/agdk-mainloop/Cargo.toml
+++ b/examples/agdk-mainloop/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2021"
 log = "0.4"
 android_logger = "0.11.0"
 android-activity = { path="../../android-activity", features = ["game-activity"] }
-ndk-sys = "0.5.0"
-ndk = "0.8.0"
+ndk-sys = "0.6.0"
+ndk = "0.9.0"
 
 [lib]
 name="main"
diff --git a/examples/na-mainloop/Cargo.toml b/examples/na-mainloop/Cargo.toml
index 131b865..f7cea94 100644
--- a/examples/na-mainloop/Cargo.toml
+++ b/examples/na-mainloop/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2021"
 log = "0.4"
 android_logger = "0.11.0"
 android-activity = { path="../../android-activity", features = [ "native-activity" ] }
-ndk-sys = "0.5.0"
-ndk = "0.8.0"
+ndk-sys = "0.6.0"
+ndk = "0.9.0"
 
 [lib]
 #name="na_mainloop"

From 7bd3ba6dde3f0360da5b1084dfb6ea8d54e85b16 Mon Sep 17 00:00:00 2001
From: SkyGrel19 <skibav2002@gmail.com>
Date: Wed, 14 Feb 2024 22:59:55 +0300
Subject: [PATCH 69/93] native-activity: Check for null saved_state_in pointer

Avoids calling `std::slice::from_raw_parts` with a null `saved_state_in`
pointer.

Fixes: #153
---
 android-activity/src/native_activity/glue.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index 2838d6a..2e4371c 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -337,8 +337,12 @@ impl WaitableNativeActivityState {
             }
         }
 
-        let saved_state =
-            unsafe { std::slice::from_raw_parts(saved_state_in as *const u8, saved_state_size) };
+        let saved_state = if saved_state_in.is_null() {
+            Vec::new()
+        } else {
+            unsafe { std::slice::from_raw_parts(saved_state_in as *const u8, saved_state_size) }
+                .to_vec()
+        };
 
         let config = unsafe {
             let config = ndk_sys::AConfiguration_new();
@@ -357,7 +361,7 @@ impl WaitableNativeActivityState {
                 msg_read: msgpipe[0],
                 msg_write: msgpipe[1],
                 config,
-                saved_state: saved_state.into(),
+                saved_state,
                 input_queue: ptr::null_mut(),
                 window: None,
                 content_rect: Rect::empty().into(),

From 0a87a84c57d72970aaf972ca00dfc344a8c45f27 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Fri, 26 Apr 2024 16:47:21 +0100
Subject: [PATCH 70/93] Release 0.6.0

---
 android-activity/CHANGELOG.md | 29 +++++++++++++++++++++++++----
 android-activity/Cargo.toml   |  2 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/android-activity/CHANGELOG.md b/android-activity/CHANGELOG.md
index ebd6d39..3d3524b 100644
--- a/android-activity/CHANGELOG.md
+++ b/android-activity/CHANGELOG.md
@@ -5,8 +5,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [0.6.0] - 2024-04-26
+
+### Changed
 - rust-version bumped to 1.69.0 ([#156](https://github.com/rust-mobile/android-activity/pull/156))
+- Upgrade to `ndk-sys 0.6.0` and `ndk 0.9.0` ([#155](https://github.com/rust-mobile/android-activity/pull/155))
 
+### Fixed
+- Check for null `saved_state_in` pointer from `NativeActivity`
 
 ## [0.5.2] - 2024-01-30
 
@@ -177,21 +184,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 - Most of the examples were moved to <https://github.com/rust-mobile/rust-android-examples> ([#50](https://github.com/rust-mobile/android-activity/pull/50))
 
-## [0.4] - 2022-11-10
+## [0.4.0] - 2022-11-10
 ### Changed
 - *Breaking*: `input_events` callback now return whether an event was handled or not to allow for fallback handling ([#31](https://github.com/rust-mobile/android-activity/issues/31))
 - The native-activity backend is now implemented in Rust only, without building on `android_native_app_glue.c` ([#35](https://github.com/rust-mobile/android-activity/pull/35))
 ### Added
 - Added `Pointer::tool_type()` API to `GameActivity` backend for compatibility with `ndk` events API ([#38](https://github.com/rust-mobile/android-activity/pull/38))
 
-## [0.3] - 2022-09-15
+## [0.3.0] - 2022-09-15
 ### Added
 - `show/hide_sot_input` API for being able to show/hide a soft keyboard (other IME still pending)
 - `set_window_flags()` API for setting WindowManager params
 ### Changed
 - *Breaking*: Created extensible, `#[non_exhaustive]` `InputEvent` wrapper enum instead of exposing `ndk` type directly
 
-## [0.2] - 2022-08-25
+## [0.2.0] - 2022-08-25
 ### Added
 - Emit an `InputAvailable` event for new input with `NativeActivity` and `GameActivity`
   enabling gui apps that don't render continuously
@@ -208,6 +215,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Documentation fixes
 
-## [0.1] - 2022-07-04
+## [0.1.0] - 2022-07-04
 ### Added
 - Initial release
+
+[unreleased]: https://github.com/rust-mobile/android-activity/compare/v0.6.0...HEAD
+[0.6.0]: https://github.com/rust-mobile/android-activity/compare/v0.5.2...v0.6.0
+[0.5.2]: https://github.com/rust-mobile/android-activity/compare/v0.5.1...v0.5.2
+[0.5.1]: https://github.com/rust-mobile/android-activity/compare/v0.5.0...v0.5.1
+[0.5.0]: https://github.com/rust-mobile/android-activity/compare/v0.4.3...v0.5.0
+[0.4.3]: https://github.com/rust-mobile/android-activity/compare/v0.4.2...v0.4.3
+[0.4.2]: https://github.com/rust-mobile/android-activity/compare/v0.4.1...v0.4.2
+[0.4.1]: https://github.com/rust-mobile/android-activity/compare/v0.4.0...v0.4.1
+[0.4.0]: https://github.com/rust-mobile/android-activity/compare/v0.3.0...v0.4.0
+[0.3.0]: https://github.com/rust-mobile/android-activity/compare/v0.2.0...v0.3.0
+[0.2.0]: https://github.com/rust-mobile/android-activity/compare/v0.1.1...v0.2.0
+[0.1.1]: https://github.com/rust-mobile/android-activity/compare/v0.1.0...v0.1.1
+[0.1.0]: https://github.com/rust-mobile/android-activity/releases/tag/v0.1.0
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 07471d4..59b0b54 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "android-activity"
-version = "0.5.2"
+version = "0.6.0"
 edition = "2021"
 keywords = ["android", "ndk"]
 readme = "../README.md"

From fe171bc532b9dcf33c3f491616fed90adab40e85 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Mon, 27 Jan 2025 17:14:13 +0100
Subject: [PATCH 71/93] Fix various codebase rots (stale CI, new Rust lints,
 broken MSRV checks by transitive dependency upgrades) (#164)

* game_activity/ffi: Drop cfg for inexistant `target_arch = "armv7"`

[Rust 1.80 from July 25th 2024] points out that `armv7` is not a known,
valid value for the `target_arch` cfg variable.  This is confirmed by
the docs not listing it either:
https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch

Hence drop this entirely, and rely purely on `target_arch = "arm"`.

[Rust 1.80 from July 25th 2024]: https://blog.rust-lang.org/2024/07/25/Rust-1.80.0.html

* Fix `unexpected-cfgs` by adding `api-level-30` feature and removing `test`

Some code copied from the NDK carried over the respective `feature`
`cfg` guards, without ever adding the feature to the `[features]` list
in `Cargo.toml`.  Now that Rust detects these mishaps, we can fix it
by removing `test` (bindings don't seem to be run-tested) and reexpose
`ConfigurationRef::screen_round()` which was behind a previously
unsettable `feature = "api-level-30"`.

Also remove `unsafe impl Send/Sync for ConfigurationRef` since the
upstream `ndk` already declares `Configuration` to be `Send` and `Sync`,
and `RwLock` and `Arc` carry that through.

* native_activity: Fix clippy lints around `NativeActivityGlue` not `SendSync` and unwritten `redraw_needed` field

* CI: Remove deprecated/unmaintained `actions-rs` toolchain setup

The `actions-rs` containers haven't been maintained and updated for
years and don't need to: GitHub's actions environment already comes
fully loaded with a complete `stable` Rust installation with the
standard tools (in this case `rustfmt`).  Remove the remaining toolchain
setup (which was already replaced with `hecrj/setup-rust-action`
elsewhere) to get rid of ancient Node 12 deprecation warnings.

* Bump dependency patch-versions to fix `-Zminimal-versions` and MSRV check

Use `-Zminimal-versions` in our MSRV check.  This not only ensures
our minimum version bounds are actually solid and tested (even if
they may be a bit conservative at times, i.e. we could allow older
versions except for the crates that are bumped in this patch which were
explicitly build-tested), it also allows us to use this as a base for
the MSRV test, and preempt us from failing it whenever a (transitive!)
dependency bumps its MSRV beyond ours in a *semver-compatible* release.

* Elide redundant `impl` block lifetimes following stricter Rust 1.83 lint

Rust now points out that `impl<'a> (Trait for) Struct<'a>` is
superfluous whenever `'a` is not used anywhere else in the `impl` block.
---
 .github/workflows/ci.yml                      | 21 ++++++++++++-------
 android-activity/Cargo.toml                   |  7 ++++---
 android-activity/src/config.rs                | 13 ++++++------
 android-activity/src/game_activity/ffi.rs     | 11 ++++------
 android-activity/src/game_activity/input.rs   |  6 +++---
 android-activity/src/game_activity/mod.rs     |  8 +++----
 android-activity/src/input.rs                 |  6 +++---
 android-activity/src/lib.rs                   | 15 +++++++++----
 android-activity/src/native_activity/glue.rs  |  8 +++----
 android-activity/src/native_activity/input.rs |  8 +++----
 android-activity/src/native_activity/mod.rs   |  6 +++---
 11 files changed, 60 insertions(+), 49 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9cbc87f..dc7f708 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,6 +21,20 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      # Downgrade all dependencies to their minimum version, both to ensure our
+      # minimum version bounds are correct and buildable, as well as to satisfy
+      # our MSRV check when arbitrary dependencies bump their MSRV beyond our
+      # MSRV in a patch-release.
+      # This implies that downstream consumers can only rely on our MSRV when
+      # downgrading various (transitive) dependencies.
+      - uses: hecrj/setup-rust-action@v2
+        with:
+          rust-version: nightly
+        if: ${{ matrix.rust-version != 'stable' }}
+      - name: Downgrade dependencies
+        run: cargo +nightly generate-lockfile -Zminimal-versions
+        if: ${{ matrix.rust-version != 'stable' }}
+
       - uses: hecrj/setup-rust-action@v2
         with:
           rust-version: ${{ matrix.rust-version }}
@@ -87,13 +101,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          components: rustfmt
-
       - name: Format
         run: cargo fmt --all -- --check
         working-directory: android-activity
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 59b0b54..56e7aeb 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -27,6 +27,7 @@ rust-version = "1.69.0"
 default = []
 game-activity = []
 native-activity = []
+api-level-30 = ["ndk/api-level-30"]
 
 [dependencies]
 log = "0.4"
@@ -35,15 +36,15 @@ cesu8 = "1"
 jni = "0.21"
 ndk-sys = "0.6.0"
 ndk = { version = "0.9.0", default-features = false }
-ndk-context = "0.1"
+ndk-context = "0.1.1"
 android-properties = "0.2"
 num_enum = "0.7"
 bitflags = "2.0"
-libc = "0.2"
+libc = "0.2.139"
 thiserror = "1"
 
 [build-dependencies]
-cc = { version = "1.0", features = ["parallel"] }
+cc = { version = "1.0.42", features = ["parallel"] }
 
 [package.metadata.docs.rs]
 targets = [
diff --git a/android-activity/src/config.rs b/android-activity/src/config.rs
index 7d818ec..ab1bf1e 100644
--- a/android-activity/src/config.rs
+++ b/android-activity/src/config.rs
@@ -6,13 +6,14 @@ use ndk::configuration::{
     ScreenSize, Touchscreen, UiModeNight, UiModeType,
 };
 
-/// A (cheaply clonable) reference to this application's [`ndk::configuration::Configuration`]
+/// A runtime-replacable reference to [`ndk::configuration::Configuration`].
 ///
-/// This provides a thread-safe way to access the latest configuration state for
-/// an application without deeply copying the large [`ndk::configuration::Configuration`] struct.
+/// # Warning
 ///
-/// If the application is notified of configuration changes then those changes
-/// will become visible via pre-existing configuration references.
+/// The value held by this reference **will change** with every [`super::MainEvent::ConfigChanged`]
+/// event that is raised.  You should **not** [`Clone`] this type to compare it against a
+/// "new" [`super::AndroidApp::config()`] when that event is raised, since both point to the same
+/// internal [`ndk::configuration::Configuration`] and will be identical.
 #[derive(Clone)]
 pub struct ConfigurationRef {
     config: Arc<RwLock<Configuration>>,
@@ -28,8 +29,6 @@ impl PartialEq for ConfigurationRef {
     }
 }
 impl Eq for ConfigurationRef {}
-unsafe impl Send for ConfigurationRef {}
-unsafe impl Sync for ConfigurationRef {}
 
 impl fmt::Debug for ConfigurationRef {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
diff --git a/android-activity/src/game_activity/ffi.rs b/android-activity/src/game_activity/ffi.rs
index e3c561d..51063ff 100644
--- a/android-activity/src/game_activity/ffi.rs
+++ b/android-activity/src/game_activity/ffi.rs
@@ -16,17 +16,14 @@ use jni_sys::*;
 use libc::{pthread_cond_t, pthread_mutex_t, pthread_t};
 use ndk_sys::{AAssetManager, AConfiguration, ALooper, ALooper_callbackFunc, ANativeWindow, ARect};
 
-#[cfg(all(
-    any(target_os = "android", feature = "test"),
-    any(target_arch = "arm", target_arch = "armv7")
-))]
+#[cfg(all(any(target_os = "android"), target_arch = "arm"))]
 include!("ffi_arm.rs");
 
-#[cfg(all(any(target_os = "android", feature = "test"), target_arch = "aarch64"))]
+#[cfg(all(any(target_os = "android"), target_arch = "aarch64"))]
 include!("ffi_aarch64.rs");
 
-#[cfg(all(any(target_os = "android", feature = "test"), target_arch = "x86"))]
+#[cfg(all(any(target_os = "android"), target_arch = "x86"))]
 include!("ffi_i686.rs");
 
-#[cfg(all(any(target_os = "android", feature = "test"), target_arch = "x86_64"))]
+#[cfg(all(any(target_os = "android"), target_arch = "x86_64"))]
 include!("ffi_x86_64.rs");
diff --git a/android-activity/src/game_activity/input.rs b/android-activity/src/game_activity/input.rs
index fdf8326..66b94fe 100644
--- a/android-activity/src/game_activity/input.rs
+++ b/android-activity/src/game_activity/input.rs
@@ -263,7 +263,7 @@ pub(crate) struct PointerImpl<'a> {
     index: usize,
 }
 
-impl<'a> PointerImpl<'a> {
+impl PointerImpl<'_> {
     #[inline]
     pub fn pointer_index(&self) -> usize {
         self.index
@@ -333,7 +333,7 @@ impl<'a> Iterator for PointersIterImpl<'a> {
     }
 }
 
-impl<'a> ExactSizeIterator for PointersIterImpl<'a> {
+impl ExactSizeIterator for PointersIterImpl<'_> {
     fn len(&self) -> usize {
         self.count - self.next_index
     }
@@ -740,7 +740,7 @@ impl<'a> KeyEvent<'a> {
     }
 }
 
-impl<'a> KeyEvent<'a> {
+impl KeyEvent<'_> {
     /// Flags associated with this [`KeyEvent`].
     ///
     /// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#akeyevent_getflags)
diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index 7cf3894..fbf9929 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -84,7 +84,7 @@ impl<'a> StateSaver<'a> {
 pub struct StateLoader<'a> {
     app: &'a AndroidAppInner,
 }
-impl<'a> StateLoader<'a> {
+impl StateLoader<'_> {
     pub fn load(&self) -> Option<Vec<u8>> {
         unsafe {
             let app_ptr = self.app.native_app.as_ptr();
@@ -722,7 +722,7 @@ impl<'a> InputBuffer<'a> {
     }
 }
 
-impl<'a> Drop for InputBuffer<'a> {
+impl Drop for InputBuffer<'_> {
     fn drop(&mut self) {
         unsafe {
             ffi::android_app_clear_motion_events(self.ptr.as_ptr());
@@ -801,7 +801,7 @@ pub(crate) struct InputIteratorInner<'a> {
     text_event_checked: bool,
 }
 
-impl<'a> InputIteratorInner<'a> {
+impl InputIteratorInner<'_> {
     pub(crate) fn next<F>(&mut self, callback: F) -> bool
     where
         F: FnOnce(&input::InputEvent) -> InputStatus,
@@ -943,7 +943,7 @@ pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
                 // code to look up non-standard Java classes.
                 android_main(app);
             })
-            .unwrap_or_else(|panic| log_panic(panic));
+            .unwrap_or_else(log_panic);
 
             // Let JVM know that our Activity can be destroyed before detaching from the JVM
             //
diff --git a/android-activity/src/input.rs b/android-activity/src/input.rs
index 85a0b9f..96c7d68 100644
--- a/android-activity/src/input.rs
+++ b/android-activity/src/input.rs
@@ -912,7 +912,7 @@ pub struct InputIterator<'a> {
     pub(crate) inner: crate::activity_impl::InputIteratorInner<'a>,
 }
 
-impl<'a> InputIterator<'a> {
+impl InputIterator<'_> {
     /// Reads and handles the next input event by passing it to the given `callback`
     ///
     /// `callback` should return [`InputStatus::Unhandled`] for any input events that aren't directly
@@ -932,7 +932,7 @@ pub struct Pointer<'a> {
     pub(crate) inner: PointerImpl<'a>,
 }
 
-impl<'a> Pointer<'a> {
+impl Pointer<'_> {
     #[inline]
     pub fn pointer_index(&self) -> usize {
         self.inner.pointer_index()
@@ -1026,7 +1026,7 @@ impl<'a> Iterator for PointersIter<'a> {
     }
 }
 
-impl<'a> ExactSizeIterator for PointersIter<'a> {
+impl ExactSizeIterator for PointersIter<'_> {
     fn len(&self) -> usize {
         self.inner.len()
     }
diff --git a/android-activity/src/lib.rs b/android-activity/src/lib.rs
index 6095108..45cc887 100644
--- a/android-activity/src/lib.rs
+++ b/android-activity/src/lib.rs
@@ -268,9 +268,9 @@ pub enum MainEvent<'a> {
     /// input focus.
     LostFocus,
 
-    /// Command from main thread: the current device configuration has changed.
-    /// You can get a copy of the latest [`ndk::configuration::Configuration`] by calling
-    /// [`AndroidApp::config()`]
+    /// Command from main thread: the current device configuration has changed.  Any
+    /// reference gotten via [`AndroidApp::config()`] will automatically contain the latest
+    /// [`ndk::configuration::Configuration`].
     #[non_exhaustive]
     ConfigChanged {},
 
@@ -617,7 +617,14 @@ impl AndroidApp {
         self.inner.read().unwrap().create_waker()
     }
 
-    /// Returns a (cheaply clonable) reference to this application's [`ndk::configuration::Configuration`]
+    /// Returns a **reference** to this application's [`ndk::configuration::Configuration`].
+    ///
+    /// # Warning
+    ///
+    /// The value held by this reference **will change** with every [`MainEvent::ConfigChanged`]
+    /// event that is raised.  You should **not** [`Clone`] this type to compare it against a
+    /// "new" [`AndroidApp::config()`] when that event is raised, since both point to the same
+    /// internal [`ndk::configuration::Configuration`] and will be identical.
     pub fn config(&self) -> ConfigurationRef {
         self.inner.read().unwrap().config()
     }
diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index 2e4371c..dab3e29 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -81,12 +81,14 @@ pub struct WaitableNativeActivityState {
     pub cond: Condvar,
 }
 
+// SAFETY: ndk::NativeActivity is also SendSync.
+unsafe impl Send for WaitableNativeActivityState {}
+unsafe impl Sync for WaitableNativeActivityState {}
+
 #[derive(Debug, Clone)]
 pub struct NativeActivityGlue {
     pub inner: Arc<WaitableNativeActivityState>,
 }
-unsafe impl Send for NativeActivityGlue {}
-unsafe impl Sync for NativeActivityGlue {}
 
 impl Deref for NativeActivityGlue {
     type Target = WaitableNativeActivityState;
@@ -223,7 +225,6 @@ pub struct NativeActivityState {
     /// Set as soon as the Java main thread notifies us of an
     /// `onDestroyed` callback.
     pub destroyed: bool,
-    pub redraw_needed: bool,
     pub pending_input_queue: *mut ndk_sys::AInputQueue,
     pub pending_window: Option<NativeWindow>,
 }
@@ -370,7 +371,6 @@ impl WaitableNativeActivityState {
                 thread_state: NativeThreadState::Init,
                 app_has_saved_state: false,
                 destroyed: false,
-                redraw_needed: false,
                 pending_input_queue: ptr::null_mut(),
                 pending_window: None,
             }),
diff --git a/android-activity/src/native_activity/input.rs b/android-activity/src/native_activity/input.rs
index 1a1565d..96187ec 100644
--- a/android-activity/src/native_activity/input.rs
+++ b/android-activity/src/native_activity/input.rs
@@ -15,7 +15,7 @@ pub struct MotionEvent<'a> {
     ndk_event: ndk::event::MotionEvent,
     _lifetime: PhantomData<&'a ndk::event::MotionEvent>,
 }
-impl<'a> MotionEvent<'a> {
+impl MotionEvent<'_> {
     pub(crate) fn new(ndk_event: ndk::event::MotionEvent) -> Self {
         Self {
             ndk_event,
@@ -248,7 +248,7 @@ pub(crate) struct PointerImpl<'a> {
     ndk_pointer: ndk::event::Pointer<'a>,
 }
 
-impl<'a> PointerImpl<'a> {
+impl PointerImpl<'_> {
     #[inline]
     pub fn pointer_index(&self) -> usize {
         self.ndk_pointer.pointer_index()
@@ -303,7 +303,7 @@ impl<'a> Iterator for PointersIterImpl<'a> {
     }
 }
 
-impl<'a> ExactSizeIterator for PointersIterImpl<'a> {
+impl ExactSizeIterator for PointersIterImpl<'_> {
     fn len(&self) -> usize {
         self.ndk_pointers_iter.len()
     }
@@ -319,7 +319,7 @@ pub struct KeyEvent<'a> {
     ndk_event: ndk::event::KeyEvent,
     _lifetime: PhantomData<&'a ndk::event::KeyEvent>,
 }
-impl<'a> KeyEvent<'a> {
+impl KeyEvent<'_> {
     pub(crate) fn new(ndk_event: ndk::event::KeyEvent) -> Self {
         Self {
             ndk_event,
diff --git a/android-activity/src/native_activity/mod.rs b/android-activity/src/native_activity/mod.rs
index 2adcd52..88a9fe8 100644
--- a/android-activity/src/native_activity/mod.rs
+++ b/android-activity/src/native_activity/mod.rs
@@ -53,7 +53,7 @@ impl<'a> StateSaver<'a> {
 pub struct StateLoader<'a> {
     app: &'a AndroidAppInner,
 }
-impl<'a> StateLoader<'a> {
+impl StateLoader<'_> {
     /// Returns whatever state was saved during the last [MainEvent::SaveState] event or `None`
     pub fn load(&self) -> Option<Vec<u8>> {
         self.app.native_activity.saved_state()
@@ -465,7 +465,7 @@ pub(crate) struct InputReceiver {
     queue: Option<InputQueue>,
 }
 
-impl<'a> From<Arc<InputReceiver>> for InputIteratorInner<'a> {
+impl From<Arc<InputReceiver>> for InputIteratorInner<'_> {
     fn from(receiver: Arc<InputReceiver>) -> Self {
         Self {
             receiver,
@@ -480,7 +480,7 @@ pub(crate) struct InputIteratorInner<'a> {
     _lifetime: PhantomData<&'a ()>,
 }
 
-impl<'a> InputIteratorInner<'a> {
+impl InputIteratorInner<'_> {
     pub(crate) fn next<F>(&self, callback: F) -> bool
     where
         F: FnOnce(&input::InputEvent) -> InputStatus,

From 51d05d48c8f59a7e9a1d41c1577870842206ce32 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Mon, 27 Jan 2025 18:12:06 +0100
Subject: [PATCH 72/93] input: Replace open-coded types with `ndk::event`
 definitions (#163)

---
 android-activity/CHANGELOG.md                 |  44 +-
 android-activity/Cargo.toml                   |   1 +
 android-activity/src/game_activity/input.rs   |  24 +-
 android-activity/src/game_activity/mod.rs     |   6 +-
 android-activity/src/input.rs                 | 837 +-----------------
 android-activity/src/input/sdk.rs             |   6 +-
 android-activity/src/native_activity/input.rs |  70 +-
 7 files changed, 70 insertions(+), 918 deletions(-)

diff --git a/android-activity/CHANGELOG.md b/android-activity/CHANGELOG.md
index 3d3524b..1b1b961 100644
--- a/android-activity/CHANGELOG.md
+++ b/android-activity/CHANGELOG.md
@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- input: Replaced custom types with their `ndk` crate equivalent.
+  > [!NOTE]
+  > These types existed because the `ndk` crate didn't provide them in an extensible way.  Now that they have the `#[non_exhaustive]` flag and contain a `__Unknown(T)` variant to provide lossless conversions, and not to mention use an ABI type that matches how it is being used by most functions (when the original constants were defined in a "typeless" way), the `ndk` types are used and reexported once again.
+
+  > [!IMPORTANT]
+  > **Relevant breaking changes**:
+  > - `repr()` types for some `enum`s have changed to match the ABI type that is used by most functions that are returning or consuming this wrapper type.
+  > - `Source::is_xxx_class()` functions are replaced by querying `Source::class()` and comparing against variants from the returned `SourceClass` `bitflags` enum.
+  > - `SourceFlags::TRACKBALL` (from `Source::is_trackball_class()`) is named `SourceClass::NAVIGATION` in the `ndk`.
+
 ## [0.6.0] - 2024-04-26
 
 ### Changed
@@ -25,32 +35,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Avoids depending on default features for `ndk` crate to avoid pulling in any `raw-window-handle` dependencies ([#142](https://github.com/rust-mobile/android-activity/pull/142))
 
-    **Note:** Technically, this could be observed as a breaking change in case you
-    were depending on the `rwh_06` feature that was enabled by default in the
-    `ndk` crate. This could be observed via the `NativeWindow` type (exposed via
-    `AndroidApp::native_window()`) no longer implementing `rwh_06::HasWindowHandle`.
+  **Note:** Technically, this could be observed as a breaking change in case you
+  were depending on the `rwh_06` feature that was enabled by default in the
+  `ndk` crate. This could be observed via the `NativeWindow` type (exposed via
+  `AndroidApp::native_window()`) no longer implementing `rwh_06::HasWindowHandle`.
 
-    In the unlikely case that you were depending on the `ndk`'s `rwh_06` API
-    being enabled by default via `android-activity`'s `ndk` dependency, your crate
-    should explicitly enable the `rwh_06` feature for the `ndk` crate.
+  In the unlikely case that you were depending on the `ndk`'s `rwh_06` API
+  being enabled by default via `android-activity`'s `ndk` dependency, your crate
+  should explicitly enable the `rwh_06` feature for the `ndk` crate.
 
-    As far as could be seen though, it's not expected that anything was
-    depending on this (e.g. anything based on Winit enables the `ndk` feature
-    based on an equivalent `winit` feature).
+  As far as could be seen though, it's not expected that anything was
+  depending on this (e.g. anything based on Winit enables the `ndk` feature
+  based on an equivalent `winit` feature).
 
-    The benefit of the change is that it can help avoid a redundant
-    `raw-window-handle 0.6` dependency in projects that still need to use older
-    (non-default) `raw-window-handle` versions. (Though note that this may be
-    awkward to achieve in practice since other crates that depend on the `ndk`
-    are still likely to use default features and also pull in
-    `raw-window-handles 0.6`)
+  The benefit of the change is that it can help avoid a redundant
+  `raw-window-handle 0.6` dependency in projects that still need to use older
+  (non-default) `raw-window-handle` versions. (Though note that this may be
+  awkward to achieve in practice since other crates that depend on the `ndk`
+  are still likely to use default features and also pull in
+  `raw-window-handles 0.6`)
 
 - The IO thread now gets named `stdio-to-logcat` and main thread is named `android_main` ([#145](https://github.com/rust-mobile/android-activity/pull/145))
 - Improved IO error handling in `stdio-to-logcat` IO loop. ([#133](https://github.com/rust-mobile/android-activity/pull/133))
 
 ## [0.5.0] - 2023-10-16
 ### Added
-- Added `MotionEvent::action_button()` exposing the button associated with button press/release actions ()
+- Added `MotionEvent::action_button()` exposing the button associated with button press/release actions ([#138](https://github.com/rust-mobile/android-activity/pull/138))
 
 ### Changed
 - rust-version bumped to 0.68 ([#123](https://github.com/rust-mobile/android-activity/pull/123))
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 56e7aeb..4ea8435 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -28,6 +28,7 @@ default = []
 game-activity = []
 native-activity = []
 api-level-30 = ["ndk/api-level-30"]
+api-level-33 = ["api-level-30", "ndk/api-level-33"]
 
 [dependencies]
 log = "0.4"
diff --git a/android-activity/src/game_activity/input.rs b/android-activity/src/game_activity/input.rs
index 66b94fe..f8fac2b 100644
--- a/android-activity/src/game_activity/input.rs
+++ b/android-activity/src/game_activity/input.rs
@@ -13,10 +13,12 @@
 // The `Class` was also bound differently to `android-ndk-rs` considering how the class is defined
 // by masking bits from the `Source`.
 
+use ndk::event::ButtonState;
+
 use crate::activity_impl::ffi::{GameActivityKeyEvent, GameActivityMotionEvent};
 use crate::input::{
-    Axis, Button, ButtonState, EdgeFlags, KeyAction, KeyEventFlags, Keycode, MetaState,
-    MotionAction, MotionEventFlags, Pointer, PointersIter, Source, ToolType,
+    Axis, Button, EdgeFlags, KeyAction, KeyEventFlags, Keycode, MetaState, MotionAction,
+    MotionEventFlags, Pointer, PointersIter, Source, ToolType,
 };
 
 // Note: try to keep this wrapper API compatible with the AInputEvent API if possible
@@ -47,7 +49,7 @@ impl<'a> MotionEvent<'a> {
     ///
     #[inline]
     pub fn source(&self) -> Source {
-        let source = self.ga_event.source as u32;
+        let source = self.ga_event.source;
         source.into()
     }
 
@@ -63,7 +65,7 @@ impl<'a> MotionEvent<'a> {
     /// See [the MotionEvent docs](https://developer.android.com/reference/android/view/MotionEvent#getActionMasked())
     #[inline]
     pub fn action(&self) -> MotionAction {
-        let action = self.ga_event.action as u32 & ndk_sys::AMOTION_EVENT_ACTION_MASK;
+        let action = self.ga_event.action & ndk_sys::AMOTION_EVENT_ACTION_MASK as i32;
         action.into()
     }
 
@@ -176,6 +178,7 @@ impl<'a> MotionEvent<'a> {
     /// See [the NDK
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getbuttonstate)
     #[inline]
+    // TODO: Button enum to signify only one bitflag can be set?
     pub fn button_state(&self) -> ButtonState {
         ButtonState(self.ga_event.buttonState as u32)
     }
@@ -278,7 +281,7 @@ impl PointerImpl<'_> {
     #[inline]
     pub fn axis_value(&self, axis: Axis) -> f32 {
         let pointer = &self.event.ga_event.pointers[self.index];
-        let axis: u32 = axis.into();
+        let axis: i32 = axis.into();
         pointer.axisValues[axis as usize]
     }
 
@@ -297,8 +300,7 @@ impl PointerImpl<'_> {
     #[inline]
     pub fn tool_type(&self) -> ToolType {
         let pointer = &self.event.ga_event.pointers[self.index];
-        let tool_type = pointer.toolType as u32;
-        tool_type.into()
+        pointer.toolType.into()
     }
 }
 
@@ -665,7 +667,7 @@ impl<'a> KeyEvent<'a> {
     ///
     #[inline]
     pub fn source(&self) -> Source {
-        let source = self.ga_event.source as u32;
+        let source = self.ga_event.source;
         source.into()
     }
 
@@ -681,13 +683,13 @@ impl<'a> KeyEvent<'a> {
     /// See [the KeyEvent docs](https://developer.android.com/reference/android/view/KeyEvent#getAction())
     #[inline]
     pub fn action(&self) -> KeyAction {
-        let action = self.ga_event.action as u32;
+        let action = self.ga_event.action;
         action.into()
     }
 
     #[inline]
     pub fn action_button(&self) -> KeyAction {
-        let action = self.ga_event.action as u32;
+        let action = self.ga_event.action;
         action.into()
     }
 
@@ -717,7 +719,7 @@ impl<'a> KeyEvent<'a> {
     /// docs](https://developer.android.com/ndk/reference/group/input#akeyevent_getkeycode)
     #[inline]
     pub fn key_code(&self) -> Keycode {
-        let keycode = self.ga_event.keyCode as u32;
+        let keycode = self.ga_event.keyCode;
         keycode.into()
     }
 
diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index fbf9929..2150596 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -544,13 +544,11 @@ impl AndroidAppInner {
     }
 
     pub fn enable_motion_axis(&mut self, axis: Axis) {
-        let axis: u32 = axis.into();
-        unsafe { ffi::GameActivityPointerAxes_enableAxis(axis as i32) }
+        unsafe { ffi::GameActivityPointerAxes_enableAxis(axis.into()) }
     }
 
     pub fn disable_motion_axis(&mut self, axis: Axis) {
-        let axis: u32 = axis.into();
-        unsafe { ffi::GameActivityPointerAxes_disableAxis(axis as i32) }
+        unsafe { ffi::GameActivityPointerAxes_disableAxis(axis.into()) }
     }
 
     pub fn create_waker(&self) -> AndroidAppWaker {
diff --git a/android-activity/src/input.rs b/android-activity/src/input.rs
index 96c7d68..909f895 100644
--- a/android-activity/src/input.rs
+++ b/android-activity/src/input.rs
@@ -1,4 +1,7 @@
-use bitflags::bitflags;
+pub use ndk::event::{
+    Axis, EdgeFlags, KeyAction, KeyEventFlags, Keycode, MetaState, MotionAction, MotionEventFlags,
+    Source, SourceClass, ToolType,
+};
 
 pub use crate::activity_impl::input::*;
 use crate::InputStatus;
@@ -6,238 +9,6 @@ use crate::InputStatus;
 mod sdk;
 pub use sdk::*;
 
-/// An enum representing the source of an [`MotionEvent`] or [`KeyEvent`]
-///
-/// See [the InputDevice docs](https://developer.android.com/reference/android/view/InputDevice#SOURCE_ANY)
-///
-/// # Android Extensible Enum
-///
-/// This is a runtime [extensible enum](`crate#android-extensible-enums`) and
-/// should be handled similar to a `#[non_exhaustive]` enum to maintain
-/// forwards compatibility.
-///
-/// This implements `Into<u32>` and `From<u32>` for converting to/from Android
-/// SDK integer values.
-///
-#[derive(Debug, Clone, Copy, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
-#[non_exhaustive]
-#[repr(u32)]
-pub enum Source {
-    BluetoothStylus = 0x0000c002,
-    Dpad = 0x00000201,
-    /// Either a gamepad or a joystick
-    Gamepad = 0x00000401,
-    Hdmi = 0x02000001,
-    /// Either a gamepad or a joystick
-    Joystick = 0x01000010,
-    /// Pretty much any device with buttons. Query the keyboard type to determine
-    /// if it has alphabetic keys and can be used for text entry.
-    Keyboard = 0x00000101,
-    /// A pointing device, such as a mouse or trackpad
-    Mouse = 0x00002002,
-    /// A pointing device, such as a mouse or trackpad whose relative motions should be treated as navigation events
-    MouseRelative = 0x00020004,
-    /// An input device akin to a scroll wheel
-    RotaryEncoder = 0x00400000,
-    Sensor = 0x04000000,
-    Stylus = 0x00004002,
-    Touchpad = 0x00100008,
-    Touchscreen = 0x00001002,
-    TouchNavigation = 0x00200000,
-    Trackball = 0x00010004,
-
-    // We need to consider that the enum variants may be extended across
-    // different versions of Android (i.e. effectively at runtime) but at the
-    // same time we don't want it to be an API break to extend this enum in
-    // future releases of `android-activity` with new variants from the latest
-    // NDK/SDK.
-    //
-    // We can't just use `#[non_exhaustive]` because that only really helps
-    // when adding new variants in sync with android-activity releases.
-    //
-    // On the other hand we also can't rely on a catch-all `Unknown(u32)` that
-    // only really helps with unknown variants seen at runtime.
-    //
-    // What we aim for instead is to have a hidden catch-all variant that
-    // is considered (practically) unmatchable so code is forced to have
-    // a `unknown => {}` catch-all pattern match that will cover unknown variants
-    // either in the form of Rust variants added in future versions or
-    // in the form of an `__Unknown(u32)` integer that represents an unknown
-    // variant seen at runtime.
-    //
-    // Any `unknown => {}` pattern match can rely on `IntoPrimitive` to convert
-    // the `unknown` variant to the integer that comes from the Android SDK
-    // in case that values needs to be passed on, even without knowing its
-    // semantic meaning at compile time.
-    #[doc(hidden)]
-    #[num_enum(catch_all)]
-    __Unknown(u32),
-}
-
-// ndk_sys doesn't currently have the `TRACKBALL` flag so we define our
-// own internal class constants for now
-bitflags! {
-    #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-    struct SourceFlags: u32 {
-        const CLASS_MASK = 0x000000ff;
-
-        const BUTTON = 0x00000001;
-        const POINTER = 0x00000002;
-        const TRACKBALL = 0x00000004;
-        const POSITION = 0x00000008;
-        const JOYSTICK = 0x00000010;
-        const NONE = 0;
-    }
-}
-
-impl Source {
-    #[inline]
-    pub fn is_button_class(self) -> bool {
-        let class = SourceFlags::from_bits_truncate(self.into());
-        class.contains(SourceFlags::BUTTON)
-    }
-    #[inline]
-    pub fn is_pointer_class(self) -> bool {
-        let class = SourceFlags::from_bits_truncate(self.into());
-        class.contains(SourceFlags::POINTER)
-    }
-    #[inline]
-    pub fn is_trackball_class(self) -> bool {
-        let class = SourceFlags::from_bits_truncate(self.into());
-        class.contains(SourceFlags::TRACKBALL)
-    }
-    #[inline]
-    pub fn is_position_class(self) -> bool {
-        let class = SourceFlags::from_bits_truncate(self.into());
-        class.contains(SourceFlags::POSITION)
-    }
-    #[inline]
-    pub fn is_joystick_class(self) -> bool {
-        let class = SourceFlags::from_bits_truncate(self.into());
-        class.contains(SourceFlags::JOYSTICK)
-    }
-}
-
-/// A bitfield representing the state of modifier keys during an event.
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-25)
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct MetaState(pub u32);
-
-impl MetaState {
-    #[inline]
-    pub fn alt_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_ALT_ON != 0
-    }
-    #[inline]
-    pub fn alt_left_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_ALT_LEFT_ON != 0
-    }
-    #[inline]
-    pub fn alt_right_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_ALT_RIGHT_ON != 0
-    }
-    #[inline]
-    pub fn shift_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_SHIFT_ON != 0
-    }
-    #[inline]
-    pub fn shift_left_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_SHIFT_LEFT_ON != 0
-    }
-    #[inline]
-    pub fn shift_right_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_SHIFT_RIGHT_ON != 0
-    }
-    #[inline]
-    pub fn sym_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_SYM_ON != 0
-    }
-    #[inline]
-    pub fn function_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_FUNCTION_ON != 0
-    }
-    #[inline]
-    pub fn ctrl_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_CTRL_ON != 0
-    }
-    #[inline]
-    pub fn ctrl_left_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_CTRL_LEFT_ON != 0
-    }
-    #[inline]
-    pub fn ctrl_right_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_CTRL_RIGHT_ON != 0
-    }
-    #[inline]
-    pub fn meta_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_META_ON != 0
-    }
-    #[inline]
-    pub fn meta_left_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_META_LEFT_ON != 0
-    }
-    #[inline]
-    pub fn meta_right_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_META_RIGHT_ON != 0
-    }
-    #[inline]
-    pub fn caps_lock_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_CAPS_LOCK_ON != 0
-    }
-    #[inline]
-    pub fn num_lock_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_NUM_LOCK_ON != 0
-    }
-    #[inline]
-    pub fn scroll_lock_on(self) -> bool {
-        self.0 & ndk_sys::AMETA_SCROLL_LOCK_ON != 0
-    }
-}
-
-impl From<ndk::event::MetaState> for MetaState {
-    fn from(value: ndk::event::MetaState) -> Self {
-        Self(value.0)
-    }
-}
-
-/// A motion action.
-///
-/// See [the NDK
-/// docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-29)
-///
-/// # Android Extensible Enum
-///
-/// This is a runtime [extensible enum](`crate#android-extensible-enums`) and
-/// should be handled similar to a `#[non_exhaustive]` enum to maintain
-/// forwards compatibility.
-///
-/// This implements `Into<u32>` and `From<u32>` for converting to/from Android
-/// SDK integer values.
-///
-#[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
-#[non_exhaustive]
-#[repr(u32)]
-pub enum MotionAction {
-    Down = ndk_sys::AMOTION_EVENT_ACTION_DOWN,
-    Up = ndk_sys::AMOTION_EVENT_ACTION_UP,
-    Move = ndk_sys::AMOTION_EVENT_ACTION_MOVE,
-    Cancel = ndk_sys::AMOTION_EVENT_ACTION_CANCEL,
-    Outside = ndk_sys::AMOTION_EVENT_ACTION_OUTSIDE,
-    PointerDown = ndk_sys::AMOTION_EVENT_ACTION_POINTER_DOWN,
-    PointerUp = ndk_sys::AMOTION_EVENT_ACTION_POINTER_UP,
-    HoverMove = ndk_sys::AMOTION_EVENT_ACTION_HOVER_MOVE,
-    Scroll = ndk_sys::AMOTION_EVENT_ACTION_SCROLL,
-    HoverEnter = ndk_sys::AMOTION_EVENT_ACTION_HOVER_ENTER,
-    HoverExit = ndk_sys::AMOTION_EVENT_ACTION_HOVER_EXIT,
-    ButtonPress = ndk_sys::AMOTION_EVENT_ACTION_BUTTON_PRESS,
-    ButtonRelease = ndk_sys::AMOTION_EVENT_ACTION_BUTTON_RELEASE,
-
-    #[doc(hidden)]
-    #[num_enum(catch_all)]
-    __Unknown(u32),
-}
-
 /// Identifies buttons that are associated with motion events.
 ///
 /// See [the NDK
@@ -269,606 +40,6 @@ pub enum Button {
     __Unknown(u32),
 }
 
-/// An axis of a motion event.
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-32)
-///
-/// # Android Extensible Enum
-///
-/// This is a runtime [extensible enum](`crate#android-extensible-enums`) and
-/// should be handled similar to a `#[non_exhaustive]` enum to maintain
-/// forwards compatibility.
-///
-/// This implements `Into<u32>` and `From<u32>` for converting to/from Android
-/// SDK integer values.
-///
-#[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
-#[non_exhaustive]
-#[repr(u32)]
-pub enum Axis {
-    X = ndk_sys::AMOTION_EVENT_AXIS_X,
-    Y = ndk_sys::AMOTION_EVENT_AXIS_Y,
-    Pressure = ndk_sys::AMOTION_EVENT_AXIS_PRESSURE,
-    Size = ndk_sys::AMOTION_EVENT_AXIS_SIZE,
-    TouchMajor = ndk_sys::AMOTION_EVENT_AXIS_TOUCH_MAJOR,
-    TouchMinor = ndk_sys::AMOTION_EVENT_AXIS_TOUCH_MINOR,
-    ToolMajor = ndk_sys::AMOTION_EVENT_AXIS_TOOL_MAJOR,
-    ToolMinor = ndk_sys::AMOTION_EVENT_AXIS_TOOL_MINOR,
-    Orientation = ndk_sys::AMOTION_EVENT_AXIS_ORIENTATION,
-    Vscroll = ndk_sys::AMOTION_EVENT_AXIS_VSCROLL,
-    Hscroll = ndk_sys::AMOTION_EVENT_AXIS_HSCROLL,
-    Z = ndk_sys::AMOTION_EVENT_AXIS_Z,
-    Rx = ndk_sys::AMOTION_EVENT_AXIS_RX,
-    Ry = ndk_sys::AMOTION_EVENT_AXIS_RY,
-    Rz = ndk_sys::AMOTION_EVENT_AXIS_RZ,
-    HatX = ndk_sys::AMOTION_EVENT_AXIS_HAT_X,
-    HatY = ndk_sys::AMOTION_EVENT_AXIS_HAT_Y,
-    Ltrigger = ndk_sys::AMOTION_EVENT_AXIS_LTRIGGER,
-    Rtrigger = ndk_sys::AMOTION_EVENT_AXIS_RTRIGGER,
-    Throttle = ndk_sys::AMOTION_EVENT_AXIS_THROTTLE,
-    Rudder = ndk_sys::AMOTION_EVENT_AXIS_RUDDER,
-    Wheel = ndk_sys::AMOTION_EVENT_AXIS_WHEEL,
-    Gas = ndk_sys::AMOTION_EVENT_AXIS_GAS,
-    Brake = ndk_sys::AMOTION_EVENT_AXIS_BRAKE,
-    Distance = ndk_sys::AMOTION_EVENT_AXIS_DISTANCE,
-    Tilt = ndk_sys::AMOTION_EVENT_AXIS_TILT,
-    Scroll = ndk_sys::AMOTION_EVENT_AXIS_SCROLL,
-    RelativeX = ndk_sys::AMOTION_EVENT_AXIS_RELATIVE_X,
-    RelativeY = ndk_sys::AMOTION_EVENT_AXIS_RELATIVE_Y,
-    Generic1 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_1,
-    Generic2 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_2,
-    Generic3 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_3,
-    Generic4 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_4,
-    Generic5 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_5,
-    Generic6 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_6,
-    Generic7 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_7,
-    Generic8 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_8,
-    Generic9 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_9,
-    Generic10 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_10,
-    Generic11 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_11,
-    Generic12 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_12,
-    Generic13 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_13,
-    Generic14 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_14,
-    Generic15 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_15,
-    Generic16 = ndk_sys::AMOTION_EVENT_AXIS_GENERIC_16,
-
-    #[doc(hidden)]
-    #[num_enum(catch_all)]
-    __Unknown(u32),
-}
-
-/// The tool type of a pointer.
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-48)
-///
-/// # Android Extensible Enum
-///
-/// This is a runtime [extensible enum](`crate#android-extensible-enums`) and
-/// should be handled similar to a `#[non_exhaustive]` enum to maintain
-/// forwards compatibility.
-///
-/// Implements `Into<u32>` and `From<u32>` for converting to/from Android SDK
-/// integer values.
-///
-#[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
-#[non_exhaustive]
-#[repr(u32)]
-pub enum ToolType {
-    /// Unknown tool type.
-    ///
-    /// This constant is used when the tool type is not known or is not relevant, such as for a trackball or other non-pointing device.
-    Unknown = ndk_sys::AMOTION_EVENT_TOOL_TYPE_UNKNOWN,
-
-    /// The tool is a finger.
-    Finger = ndk_sys::AMOTION_EVENT_TOOL_TYPE_FINGER,
-
-    /// The tool is a stylus.
-    Stylus = ndk_sys::AMOTION_EVENT_TOOL_TYPE_STYLUS,
-
-    ///  The tool is a mouse.
-    Mouse = ndk_sys::AMOTION_EVENT_TOOL_TYPE_MOUSE,
-
-    /// The tool is an eraser or a stylus being used in an inverted posture.
-    Eraser = ndk_sys::AMOTION_EVENT_TOOL_TYPE_ERASER,
-
-    /// The tool is a palm and should be rejected
-    Palm = ndk_sys::AMOTION_EVENT_TOOL_TYPE_PALM,
-
-    #[doc(hidden)]
-    #[num_enum(catch_all)]
-    __Unknown(u32),
-}
-
-/// A bitfield representing the state of buttons during a motion event.
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-33)
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct ButtonState(pub u32);
-
-impl ButtonState {
-    #[inline]
-    pub fn primary(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_PRIMARY != 0
-    }
-    #[inline]
-    pub fn secondary(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_SECONDARY != 0
-    }
-    #[inline]
-    pub fn teriary(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_TERTIARY != 0
-    }
-    #[inline]
-    pub fn back(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_BACK != 0
-    }
-    #[inline]
-    pub fn forward(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_FORWARD != 0
-    }
-    #[inline]
-    pub fn stylus_primary(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_STYLUS_PRIMARY != 0
-    }
-    #[inline]
-    pub fn stylus_secondary(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_BUTTON_STYLUS_SECONDARY != 0
-    }
-}
-
-impl From<ndk::event::ButtonState> for ButtonState {
-    fn from(value: ndk::event::ButtonState) -> Self {
-        Self(value.0)
-    }
-}
-
-/// A bitfield representing which edges were touched by a motion event.
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-31)
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct EdgeFlags(pub u32);
-
-impl EdgeFlags {
-    #[inline]
-    pub fn top(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_EDGE_FLAG_TOP != 0
-    }
-    #[inline]
-    pub fn bottom(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_EDGE_FLAG_BOTTOM != 0
-    }
-    #[inline]
-    pub fn left(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_EDGE_FLAG_LEFT != 0
-    }
-    #[inline]
-    pub fn right(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_EDGE_FLAG_RIGHT != 0
-    }
-}
-
-impl From<ndk::event::EdgeFlags> for EdgeFlags {
-    fn from(value: ndk::event::EdgeFlags) -> Self {
-        Self(value.0)
-    }
-}
-
-/// Flags associated with this [`MotionEvent`].
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-30)
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct MotionEventFlags(pub u32);
-
-impl MotionEventFlags {
-    #[inline]
-    pub fn window_is_obscured(self) -> bool {
-        self.0 & ndk_sys::AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED != 0
-    }
-}
-
-impl From<ndk::event::MotionEventFlags> for MotionEventFlags {
-    fn from(value: ndk::event::MotionEventFlags) -> Self {
-        Self(value.0)
-    }
-}
-
-/// Key actions.
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-27)
-///
-/// # Android Extensible Enum
-///
-/// This is a runtime [extensible enum](`crate#android-extensible-enums`) and
-/// should be handled similar to a `#[non_exhaustive]` enum to maintain
-/// forwards compatibility.
-///
-/// Implements `Into<u32>` and `From<u32>` for converting to/from Android SDK
-/// integer values.
-///
-#[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
-#[non_exhaustive]
-#[repr(u32)]
-pub enum KeyAction {
-    Down = ndk_sys::AKEY_EVENT_ACTION_DOWN,
-    Up = ndk_sys::AKEY_EVENT_ACTION_UP,
-    Multiple = ndk_sys::AKEY_EVENT_ACTION_MULTIPLE,
-
-    #[doc(hidden)]
-    #[num_enum(catch_all)]
-    __Unknown(u32),
-}
-
-/// Key codes.
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-39)
-///
-/// # Android Extensible Enum
-///
-/// This is a runtime [extensible enum](`crate#android-extensible-enums`) and
-/// should be handled similar to a `#[non_exhaustive]` enum to maintain
-/// forwards compatibility.
-///
-/// Implements `Into<u32>` and `From<u32>` for converting to/from Android SDK
-/// integer values.
-///
-#[derive(Copy, Clone, Debug, PartialEq, Eq, num_enum::FromPrimitive, num_enum::IntoPrimitive)]
-#[non_exhaustive]
-#[repr(u32)]
-pub enum Keycode {
-    Unknown = ndk_sys::AKEYCODE_UNKNOWN,
-    SoftLeft = ndk_sys::AKEYCODE_SOFT_LEFT,
-    SoftRight = ndk_sys::AKEYCODE_SOFT_RIGHT,
-    Home = ndk_sys::AKEYCODE_HOME,
-    Back = ndk_sys::AKEYCODE_BACK,
-    Call = ndk_sys::AKEYCODE_CALL,
-    Endcall = ndk_sys::AKEYCODE_ENDCALL,
-    Keycode0 = ndk_sys::AKEYCODE_0,
-    Keycode1 = ndk_sys::AKEYCODE_1,
-    Keycode2 = ndk_sys::AKEYCODE_2,
-    Keycode3 = ndk_sys::AKEYCODE_3,
-    Keycode4 = ndk_sys::AKEYCODE_4,
-    Keycode5 = ndk_sys::AKEYCODE_5,
-    Keycode6 = ndk_sys::AKEYCODE_6,
-    Keycode7 = ndk_sys::AKEYCODE_7,
-    Keycode8 = ndk_sys::AKEYCODE_8,
-    Keycode9 = ndk_sys::AKEYCODE_9,
-    Star = ndk_sys::AKEYCODE_STAR,
-    Pound = ndk_sys::AKEYCODE_POUND,
-    DpadUp = ndk_sys::AKEYCODE_DPAD_UP,
-    DpadDown = ndk_sys::AKEYCODE_DPAD_DOWN,
-    DpadLeft = ndk_sys::AKEYCODE_DPAD_LEFT,
-    DpadRight = ndk_sys::AKEYCODE_DPAD_RIGHT,
-    DpadCenter = ndk_sys::AKEYCODE_DPAD_CENTER,
-    VolumeUp = ndk_sys::AKEYCODE_VOLUME_UP,
-    VolumeDown = ndk_sys::AKEYCODE_VOLUME_DOWN,
-    Power = ndk_sys::AKEYCODE_POWER,
-    Camera = ndk_sys::AKEYCODE_CAMERA,
-    Clear = ndk_sys::AKEYCODE_CLEAR,
-    A = ndk_sys::AKEYCODE_A,
-    B = ndk_sys::AKEYCODE_B,
-    C = ndk_sys::AKEYCODE_C,
-    D = ndk_sys::AKEYCODE_D,
-    E = ndk_sys::AKEYCODE_E,
-    F = ndk_sys::AKEYCODE_F,
-    G = ndk_sys::AKEYCODE_G,
-    H = ndk_sys::AKEYCODE_H,
-    I = ndk_sys::AKEYCODE_I,
-    J = ndk_sys::AKEYCODE_J,
-    K = ndk_sys::AKEYCODE_K,
-    L = ndk_sys::AKEYCODE_L,
-    M = ndk_sys::AKEYCODE_M,
-    N = ndk_sys::AKEYCODE_N,
-    O = ndk_sys::AKEYCODE_O,
-    P = ndk_sys::AKEYCODE_P,
-    Q = ndk_sys::AKEYCODE_Q,
-    R = ndk_sys::AKEYCODE_R,
-    S = ndk_sys::AKEYCODE_S,
-    T = ndk_sys::AKEYCODE_T,
-    U = ndk_sys::AKEYCODE_U,
-    V = ndk_sys::AKEYCODE_V,
-    W = ndk_sys::AKEYCODE_W,
-    X = ndk_sys::AKEYCODE_X,
-    Y = ndk_sys::AKEYCODE_Y,
-    Z = ndk_sys::AKEYCODE_Z,
-    Comma = ndk_sys::AKEYCODE_COMMA,
-    Period = ndk_sys::AKEYCODE_PERIOD,
-    AltLeft = ndk_sys::AKEYCODE_ALT_LEFT,
-    AltRight = ndk_sys::AKEYCODE_ALT_RIGHT,
-    ShiftLeft = ndk_sys::AKEYCODE_SHIFT_LEFT,
-    ShiftRight = ndk_sys::AKEYCODE_SHIFT_RIGHT,
-    Tab = ndk_sys::AKEYCODE_TAB,
-    Space = ndk_sys::AKEYCODE_SPACE,
-    Sym = ndk_sys::AKEYCODE_SYM,
-    Explorer = ndk_sys::AKEYCODE_EXPLORER,
-    Envelope = ndk_sys::AKEYCODE_ENVELOPE,
-    Enter = ndk_sys::AKEYCODE_ENTER,
-    Del = ndk_sys::AKEYCODE_DEL,
-    Grave = ndk_sys::AKEYCODE_GRAVE,
-    Minus = ndk_sys::AKEYCODE_MINUS,
-    Equals = ndk_sys::AKEYCODE_EQUALS,
-    LeftBracket = ndk_sys::AKEYCODE_LEFT_BRACKET,
-    RightBracket = ndk_sys::AKEYCODE_RIGHT_BRACKET,
-    Backslash = ndk_sys::AKEYCODE_BACKSLASH,
-    Semicolon = ndk_sys::AKEYCODE_SEMICOLON,
-    Apostrophe = ndk_sys::AKEYCODE_APOSTROPHE,
-    Slash = ndk_sys::AKEYCODE_SLASH,
-    At = ndk_sys::AKEYCODE_AT,
-    Num = ndk_sys::AKEYCODE_NUM,
-    Headsethook = ndk_sys::AKEYCODE_HEADSETHOOK,
-    Focus = ndk_sys::AKEYCODE_FOCUS,
-    Plus = ndk_sys::AKEYCODE_PLUS,
-    Menu = ndk_sys::AKEYCODE_MENU,
-    Notification = ndk_sys::AKEYCODE_NOTIFICATION,
-    Search = ndk_sys::AKEYCODE_SEARCH,
-    MediaPlayPause = ndk_sys::AKEYCODE_MEDIA_PLAY_PAUSE,
-    MediaStop = ndk_sys::AKEYCODE_MEDIA_STOP,
-    MediaNext = ndk_sys::AKEYCODE_MEDIA_NEXT,
-    MediaPrevious = ndk_sys::AKEYCODE_MEDIA_PREVIOUS,
-    MediaRewind = ndk_sys::AKEYCODE_MEDIA_REWIND,
-    MediaFastForward = ndk_sys::AKEYCODE_MEDIA_FAST_FORWARD,
-    Mute = ndk_sys::AKEYCODE_MUTE,
-    PageUp = ndk_sys::AKEYCODE_PAGE_UP,
-    PageDown = ndk_sys::AKEYCODE_PAGE_DOWN,
-    Pictsymbols = ndk_sys::AKEYCODE_PICTSYMBOLS,
-    SwitchCharset = ndk_sys::AKEYCODE_SWITCH_CHARSET,
-    ButtonA = ndk_sys::AKEYCODE_BUTTON_A,
-    ButtonB = ndk_sys::AKEYCODE_BUTTON_B,
-    ButtonC = ndk_sys::AKEYCODE_BUTTON_C,
-    ButtonX = ndk_sys::AKEYCODE_BUTTON_X,
-    ButtonY = ndk_sys::AKEYCODE_BUTTON_Y,
-    ButtonZ = ndk_sys::AKEYCODE_BUTTON_Z,
-    ButtonL1 = ndk_sys::AKEYCODE_BUTTON_L1,
-    ButtonR1 = ndk_sys::AKEYCODE_BUTTON_R1,
-    ButtonL2 = ndk_sys::AKEYCODE_BUTTON_L2,
-    ButtonR2 = ndk_sys::AKEYCODE_BUTTON_R2,
-    ButtonThumbl = ndk_sys::AKEYCODE_BUTTON_THUMBL,
-    ButtonThumbr = ndk_sys::AKEYCODE_BUTTON_THUMBR,
-    ButtonStart = ndk_sys::AKEYCODE_BUTTON_START,
-    ButtonSelect = ndk_sys::AKEYCODE_BUTTON_SELECT,
-    ButtonMode = ndk_sys::AKEYCODE_BUTTON_MODE,
-    Escape = ndk_sys::AKEYCODE_ESCAPE,
-    ForwardDel = ndk_sys::AKEYCODE_FORWARD_DEL,
-    CtrlLeft = ndk_sys::AKEYCODE_CTRL_LEFT,
-    CtrlRight = ndk_sys::AKEYCODE_CTRL_RIGHT,
-    CapsLock = ndk_sys::AKEYCODE_CAPS_LOCK,
-    ScrollLock = ndk_sys::AKEYCODE_SCROLL_LOCK,
-    MetaLeft = ndk_sys::AKEYCODE_META_LEFT,
-    MetaRight = ndk_sys::AKEYCODE_META_RIGHT,
-    Function = ndk_sys::AKEYCODE_FUNCTION,
-    Sysrq = ndk_sys::AKEYCODE_SYSRQ,
-    Break = ndk_sys::AKEYCODE_BREAK,
-    MoveHome = ndk_sys::AKEYCODE_MOVE_HOME,
-    MoveEnd = ndk_sys::AKEYCODE_MOVE_END,
-    Insert = ndk_sys::AKEYCODE_INSERT,
-    Forward = ndk_sys::AKEYCODE_FORWARD,
-    MediaPlay = ndk_sys::AKEYCODE_MEDIA_PLAY,
-    MediaPause = ndk_sys::AKEYCODE_MEDIA_PAUSE,
-    MediaClose = ndk_sys::AKEYCODE_MEDIA_CLOSE,
-    MediaEject = ndk_sys::AKEYCODE_MEDIA_EJECT,
-    MediaRecord = ndk_sys::AKEYCODE_MEDIA_RECORD,
-    F1 = ndk_sys::AKEYCODE_F1,
-    F2 = ndk_sys::AKEYCODE_F2,
-    F3 = ndk_sys::AKEYCODE_F3,
-    F4 = ndk_sys::AKEYCODE_F4,
-    F5 = ndk_sys::AKEYCODE_F5,
-    F6 = ndk_sys::AKEYCODE_F6,
-    F7 = ndk_sys::AKEYCODE_F7,
-    F8 = ndk_sys::AKEYCODE_F8,
-    F9 = ndk_sys::AKEYCODE_F9,
-    F10 = ndk_sys::AKEYCODE_F10,
-    F11 = ndk_sys::AKEYCODE_F11,
-    F12 = ndk_sys::AKEYCODE_F12,
-    NumLock = ndk_sys::AKEYCODE_NUM_LOCK,
-    Numpad0 = ndk_sys::AKEYCODE_NUMPAD_0,
-    Numpad1 = ndk_sys::AKEYCODE_NUMPAD_1,
-    Numpad2 = ndk_sys::AKEYCODE_NUMPAD_2,
-    Numpad3 = ndk_sys::AKEYCODE_NUMPAD_3,
-    Numpad4 = ndk_sys::AKEYCODE_NUMPAD_4,
-    Numpad5 = ndk_sys::AKEYCODE_NUMPAD_5,
-    Numpad6 = ndk_sys::AKEYCODE_NUMPAD_6,
-    Numpad7 = ndk_sys::AKEYCODE_NUMPAD_7,
-    Numpad8 = ndk_sys::AKEYCODE_NUMPAD_8,
-    Numpad9 = ndk_sys::AKEYCODE_NUMPAD_9,
-    NumpadDivide = ndk_sys::AKEYCODE_NUMPAD_DIVIDE,
-    NumpadMultiply = ndk_sys::AKEYCODE_NUMPAD_MULTIPLY,
-    NumpadSubtract = ndk_sys::AKEYCODE_NUMPAD_SUBTRACT,
-    NumpadAdd = ndk_sys::AKEYCODE_NUMPAD_ADD,
-    NumpadDot = ndk_sys::AKEYCODE_NUMPAD_DOT,
-    NumpadComma = ndk_sys::AKEYCODE_NUMPAD_COMMA,
-    NumpadEnter = ndk_sys::AKEYCODE_NUMPAD_ENTER,
-    NumpadEquals = ndk_sys::AKEYCODE_NUMPAD_EQUALS,
-    NumpadLeftParen = ndk_sys::AKEYCODE_NUMPAD_LEFT_PAREN,
-    NumpadRightParen = ndk_sys::AKEYCODE_NUMPAD_RIGHT_PAREN,
-    VolumeMute = ndk_sys::AKEYCODE_VOLUME_MUTE,
-    Info = ndk_sys::AKEYCODE_INFO,
-    ChannelUp = ndk_sys::AKEYCODE_CHANNEL_UP,
-    ChannelDown = ndk_sys::AKEYCODE_CHANNEL_DOWN,
-    ZoomIn = ndk_sys::AKEYCODE_ZOOM_IN,
-    ZoomOut = ndk_sys::AKEYCODE_ZOOM_OUT,
-    Tv = ndk_sys::AKEYCODE_TV,
-    Window = ndk_sys::AKEYCODE_WINDOW,
-    Guide = ndk_sys::AKEYCODE_GUIDE,
-    Dvr = ndk_sys::AKEYCODE_DVR,
-    Bookmark = ndk_sys::AKEYCODE_BOOKMARK,
-    Captions = ndk_sys::AKEYCODE_CAPTIONS,
-    Settings = ndk_sys::AKEYCODE_SETTINGS,
-    TvPower = ndk_sys::AKEYCODE_TV_POWER,
-    TvInput = ndk_sys::AKEYCODE_TV_INPUT,
-    StbPower = ndk_sys::AKEYCODE_STB_POWER,
-    StbInput = ndk_sys::AKEYCODE_STB_INPUT,
-    AvrPower = ndk_sys::AKEYCODE_AVR_POWER,
-    AvrInput = ndk_sys::AKEYCODE_AVR_INPUT,
-    ProgRed = ndk_sys::AKEYCODE_PROG_RED,
-    ProgGreen = ndk_sys::AKEYCODE_PROG_GREEN,
-    ProgYellow = ndk_sys::AKEYCODE_PROG_YELLOW,
-    ProgBlue = ndk_sys::AKEYCODE_PROG_BLUE,
-    AppSwitch = ndk_sys::AKEYCODE_APP_SWITCH,
-    Button1 = ndk_sys::AKEYCODE_BUTTON_1,
-    Button2 = ndk_sys::AKEYCODE_BUTTON_2,
-    Button3 = ndk_sys::AKEYCODE_BUTTON_3,
-    Button4 = ndk_sys::AKEYCODE_BUTTON_4,
-    Button5 = ndk_sys::AKEYCODE_BUTTON_5,
-    Button6 = ndk_sys::AKEYCODE_BUTTON_6,
-    Button7 = ndk_sys::AKEYCODE_BUTTON_7,
-    Button8 = ndk_sys::AKEYCODE_BUTTON_8,
-    Button9 = ndk_sys::AKEYCODE_BUTTON_9,
-    Button10 = ndk_sys::AKEYCODE_BUTTON_10,
-    Button11 = ndk_sys::AKEYCODE_BUTTON_11,
-    Button12 = ndk_sys::AKEYCODE_BUTTON_12,
-    Button13 = ndk_sys::AKEYCODE_BUTTON_13,
-    Button14 = ndk_sys::AKEYCODE_BUTTON_14,
-    Button15 = ndk_sys::AKEYCODE_BUTTON_15,
-    Button16 = ndk_sys::AKEYCODE_BUTTON_16,
-    LanguageSwitch = ndk_sys::AKEYCODE_LANGUAGE_SWITCH,
-    MannerMode = ndk_sys::AKEYCODE_MANNER_MODE,
-    Keycode3dMode = ndk_sys::AKEYCODE_3D_MODE,
-    Contacts = ndk_sys::AKEYCODE_CONTACTS,
-    Calendar = ndk_sys::AKEYCODE_CALENDAR,
-    Music = ndk_sys::AKEYCODE_MUSIC,
-    Calculator = ndk_sys::AKEYCODE_CALCULATOR,
-    ZenkakuHankaku = ndk_sys::AKEYCODE_ZENKAKU_HANKAKU,
-    Eisu = ndk_sys::AKEYCODE_EISU,
-    Muhenkan = ndk_sys::AKEYCODE_MUHENKAN,
-    Henkan = ndk_sys::AKEYCODE_HENKAN,
-    KatakanaHiragana = ndk_sys::AKEYCODE_KATAKANA_HIRAGANA,
-    Yen = ndk_sys::AKEYCODE_YEN,
-    Ro = ndk_sys::AKEYCODE_RO,
-    Kana = ndk_sys::AKEYCODE_KANA,
-    Assist = ndk_sys::AKEYCODE_ASSIST,
-    BrightnessDown = ndk_sys::AKEYCODE_BRIGHTNESS_DOWN,
-    BrightnessUp = ndk_sys::AKEYCODE_BRIGHTNESS_UP,
-    MediaAudioTrack = ndk_sys::AKEYCODE_MEDIA_AUDIO_TRACK,
-    Sleep = ndk_sys::AKEYCODE_SLEEP,
-    Wakeup = ndk_sys::AKEYCODE_WAKEUP,
-    Pairing = ndk_sys::AKEYCODE_PAIRING,
-    MediaTopMenu = ndk_sys::AKEYCODE_MEDIA_TOP_MENU,
-    Keycode11 = ndk_sys::AKEYCODE_11,
-    Keycode12 = ndk_sys::AKEYCODE_12,
-    LastChannel = ndk_sys::AKEYCODE_LAST_CHANNEL,
-    TvDataService = ndk_sys::AKEYCODE_TV_DATA_SERVICE,
-    VoiceAssist = ndk_sys::AKEYCODE_VOICE_ASSIST,
-    TvRadioService = ndk_sys::AKEYCODE_TV_RADIO_SERVICE,
-    TvTeletext = ndk_sys::AKEYCODE_TV_TELETEXT,
-    TvNumberEntry = ndk_sys::AKEYCODE_TV_NUMBER_ENTRY,
-    TvTerrestrialAnalog = ndk_sys::AKEYCODE_TV_TERRESTRIAL_ANALOG,
-    TvTerrestrialDigital = ndk_sys::AKEYCODE_TV_TERRESTRIAL_DIGITAL,
-    TvSatellite = ndk_sys::AKEYCODE_TV_SATELLITE,
-    TvSatelliteBs = ndk_sys::AKEYCODE_TV_SATELLITE_BS,
-    TvSatelliteCs = ndk_sys::AKEYCODE_TV_SATELLITE_CS,
-    TvSatelliteService = ndk_sys::AKEYCODE_TV_SATELLITE_SERVICE,
-    TvNetwork = ndk_sys::AKEYCODE_TV_NETWORK,
-    TvAntennaCable = ndk_sys::AKEYCODE_TV_ANTENNA_CABLE,
-    TvInputHdmi1 = ndk_sys::AKEYCODE_TV_INPUT_HDMI_1,
-    TvInputHdmi2 = ndk_sys::AKEYCODE_TV_INPUT_HDMI_2,
-    TvInputHdmi3 = ndk_sys::AKEYCODE_TV_INPUT_HDMI_3,
-    TvInputHdmi4 = ndk_sys::AKEYCODE_TV_INPUT_HDMI_4,
-    TvInputComposite1 = ndk_sys::AKEYCODE_TV_INPUT_COMPOSITE_1,
-    TvInputComposite2 = ndk_sys::AKEYCODE_TV_INPUT_COMPOSITE_2,
-    TvInputComponent1 = ndk_sys::AKEYCODE_TV_INPUT_COMPONENT_1,
-    TvInputComponent2 = ndk_sys::AKEYCODE_TV_INPUT_COMPONENT_2,
-    TvInputVga1 = ndk_sys::AKEYCODE_TV_INPUT_VGA_1,
-    TvAudioDescription = ndk_sys::AKEYCODE_TV_AUDIO_DESCRIPTION,
-    TvAudioDescriptionMixUp = ndk_sys::AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP,
-    TvAudioDescriptionMixDown = ndk_sys::AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN,
-    TvZoomMode = ndk_sys::AKEYCODE_TV_ZOOM_MODE,
-    TvContentsMenu = ndk_sys::AKEYCODE_TV_CONTENTS_MENU,
-    TvMediaContextMenu = ndk_sys::AKEYCODE_TV_MEDIA_CONTEXT_MENU,
-    TvTimerProgramming = ndk_sys::AKEYCODE_TV_TIMER_PROGRAMMING,
-    Help = ndk_sys::AKEYCODE_HELP,
-    NavigatePrevious = ndk_sys::AKEYCODE_NAVIGATE_PREVIOUS,
-    NavigateNext = ndk_sys::AKEYCODE_NAVIGATE_NEXT,
-    NavigateIn = ndk_sys::AKEYCODE_NAVIGATE_IN,
-    NavigateOut = ndk_sys::AKEYCODE_NAVIGATE_OUT,
-    StemPrimary = ndk_sys::AKEYCODE_STEM_PRIMARY,
-    Stem1 = ndk_sys::AKEYCODE_STEM_1,
-    Stem2 = ndk_sys::AKEYCODE_STEM_2,
-    Stem3 = ndk_sys::AKEYCODE_STEM_3,
-    DpadUpLeft = ndk_sys::AKEYCODE_DPAD_UP_LEFT,
-    DpadDownLeft = ndk_sys::AKEYCODE_DPAD_DOWN_LEFT,
-    DpadUpRight = ndk_sys::AKEYCODE_DPAD_UP_RIGHT,
-    DpadDownRight = ndk_sys::AKEYCODE_DPAD_DOWN_RIGHT,
-    MediaSkipForward = ndk_sys::AKEYCODE_MEDIA_SKIP_FORWARD,
-    MediaSkipBackward = ndk_sys::AKEYCODE_MEDIA_SKIP_BACKWARD,
-    MediaStepForward = ndk_sys::AKEYCODE_MEDIA_STEP_FORWARD,
-    MediaStepBackward = ndk_sys::AKEYCODE_MEDIA_STEP_BACKWARD,
-    SoftSleep = ndk_sys::AKEYCODE_SOFT_SLEEP,
-    Cut = ndk_sys::AKEYCODE_CUT,
-    Copy = ndk_sys::AKEYCODE_COPY,
-    Paste = ndk_sys::AKEYCODE_PASTE,
-    SystemNavigationUp = ndk_sys::AKEYCODE_SYSTEM_NAVIGATION_UP,
-    SystemNavigationDown = ndk_sys::AKEYCODE_SYSTEM_NAVIGATION_DOWN,
-    SystemNavigationLeft = ndk_sys::AKEYCODE_SYSTEM_NAVIGATION_LEFT,
-    SystemNavigationRight = ndk_sys::AKEYCODE_SYSTEM_NAVIGATION_RIGHT,
-    AllApps = ndk_sys::AKEYCODE_ALL_APPS,
-    Refresh = ndk_sys::AKEYCODE_REFRESH,
-    ThumbsUp = ndk_sys::AKEYCODE_THUMBS_UP,
-    ThumbsDown = ndk_sys::AKEYCODE_THUMBS_DOWN,
-    ProfileSwitch = ndk_sys::AKEYCODE_PROFILE_SWITCH,
-
-    #[doc(hidden)]
-    #[num_enum(catch_all)]
-    __Unknown(u32),
-}
-
-/// Flags associated with [`KeyEvent`].
-///
-/// See [the NDK docs](https://developer.android.com/ndk/reference/group/input#anonymous-enum-28)
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct KeyEventFlags(pub u32);
-
-impl KeyEventFlags {
-    #[inline]
-    pub fn cancelled(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_CANCELED != 0
-    }
-    #[inline]
-    pub fn cancelled_long_press(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_CANCELED_LONG_PRESS != 0
-    }
-    #[inline]
-    pub fn editor_action(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_EDITOR_ACTION != 0
-    }
-    #[inline]
-    pub fn fallback(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_FALLBACK != 0
-    }
-    #[inline]
-    pub fn from_system(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_FROM_SYSTEM != 0
-    }
-    #[inline]
-    pub fn keep_touch_mode(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_KEEP_TOUCH_MODE != 0
-    }
-    #[inline]
-    pub fn long_press(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_LONG_PRESS != 0
-    }
-    #[inline]
-    pub fn soft_keyboard(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_SOFT_KEYBOARD != 0
-    }
-    #[inline]
-    pub fn tracking(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_TRACKING != 0
-    }
-    #[inline]
-    pub fn virtual_hard_key(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY != 0
-    }
-    #[inline]
-    pub fn woke_here(&self) -> bool {
-        self.0 & ndk_sys::AKEY_EVENT_FLAG_WOKE_HERE != 0
-    }
-}
-
-impl From<ndk::event::KeyEventFlags> for KeyEventFlags {
-    fn from(value: ndk::event::KeyEventFlags) -> Self {
-        Self(value.0)
-    }
-}
-
 /// This struct holds a span within a region of text from `start` to `end`.
 ///
 /// The `start` index may be greater than the `end` index (swapping `start` and `end` will represent the same span)
diff --git a/android-activity/src/input/sdk.rs b/android-activity/src/input/sdk.rs
index 688b512..70a2c2c 100644
--- a/android-activity/src/input/sdk.rs
+++ b/android-activity/src/input/sdk.rs
@@ -246,10 +246,8 @@ impl KeyCharacterMap {
     /// a [`AppError::JavaError`] in case there is a spurious JNI error or an exception
     /// is caught.
     pub fn get(&self, key_code: Keycode, meta_state: MetaState) -> Result<KeyMapChar, AppError> {
-        let key_code: u32 = key_code.into();
-        let key_code = key_code as jni_sys::jint;
-        let meta_state: u32 = meta_state.0;
-        let meta_state = meta_state as jni_sys::jint;
+        let key_code = key_code.into();
+        let meta_state = meta_state.0 as i32;
 
         // Since we expect this API to be called from the `main` thread then we expect to already be
         // attached to the JVM
diff --git a/android-activity/src/native_activity/input.rs b/android-activity/src/native_activity/input.rs
index 96187ec..1559108 100644
--- a/android-activity/src/native_activity/input.rs
+++ b/android-activity/src/native_activity/input.rs
@@ -1,8 +1,10 @@
 use std::marker::PhantomData;
 
+use ndk::event::ButtonState;
+
 use crate::input::{
-    Axis, Button, ButtonState, EdgeFlags, KeyAction, Keycode, MetaState, MotionAction,
-    MotionEventFlags, Pointer, PointersIter, Source, ToolType,
+    Axis, EdgeFlags, KeyAction, Keycode, MetaState, MotionAction, MotionEventFlags, Pointer,
+    PointersIter, Source, ToolType,
 };
 
 /// A motion event
@@ -30,13 +32,7 @@ impl MotionEvent<'_> {
     ///
     #[inline]
     pub fn source(&self) -> Source {
-        // XXX: we use `AInputEvent_getSource` directly (instead of calling
-        // ndk_event.source()) since we have our own `Source` enum that we
-        // share between backends, which may also capture unknown variants
-        // added in new versions of Android.
-        let source =
-            unsafe { ndk_sys::AInputEvent_getSource(self.ndk_event.ptr().as_ptr()) as u32 };
-        source.into()
+        self.ndk_event.source()
     }
 
     /// Get the device id associated with the event.
@@ -51,13 +47,7 @@ impl MotionEvent<'_> {
     /// See [the MotionEvent docs](https://developer.android.com/reference/android/view/MotionEvent#getActionMasked())
     #[inline]
     pub fn action(&self) -> MotionAction {
-        // XXX: we use `AMotionEvent_getAction` directly since we have our own
-        // `MotionAction` enum that we share between backends, which may also
-        // capture unknown variants added in new versions of Android.
-        let action =
-            unsafe { ndk_sys::AMotionEvent_getAction(self.ndk_event.ptr().as_ptr()) as u32 }
-                & ndk_sys::AMOTION_EVENT_ACTION_MASK;
-        action.into()
+        self.ndk_event.action()
     }
 
     /// Returns which button has been modified during a press or release action.
@@ -67,10 +57,11 @@ impl MotionEvent<'_> {
     ///
     /// See [the MotionEvent docs](https://developer.android.com/reference/android/view/MotionEvent#getActionButton())
     #[inline]
-    pub fn action_button(&self) -> Button {
-        let action_button =
-            unsafe { ndk_sys::AMotionEvent_getActionButton(self.ndk_event.ptr().as_ptr()) as u32 };
-        action_button.into()
+    #[cfg(feature = "api-level-33")]
+    #[doc(alias = "AMotionEvent_getActionButton")]
+    // TODO: Button enum to signify only one bitflag can be set?
+    pub fn action_button(&self) -> ButtonState {
+        self.ndk_event.action_button()
     }
 
     /// Returns the pointer index of an `Up` or `Down` event.
@@ -154,7 +145,7 @@ impl MotionEvent<'_> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getmetastate)
     #[inline]
     pub fn meta_state(&self) -> MetaState {
-        self.ndk_event.meta_state().into()
+        self.ndk_event.meta_state()
     }
 
     /// Returns the button state during this event, as a bitfield.
@@ -163,7 +154,7 @@ impl MotionEvent<'_> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getbuttonstate)
     #[inline]
     pub fn button_state(&self) -> ButtonState {
-        self.ndk_event.button_state().into()
+        self.ndk_event.button_state()
     }
 
     /// Returns the time of the start of this gesture, in the `java.lang.System.nanoTime()` time
@@ -182,7 +173,7 @@ impl MotionEvent<'_> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getedgeflags)
     #[inline]
     pub fn edge_flags(&self) -> EdgeFlags {
-        self.ndk_event.edge_flags().into()
+        self.ndk_event.edge_flags()
     }
 
     /// Returns the time of this event, in the `java.lang.System.nanoTime()` time base
@@ -200,7 +191,7 @@ impl MotionEvent<'_> {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getflags)
     #[inline]
     pub fn flags(&self) -> MotionEventFlags {
-        self.ndk_event.flags().into()
+        self.ndk_event.flags()
     }
 
     /* Missing from GameActivity currently...
@@ -261,8 +252,7 @@ impl PointerImpl<'_> {
 
     #[inline]
     pub fn axis_value(&self, axis: Axis) -> f32 {
-        let value: u32 = axis.into();
-        let value = value as i32;
+        let value: i32 = axis.into();
         self.ndk_pointer.axis_value(value.into())
     }
 
@@ -279,7 +269,6 @@ impl PointerImpl<'_> {
     #[inline]
     pub fn tool_type(&self) -> ToolType {
         let value: i32 = self.ndk_pointer.tool_type().into();
-        let value = value as u32;
         value.into()
     }
 }
@@ -331,16 +320,9 @@ impl KeyEvent<'_> {
     }
 
     /// Get the source of the event.
-    ///
     #[inline]
     pub fn source(&self) -> Source {
-        // XXX: we use `AInputEvent_getSource` directly (instead of calling
-        // ndk_event.source()) since we have our own `Source` enum that we
-        // share between backends, which may also capture unknown variants
-        // added in new versions of Android.
-        let source =
-            unsafe { ndk_sys::AInputEvent_getSource(self.ndk_event.ptr().as_ptr()) as u32 };
-        source.into()
+        self.ndk_event.source()
     }
 
     /// Get the device id associated with the event.
@@ -355,11 +337,7 @@ impl KeyEvent<'_> {
     /// See [the KeyEvent docs](https://developer.android.com/reference/android/view/KeyEvent#getAction())
     #[inline]
     pub fn action(&self) -> KeyAction {
-        // XXX: we use `AInputEvent_getAction` directly since we have our own
-        // `KeyAction` enum that we share between backends, which may also
-        // capture unknown variants added in new versions of Android.
-        let action = unsafe { ndk_sys::AKeyEvent_getAction(self.ndk_event.ptr().as_ptr()) as u32 };
-        action.into()
+        self.ndk_event.action()
     }
 
     /// Returns the last time the key was pressed.  This is on the scale of
@@ -388,12 +366,7 @@ impl KeyEvent<'_> {
     /// docs](https://developer.android.com/ndk/reference/group/input#akeyevent_getkeycode)
     #[inline]
     pub fn key_code(&self) -> Keycode {
-        // XXX: we use `AInputEvent_getKeyCode` directly since we have our own
-        // `Keycode` enum that we share between backends, which may also
-        // capture unknown variants added in new versions of Android.
-        let keycode =
-            unsafe { ndk_sys::AKeyEvent_getKeyCode(self.ndk_event.ptr().as_ptr()) as u32 };
-        keycode.into()
+        self.ndk_event.key_code()
     }
 
     /// Returns the number of repeats of a key.
@@ -420,13 +393,12 @@ impl KeyEvent<'_> {
     /// docs](https://developer.android.com/ndk/reference/group/input#akeyevent_getmetastate)
     #[inline]
     pub fn meta_state(&self) -> MetaState {
-        self.ndk_event.meta_state().into()
+        self.ndk_event.meta_state()
     }
 }
 
 // We use our own wrapper type for input events to have better consistency
-// with GameActivity and ensure the enum can be extended without needing a
-// semver bump
+// with GameActivity
 /// Enum of possible input events
 #[derive(Debug)]
 #[non_exhaustive]

From db3ea3386fc701a05c226353e61b8e06dc32a4a1 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 31 Mar 2025 23:23:08 +0100
Subject: [PATCH 73/93] Bump rust-version to 1.73.0

There was a fix for the definition of the `stat` struct on Android in
1.73, and even though it's unlikely to affect many applications it still
seems worthwhile to draw a line under this and ensure that all
android-activity based applications will have that fix.

Rust 1.73 was released October 2023, which is still well over a year old
and very conservative.

This updates `generate-bindings.sh` to pass `--rust-target 1.73.0` so we
avoid generating bindings that require a more recent compiler.

(This doesn't actually regenerate the bindings but does ensure that
future updates will be constrained to generate code that is backwards
compatible with 1.73.)
---
 .github/workflows/ci.yml              |  2 +-
 android-activity/CHANGELOG.md         |  2 ++
 android-activity/Cargo.toml           | 10 ++++------
 android-activity/generate-bindings.sh |  1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dc7f708..3154a3a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         # See top README for MSRV policy
-        rust-version: [1.69.0, stable]
+        rust-version: [1.73.0, stable]
     steps:
       - uses: actions/checkout@v4
 
diff --git a/android-activity/CHANGELOG.md b/android-activity/CHANGELOG.md
index 1b1b961..d33a48b 100644
--- a/android-activity/CHANGELOG.md
+++ b/android-activity/CHANGELOG.md
@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   > - `Source::is_xxx_class()` functions are replaced by querying `Source::class()` and comparing against variants from the returned `SourceClass` `bitflags` enum.
   > - `SourceFlags::TRACKBALL` (from `Source::is_trackball_class()`) is named `SourceClass::NAVIGATION` in the `ndk`.
 
+- rust-version bumped to 1.73.0 ([#193](https://github.com/rust-mobile/android-activity/pull/193))
+
 ## [0.6.0] - 2024-04-26
 
 ### Changed
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 4ea8435..2695132 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -10,12 +10,10 @@ documentation = "https://docs.rs/android-activity"
 description = "Glue for building Rust applications on Android with NativeActivity or GameActivity"
 license = "MIT OR Apache-2.0"
 
-# 1.69 was when Rust last updated the Android NDK version used to build the
-# standard library which avoids needing the -lunwind workaround in build tools.
-#
-# We depend on cargo-ndk for building which has dropped support for the above
-# linker workaround.
-rust-version = "1.69.0"
+# Even though we could technically still build with 1.69, 1.73 has a fix for the
+# definition of the `stat` struct on Android, and so it seems worthwhile drawing
+# a line under that to ensure android-activity applications have that fix.
+rust-version = "1.73.0"
 
 [features]
 # Note: we don't enable any backend by default since features
diff --git a/android-activity/generate-bindings.sh b/android-activity/generate-bindings.sh
index 51c5602..690bfbd 100644
--- a/android-activity/generate-bindings.sh
+++ b/android-activity/generate-bindings.sh
@@ -14,6 +14,7 @@ while read ARCH && read TARGET ; do
 
     # --module-raw-line 'use '
     bindgen game-activity-ffi.h -o src/game_activity/ffi_$ARCH.rs \
+        --rust-target '1.73.0' \
         --blocklist-item 'JNI\w+' \
         --blocklist-item 'C?_?JNIEnv' \
         --blocklist-item '_?JavaVM' \

From ac2e17e977a61f7753099b80500ded4c84061bae Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Tue, 1 Apr 2025 12:21:19 +0100
Subject: [PATCH 74/93] Re-export 'ndk' and 'ndk_sys' crates

Since we expose `ndk` types in the public API it makes sense to
re-export these APIs so users of android-activity can defer to these
without needing to manually sync the versions for explicit dependencies.
---
 android-activity/CHANGELOG.md |  1 +
 android-activity/src/lib.rs   | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/android-activity/CHANGELOG.md b/android-activity/CHANGELOG.md
index d33a48b..825cc50 100644
--- a/android-activity/CHANGELOG.md
+++ b/android-activity/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   > - `SourceFlags::TRACKBALL` (from `Source::is_trackball_class()`) is named `SourceClass::NAVIGATION` in the `ndk`.
 
 - rust-version bumped to 1.73.0 ([#193](https://github.com/rust-mobile/android-activity/pull/193))
+- The `ndk` and `ndk-sys` crates are now re-exported under `android_activity::ndk` and `android_activity::ndk_sys` ([#194](https://github.com/rust-mobile/android-activity/pull/194))
 
 ## [0.6.0] - 2024-04-26
 
diff --git a/android-activity/src/lib.rs b/android-activity/src/lib.rs
index 45cc887..e8984fe 100644
--- a/android-activity/src/lib.rs
+++ b/android-activity/src/lib.rs
@@ -119,12 +119,17 @@ use std::sync::Arc;
 use std::sync::RwLock;
 use std::time::Duration;
 
-use input::KeyCharacterMap;
+use bitflags::bitflags;
 use libc::c_void;
+
 use ndk::asset::AssetManager;
 use ndk::native_window::NativeWindow;
 
-use bitflags::bitflags;
+// Since we expose `ndk` types in our public API it's convenient if crates can
+// defer to these re-exported APIs and avoid having to bump explicit
+// dependencies when they pull in new releases of android-activity.
+pub use ndk;
+pub use ndk_sys;
 
 #[cfg(not(target_os = "android"))]
 compile_error!("android-activity only supports compiling for Android");
@@ -162,6 +167,7 @@ pub mod error;
 use error::Result;
 
 pub mod input;
+use input::KeyCharacterMap;
 
 mod config;
 pub use config::ConfigurationRef;

From 976e9d06afd26c2edae3e3f12d4b300f4944f772 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Thu, 13 Mar 2025 16:15:51 -0700
Subject: [PATCH 75/93] tree: remove local copy of v2.0.2 android-games-sdk

We are going to use a submodule so that it is easier to track and rebase
our local changes onto new versions of android-games-sdk

Signed-off-by: William Casarin <jb55@jb55.com>
---
 .../common/gamesdk_common.h                   |   41 -
 .../game-activity/GameActivity.cpp            | 1147 -----------------
 .../game-activity/GameActivity.h              |  636 ---------
 .../game-activity/GameActivityEvents.cpp      |  414 ------
 .../game-activity/GameActivityEvents.h        |  336 -----
 .../game-activity/GameActivityLog.h           |  109 --
 .../native_app_glue/android_native_app_glue.c |  732 -----------
 .../native_app_glue/android_native_app_glue.h |  507 --------
 .../game-text-input/gamecommon.h              |   41 -
 .../game-text-input/gametextinput.cpp         |  377 ------
 .../game-text-input/gametextinput.h           |  305 -----
 11 files changed, 4645 deletions(-)
 delete mode 100644 android-activity/game-activity-csrc/common/gamesdk_common.h
 delete mode 100644 android-activity/game-activity-csrc/game-activity/GameActivity.cpp
 delete mode 100644 android-activity/game-activity-csrc/game-activity/GameActivity.h
 delete mode 100644 android-activity/game-activity-csrc/game-activity/GameActivityEvents.cpp
 delete mode 100644 android-activity/game-activity-csrc/game-activity/GameActivityEvents.h
 delete mode 100644 android-activity/game-activity-csrc/game-activity/GameActivityLog.h
 delete mode 100644 android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
 delete mode 100644 android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h
 delete mode 100755 android-activity/game-activity-csrc/game-text-input/gamecommon.h
 delete mode 100755 android-activity/game-activity-csrc/game-text-input/gametextinput.cpp
 delete mode 100755 android-activity/game-activity-csrc/game-text-input/gametextinput.h

diff --git a/android-activity/game-activity-csrc/common/gamesdk_common.h b/android-activity/game-activity-csrc/common/gamesdk_common.h
deleted file mode 100644
index d29ac01..0000000
--- a/android-activity/game-activity-csrc/common/gamesdk_common.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * This is the main interface to the Android Performance Tuner library, also
- * known as Tuning Fork.
- *
- * It is part of the Android Games SDK and produces best results when integrated
- * with the Swappy Frame Pacing Library.
- *
- * See the documentation at
- * https://developer.android.com/games/sdk/performance-tuner/custom-engine for
- * more information on using this library in a native Android game.
- *
- */
-
-#pragma once
-
-// There are separate versions for each GameSDK component that use this format:
-#define ANDROID_GAMESDK_PACKED_VERSION(MAJOR, MINOR, BUGFIX) \
-    ((MAJOR << 16) | (MINOR << 8) | (BUGFIX))
-// Accessors
-#define ANDROID_GAMESDK_MAJOR_VERSION(PACKED) ((PACKED) >> 16)
-#define ANDROID_GAMESDK_MINOR_VERSION(PACKED) (((PACKED) >> 8) & 0xff)
-#define ANDROID_GAMESDK_BUGFIX_VERSION(PACKED) ((PACKED) & 0xff)
-
-#define AGDK_STRING_VERSION(MAJOR, MINOR, BUGFIX, GIT) \
-#MAJOR "." #MINOR "." #BUGFIX "." #GIT
diff --git a/android-activity/game-activity-csrc/game-activity/GameActivity.cpp b/android-activity/game-activity-csrc/game-activity/GameActivity.cpp
deleted file mode 100644
index 4dbc9e8..0000000
--- a/android-activity/game-activity-csrc/game-activity/GameActivity.cpp
+++ /dev/null
@@ -1,1147 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "GameActivity.h"
-
-#include <android/api-level.h>
-#include <android/asset_manager.h>
-#include <android/asset_manager_jni.h>
-#include <android/log.h>
-#include <android/looper.h>
-#include <android/native_window.h>
-#include <android/native_window_jni.h>
-#include <dlfcn.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <jni.h>
-#include <poll.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/system_properties.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <memory>
-#include <mutex>
-#include <string>
-
-#include "GameActivityLog.h"
-
-namespace {
-
-struct OwnedGameTextInputState {
-    OwnedGameTextInputState &operator=(const GameTextInputState &rhs) {
-        inner = rhs;
-        owned_string = std::string(rhs.text_UTF8, rhs.text_length);
-        inner.text_UTF8 = owned_string.data();
-        return *this;
-    }
-    GameTextInputState inner;
-    std::string owned_string;
-};
-
-}  // anonymous namespace
-
-#ifndef NELEM
-#define NELEM(x) ((int)(sizeof(x) / sizeof((x)[0])))
-#endif
-
-/*
- * JNI methods of the GameActivity Java class.
- */
-static struct {
-    jmethodID finish;
-    jmethodID setWindowFlags;
-    jmethodID getWindowInsets;
-    jmethodID getWaterfallInsets;
-    jmethodID setImeEditorInfoFields;
-} gGameActivityClassInfo;
-
-/*
- * JNI fields of the androidx.core.graphics.Insets Java class.
- */
-static struct {
-    jfieldID left;
-    jfieldID right;
-    jfieldID top;
-    jfieldID bottom;
-} gInsetsClassInfo;
-
-/*
- * JNI fields of the Configuration Java class.
- */
-static struct ConfigurationClassInfo {
-    jfieldID colorMode;
-    jfieldID densityDpi;
-    jfieldID fontScale;
-    jfieldID fontWeightAdjustment;
-    jfieldID hardKeyboardHidden;
-    jfieldID keyboard;
-    jfieldID keyboardHidden;
-    jfieldID mcc;
-    jfieldID mnc;
-    jfieldID navigation;
-    jfieldID navigationHidden;
-    jfieldID orientation;
-    jfieldID screenHeightDp;
-    jfieldID screenLayout;
-    jfieldID screenWidthDp;
-    jfieldID smallestScreenWidthDp;
-    jfieldID touchscreen;
-    jfieldID uiMode;
-} gConfigurationClassInfo;
-
-/*
- * JNI methods of the WindowInsetsCompat.Type Java class.
- */
-static struct {
-    jmethodID methods[GAMECOMMON_INSETS_TYPE_COUNT];
-    jclass clazz;
-} gWindowInsetsCompatTypeClassInfo;
-
-/*
- * Contains a command to be executed by the GameActivity
- * on the application main thread.
- */
-struct ActivityWork {
-    int32_t cmd;
-    int64_t arg1;
-    int64_t arg2;
-    int64_t arg3;
-};
-
-/*
- * The type of commands that can be passed to the GameActivity and that
- * are executed on the application main thread.
- */
-enum {
-    CMD_FINISH = 1,
-    CMD_SET_WINDOW_FORMAT,
-    CMD_SET_WINDOW_FLAGS,
-    CMD_SHOW_SOFT_INPUT,
-    CMD_HIDE_SOFT_INPUT,
-    CMD_SET_SOFT_INPUT_STATE,
-    CMD_SET_IME_EDITOR_INFO
-};
-
-/*
- * Last known Configuration values. They may be accessed from the different
- * thread, this is why they are made atomic.
- */
-static struct Configuration {
-    std::atomic_int colorMode;
-    std::atomic_int densityDpi;
-    std::atomic<float> fontScale;
-    std::atomic_int fontWeightAdjustment;
-    std::atomic_int hardKeyboardHidden;
-    std::atomic_int keyboard;
-    std::atomic_int keyboardHidden;
-    std::atomic_int mcc;
-    std::atomic_int mnc;
-    std::atomic_int navigation;
-    std::atomic_int navigationHidden;
-    std::atomic_int orientation;
-    std::atomic_int screenHeightDp;
-    std::atomic_int screenLayout;
-    std::atomic_int screenWidthDp;
-    std::atomic_int smallestScreenWidthDp;
-    std::atomic_int touchscreen;
-    std::atomic_int uiMode;
-} gConfiguration;
-
-/*
- * Write a command to be executed by the GameActivity on the application main
- * thread.
- */
-static void write_work(int fd, int32_t cmd, int64_t arg1 = 0, int64_t arg2 = 0,
-                       int64_t arg3 = 0) {
-    ActivityWork work;
-    work.cmd = cmd;
-    work.arg1 = arg1;
-    work.arg2 = arg2;
-    work.arg3 = arg3;
-
-    LOG_TRACE("write_work: cmd=%d", cmd);
-restart:
-    int res = write(fd, &work, sizeof(work));
-    if (res < 0 && errno == EINTR) {
-        goto restart;
-    }
-
-    if (res == sizeof(work)) return;
-
-    if (res < 0) {
-        ALOGW("Failed writing to work fd: %s", strerror(errno));
-    } else {
-        ALOGW("Truncated writing to work fd: %d", res);
-    }
-}
-
-/*
- * Read commands to be executed by the GameActivity on the application main
- * thread.
- */
-static bool read_work(int fd, ActivityWork *outWork) {
-    int res = read(fd, outWork, sizeof(ActivityWork));
-    // no need to worry about EINTR, poll loop will just come back again.
-    if (res == sizeof(ActivityWork)) return true;
-
-    if (res < 0) {
-        ALOGW("Failed reading work fd: %s", strerror(errno));
-    } else {
-        ALOGW("Truncated reading work fd: %d", res);
-    }
-    return false;
-}
-
-/*
- * Native state for interacting with the GameActivity class.
- */
-struct NativeCode : public GameActivity {
-    NativeCode() {
-        memset((GameActivity *)this, 0, sizeof(GameActivity));
-        memset(&callbacks, 0, sizeof(callbacks));
-        memset(&insetsState, 0, sizeof(insetsState));
-        nativeWindow = NULL;
-        mainWorkRead = mainWorkWrite = -1;
-        gameTextInput = NULL;
-    }
-
-    ~NativeCode() {
-        if (callbacks.onDestroy != NULL) {
-            callbacks.onDestroy(this);
-        }
-        if (env != NULL) {
-            if (javaGameActivity != NULL) {
-                env->DeleteGlobalRef(javaGameActivity);
-            }
-            if (javaAssetManager != NULL) {
-                env->DeleteGlobalRef(javaAssetManager);
-            }
-        }
-        GameTextInput_destroy(gameTextInput);
-        if (looper != NULL && mainWorkRead >= 0) {
-            ALooper_removeFd(looper, mainWorkRead);
-        }
-        ALooper_release(looper);
-        looper = NULL;
-
-        setSurface(NULL);
-        if (mainWorkRead >= 0) close(mainWorkRead);
-        if (mainWorkWrite >= 0) close(mainWorkWrite);
-    }
-
-    void setSurface(jobject _surface) {
-        if (nativeWindow != NULL) {
-            ANativeWindow_release(nativeWindow);
-        }
-        if (_surface != NULL) {
-            nativeWindow = ANativeWindow_fromSurface(env, _surface);
-        } else {
-            nativeWindow = NULL;
-        }
-    }
-
-    GameActivityCallbacks callbacks;
-
-    std::string internalDataPathObj;
-    std::string externalDataPathObj;
-    std::string obbPathObj;
-
-    ANativeWindow *nativeWindow;
-    int32_t lastWindowWidth;
-    int32_t lastWindowHeight;
-
-    // These are used to wake up the main thread to process work.
-    int mainWorkRead;
-    int mainWorkWrite;
-    ALooper *looper;
-
-    // Need to hold on to a reference here in case the upper layers destroy our
-    // AssetManager.
-    jobject javaAssetManager;
-
-    GameTextInput *gameTextInput;
-    // Set by users in GameActivity_setTextInputState, then passed to
-    // GameTextInput.
-    OwnedGameTextInputState gameTextInputState;
-    std::mutex gameTextInputStateMutex;
-
-    ARect insetsState[GAMECOMMON_INSETS_TYPE_COUNT];
-};
-
-static void readConfigurationValues(NativeCode *code, jobject javaConfig);
-
-extern "C" void GameActivity_finish(GameActivity *activity) {
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    write_work(code->mainWorkWrite, CMD_FINISH, 0);
-}
-
-extern "C" void GameActivity_setWindowFlags(GameActivity *activity,
-                                            uint32_t values, uint32_t mask) {
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    write_work(code->mainWorkWrite, CMD_SET_WINDOW_FLAGS, values, mask);
-}
-
-extern "C" void GameActivity_showSoftInput(GameActivity *activity,
-                                           uint32_t flags) {
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    write_work(code->mainWorkWrite, CMD_SHOW_SOFT_INPUT, flags);
-}
-
-extern "C" void GameActivity_setTextInputState(
-    GameActivity *activity, const GameTextInputState *state) {
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    std::lock_guard<std::mutex> lock(code->gameTextInputStateMutex);
-    code->gameTextInputState = *state;
-    write_work(code->mainWorkWrite, CMD_SET_SOFT_INPUT_STATE);
-}
-
-extern "C" void GameActivity_getTextInputState(
-    GameActivity *activity, GameTextInputGetStateCallback callback,
-    void *context) {
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    return GameTextInput_getState(code->gameTextInput, callback, context);
-}
-
-extern "C" void GameActivity_hideSoftInput(GameActivity *activity,
-                                           uint32_t flags) {
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    write_work(code->mainWorkWrite, CMD_HIDE_SOFT_INPUT, flags);
-}
-
-extern "C" void GameActivity_getWindowInsets(GameActivity *activity,
-                                             GameCommonInsetsType type,
-                                             ARect *insets) {
-    if (type < 0 || type >= GAMECOMMON_INSETS_TYPE_COUNT) return;
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    *insets = code->insetsState[type];
-}
-
-extern "C" GameTextInput *GameActivity_getTextInput(
-    const GameActivity *activity) {
-    const NativeCode *code = static_cast<const NativeCode *>(activity);
-    return code->gameTextInput;
-}
-
-/*
- * Log the JNI exception, if any.
- */
-static void checkAndClearException(JNIEnv *env, const char *methodName) {
-    if (env->ExceptionCheck()) {
-        ALOGE("Exception while running %s", methodName);
-        env->ExceptionDescribe();
-        env->ExceptionClear();
-    }
-}
-
-/*
- * Callback for handling native events on the application's main thread.
- */
-static int mainWorkCallback(int fd, int events, void *data) {
-    ALOGD("************** mainWorkCallback *********");
-    NativeCode *code = (NativeCode *)data;
-    if ((events & POLLIN) == 0) {
-        return 1;
-    }
-
-    ActivityWork work;
-    if (!read_work(code->mainWorkRead, &work)) {
-        return 1;
-    }
-    LOG_TRACE("mainWorkCallback: cmd=%d", work.cmd);
-    switch (work.cmd) {
-        case CMD_FINISH: {
-            code->env->CallVoidMethod(code->javaGameActivity,
-                                      gGameActivityClassInfo.finish);
-            checkAndClearException(code->env, "finish");
-        } break;
-        case CMD_SET_WINDOW_FLAGS: {
-            code->env->CallVoidMethod(code->javaGameActivity,
-                                      gGameActivityClassInfo.setWindowFlags,
-                                      work.arg1, work.arg2);
-            checkAndClearException(code->env, "setWindowFlags");
-        } break;
-        case CMD_SHOW_SOFT_INPUT: {
-            GameTextInput_showIme(code->gameTextInput, work.arg1);
-        } break;
-        case CMD_SET_SOFT_INPUT_STATE: {
-            std::lock_guard<std::mutex> lock(code->gameTextInputStateMutex);
-            GameTextInput_setState(code->gameTextInput,
-                                   &code->gameTextInputState.inner);
-            checkAndClearException(code->env, "setTextInputState");
-        } break;
-        case CMD_HIDE_SOFT_INPUT: {
-            GameTextInput_hideIme(code->gameTextInput, work.arg1);
-        } break;
-        case CMD_SET_IME_EDITOR_INFO: {
-            code->env->CallVoidMethod(
-                code->javaGameActivity,
-                gGameActivityClassInfo.setImeEditorInfoFields, work.arg1,
-                work.arg2, work.arg3);
-            checkAndClearException(code->env, "setImeEditorInfo");
-        } break;
-        default:
-            ALOGW("Unknown work command: %d", work.cmd);
-            break;
-    }
-
-    return 1;
-}
-
-// ------------------------------------------------------------------------
-static thread_local std::string g_error_msg;
-
-static jlong initializeNativeCode_native(
-    JNIEnv *env, jobject javaGameActivity, jstring internalDataDir,
-    jstring obbDir, jstring externalDataDir, jobject jAssetMgr,
-    jbyteArray savedState, jobject javaConfig) {
-    LOG_TRACE("initializeNativeCode_native");
-    NativeCode *code = NULL;
-
-    code = new NativeCode();
-
-    code->looper = ALooper_forThread();
-    if (code->looper == nullptr) {
-        g_error_msg = "Unable to retrieve native ALooper";
-        ALOGW("%s", g_error_msg.c_str());
-        delete code;
-        return 0;
-    }
-    ALooper_acquire(code->looper);
-
-    int msgpipe[2];
-    if (pipe(msgpipe)) {
-        g_error_msg = "could not create pipe: ";
-        g_error_msg += strerror(errno);
-
-        ALOGW("%s", g_error_msg.c_str());
-        delete code;
-        return 0;
-    }
-    code->mainWorkRead = msgpipe[0];
-    code->mainWorkWrite = msgpipe[1];
-    int result = fcntl(code->mainWorkRead, F_SETFL, O_NONBLOCK);
-    SLOGW_IF(result != 0,
-             "Could not make main work read pipe "
-             "non-blocking: %s",
-             strerror(errno));
-    result = fcntl(code->mainWorkWrite, F_SETFL, O_NONBLOCK);
-    SLOGW_IF(result != 0,
-             "Could not make main work write pipe "
-             "non-blocking: %s",
-             strerror(errno));
-    ALooper_addFd(code->looper, code->mainWorkRead, 0, ALOOPER_EVENT_INPUT,
-                  mainWorkCallback, code);
-
-    code->GameActivity::callbacks = &code->callbacks;
-    if (env->GetJavaVM(&code->vm) < 0) {
-        ALOGW("GameActivity GetJavaVM failed");
-        delete code;
-        return 0;
-    }
-    code->env = env;
-    code->javaGameActivity = env->NewGlobalRef(javaGameActivity);
-
-    const char *dirStr =
-        internalDataDir ? env->GetStringUTFChars(internalDataDir, NULL) : "";
-    code->internalDataPathObj = dirStr;
-    code->internalDataPath = code->internalDataPathObj.c_str();
-    if (internalDataDir) env->ReleaseStringUTFChars(internalDataDir, dirStr);
-
-    dirStr =
-        externalDataDir ? env->GetStringUTFChars(externalDataDir, NULL) : "";
-    code->externalDataPathObj = dirStr;
-    code->externalDataPath = code->externalDataPathObj.c_str();
-    if (externalDataDir) env->ReleaseStringUTFChars(externalDataDir, dirStr);
-
-    code->javaAssetManager = env->NewGlobalRef(jAssetMgr);
-    code->assetManager = AAssetManager_fromJava(env, jAssetMgr);
-
-    dirStr = obbDir ? env->GetStringUTFChars(obbDir, NULL) : "";
-    code->obbPathObj = dirStr;
-    code->obbPath = code->obbPathObj.c_str();
-    if (obbDir) env->ReleaseStringUTFChars(obbDir, dirStr);
-
-    jbyte *rawSavedState = NULL;
-    jsize rawSavedSize = 0;
-    if (savedState != NULL) {
-        rawSavedState = env->GetByteArrayElements(savedState, NULL);
-        rawSavedSize = env->GetArrayLength(savedState);
-    }
-
-    readConfigurationValues(code, javaConfig);
-
-    GameActivity_onCreate_C(code, rawSavedState, rawSavedSize);
-
-    code->gameTextInput = GameTextInput_init(env, 0);
-    GameTextInput_setEventCallback(code->gameTextInput,
-                                   reinterpret_cast<GameTextInputEventCallback>(
-                                       code->callbacks.onTextInputEvent),
-                                   code);
-
-    if (rawSavedState != NULL) {
-        env->ReleaseByteArrayElements(savedState, rawSavedState, 0);
-    }
-
-    return reinterpret_cast<jlong>(code);
-}
-
-static jstring getDlError_native(JNIEnv *env, jobject javaGameActivity) {
-    jstring result = env->NewStringUTF(g_error_msg.c_str());
-    g_error_msg.clear();
-    return result;
-}
-
-static void terminateNativeCode_native(JNIEnv *env, jobject javaGameActivity,
-                                    jlong handle) {
-    LOG_TRACE("terminateNativeCode_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        delete code;
-    }
-}
-
-static void onStart_native(JNIEnv *env, jobject javaGameActivity,
-                           jlong handle) {
-    ALOGV("onStart_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->callbacks.onStart != NULL) {
-            code->callbacks.onStart(code);
-        }
-    }
-}
-
-static void onResume_native(JNIEnv *env, jobject javaGameActivity,
-                            jlong handle) {
-    LOG_TRACE("onResume_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->callbacks.onResume != NULL) {
-            code->callbacks.onResume(code);
-        }
-    }
-}
-
-struct SaveInstanceLocals {
-    JNIEnv *env;
-    jbyteArray array;
-};
-
-static jbyteArray onSaveInstanceState_native(JNIEnv *env,
-                                             jobject javaGameActivity,
-                                             jlong handle) {
-    LOG_TRACE("onSaveInstanceState_native");
-
-    SaveInstanceLocals locals{
-        env, NULL};  // Passed through the user's state prep function.
-
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->callbacks.onSaveInstanceState != NULL) {
-            code->callbacks.onSaveInstanceState(
-                code,
-                [](const char *bytes, int len, void *context) {
-                    auto locals = static_cast<SaveInstanceLocals *>(context);
-                    if (len > 0) {
-                        locals->array = locals->env->NewByteArray(len);
-                        if (locals->array != NULL) {
-                            locals->env->SetByteArrayRegion(
-                                locals->array, 0, len, (const jbyte *)bytes);
-                        }
-                    }
-                },
-                &locals);
-        }
-    }
-    return locals.array;
-}
-
-static void onPause_native(JNIEnv *env, jobject javaGameActivity,
-                           jlong handle) {
-    LOG_TRACE("onPause_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->callbacks.onPause != NULL) {
-            code->callbacks.onPause(code);
-        }
-    }
-}
-
-static void onStop_native(JNIEnv *env, jobject javaGameActivity, jlong handle) {
-    LOG_TRACE("onStop_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->callbacks.onStop != NULL) {
-            code->callbacks.onStop(code);
-        }
-    }
-}
-
-static void readConfigurationValues(NativeCode *code, jobject javaConfig) {
-    if (gConfigurationClassInfo.colorMode != NULL) {
-        gConfiguration.colorMode = code->env->GetIntField(
-            javaConfig, gConfigurationClassInfo.colorMode);
-    }
-
-    gConfiguration.densityDpi =
-        code->env->GetIntField(javaConfig, gConfigurationClassInfo.densityDpi);
-    gConfiguration.fontScale =
-        code->env->GetFloatField(javaConfig, gConfigurationClassInfo.fontScale);
-
-    if (gConfigurationClassInfo.fontWeightAdjustment != NULL) {
-        gConfiguration.fontWeightAdjustment = code->env->GetIntField(
-            javaConfig, gConfigurationClassInfo.fontWeightAdjustment);
-    }
-
-    gConfiguration.hardKeyboardHidden = code->env->GetIntField(
-        javaConfig, gConfigurationClassInfo.hardKeyboardHidden);
-    gConfiguration.mcc =
-        code->env->GetIntField(javaConfig, gConfigurationClassInfo.mcc);
-    gConfiguration.mnc =
-        code->env->GetIntField(javaConfig, gConfigurationClassInfo.mnc);
-    gConfiguration.navigation =
-        code->env->GetIntField(javaConfig, gConfigurationClassInfo.navigation);
-    gConfiguration.navigationHidden = code->env->GetIntField(
-        javaConfig, gConfigurationClassInfo.navigationHidden);
-    gConfiguration.orientation =
-        code->env->GetIntField(javaConfig, gConfigurationClassInfo.orientation);
-    gConfiguration.screenHeightDp = code->env->GetIntField(
-        javaConfig, gConfigurationClassInfo.screenHeightDp);
-    gConfiguration.screenLayout = code->env->GetIntField(
-        javaConfig, gConfigurationClassInfo.screenLayout);
-    gConfiguration.screenWidthDp = code->env->GetIntField(
-        javaConfig, gConfigurationClassInfo.screenWidthDp);
-    gConfiguration.smallestScreenWidthDp = code->env->GetIntField(
-        javaConfig, gConfigurationClassInfo.smallestScreenWidthDp);
-    gConfiguration.touchscreen =
-        code->env->GetIntField(javaConfig, gConfigurationClassInfo.touchscreen);
-    gConfiguration.uiMode =
-        code->env->GetIntField(javaConfig, gConfigurationClassInfo.uiMode);
-
-    checkAndClearException(code->env, "Configuration.get");
-}
-
-static void onConfigurationChanged_native(JNIEnv *env, jobject javaGameActivity,
-                                          jlong handle, jobject javaNewConfig) {
-    LOG_TRACE("onConfigurationChanged_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        readConfigurationValues(code, javaNewConfig);
-
-        if (code->callbacks.onConfigurationChanged != NULL) {
-            code->callbacks.onConfigurationChanged(code);
-        }
-    }
-}
-
-static void onTrimMemory_native(JNIEnv *env, jobject javaGameActivity,
-                                jlong handle, jint level) {
-    LOG_TRACE("onTrimMemory_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->callbacks.onTrimMemory != NULL) {
-            code->callbacks.onTrimMemory(code, level);
-        }
-    }
-}
-
-static void onWindowFocusChanged_native(JNIEnv *env, jobject javaGameActivity,
-                                        jlong handle, jboolean focused) {
-    LOG_TRACE("onWindowFocusChanged_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->callbacks.onWindowFocusChanged != NULL) {
-            code->callbacks.onWindowFocusChanged(code, focused ? 1 : 0);
-        }
-    }
-}
-
-static void onSurfaceCreated_native(JNIEnv *env, jobject javaGameActivity,
-                                    jlong handle, jobject surface) {
-    ALOGV("onSurfaceCreated_native");
-    LOG_TRACE("onSurfaceCreated_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        code->setSurface(surface);
-
-        if (code->nativeWindow != NULL &&
-            code->callbacks.onNativeWindowCreated != NULL) {
-            code->callbacks.onNativeWindowCreated(code, code->nativeWindow);
-        }
-    }
-}
-
-static void onSurfaceChanged_native(JNIEnv *env, jobject javaGameActivity,
-                                    jlong handle, jobject surface, jint format,
-                                    jint width, jint height) {
-    LOG_TRACE("onSurfaceChanged_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        ANativeWindow *oldNativeWindow = code->nativeWindow;
-        // Fix for window being destroyed behind the scenes on older Android
-        // versions.
-        if (oldNativeWindow != NULL) {
-            ANativeWindow_acquire(oldNativeWindow);
-        }
-        code->setSurface(surface);
-        if (oldNativeWindow != code->nativeWindow) {
-            if (oldNativeWindow != NULL &&
-                code->callbacks.onNativeWindowDestroyed != NULL) {
-                code->callbacks.onNativeWindowDestroyed(code, oldNativeWindow);
-            }
-            if (code->nativeWindow != NULL) {
-                if (code->callbacks.onNativeWindowCreated != NULL) {
-                    code->callbacks.onNativeWindowCreated(code,
-                                                          code->nativeWindow);
-                }
-
-                code->lastWindowWidth =
-                    ANativeWindow_getWidth(code->nativeWindow);
-                code->lastWindowHeight =
-                    ANativeWindow_getHeight(code->nativeWindow);
-            }
-        } else {
-            // Maybe it was resized?
-            int32_t newWidth = ANativeWindow_getWidth(code->nativeWindow);
-            int32_t newHeight = ANativeWindow_getHeight(code->nativeWindow);
-
-            if (newWidth != code->lastWindowWidth ||
-                newHeight != code->lastWindowHeight) {
-                code->lastWindowWidth = newWidth;
-                code->lastWindowHeight = newHeight;
-
-                if (code->callbacks.onNativeWindowResized != NULL) {
-                    code->callbacks.onNativeWindowResized(
-                        code, code->nativeWindow, newWidth, newHeight);
-                }
-            }
-        }
-        // Release the window we acquired earlier.
-        if (oldNativeWindow != NULL) {
-            ANativeWindow_release(oldNativeWindow);
-        }
-    }
-}
-
-static void onSurfaceRedrawNeeded_native(JNIEnv *env, jobject javaGameActivity,
-                                         jlong handle) {
-    LOG_TRACE("onSurfaceRedrawNeeded_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->nativeWindow != NULL &&
-            code->callbacks.onNativeWindowRedrawNeeded != NULL) {
-            code->callbacks.onNativeWindowRedrawNeeded(code,
-                                                       code->nativeWindow);
-        }
-    }
-}
-
-static void onSurfaceDestroyed_native(JNIEnv *env, jobject javaGameActivity,
-                                      jlong handle) {
-    LOG_TRACE("onSurfaceDestroyed_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->nativeWindow != NULL &&
-            code->callbacks.onNativeWindowDestroyed != NULL) {
-            code->callbacks.onNativeWindowDestroyed(code, code->nativeWindow);
-        }
-        code->setSurface(NULL);
-    }
-}
-
-extern "C" void GameActivity_setImeEditorInfo(GameActivity *activity,
-                                              int inputType, int actionId,
-                                              int imeOptions) {
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    write_work(code->mainWorkWrite, CMD_SET_IME_EDITOR_INFO, inputType,
-               actionId, imeOptions);
-}
-
-extern "C" int GameActivity_getColorMode(GameActivity *) {
-    return gConfiguration.colorMode;
-}
-
-extern "C" int GameActivity_getDensityDpi(GameActivity *) {
-    return gConfiguration.densityDpi;
-}
-
-extern "C" float GameActivity_getFontScale(GameActivity *) {
-    return gConfiguration.fontScale;
-}
-
-extern "C" int GameActivity_getFontWeightAdjustment(GameActivity *) {
-    return gConfiguration.fontWeightAdjustment;
-}
-
-extern "C" int GameActivity_getHardKeyboardHidden(GameActivity *) {
-    return gConfiguration.hardKeyboardHidden;
-}
-
-extern "C" int GameActivity_getKeyboard(GameActivity *) {
-    return gConfiguration.keyboard;
-}
-
-extern "C" int GameActivity_getKeyboardHidden(GameActivity *) {
-    return gConfiguration.keyboardHidden;
-}
-
-extern "C" int GameActivity_getMcc(GameActivity *) {
-    return gConfiguration.mcc;
-}
-
-extern "C" int GameActivity_getMnc(GameActivity *) {
-    return gConfiguration.mnc;
-}
-
-extern "C" int GameActivity_getNavigation(GameActivity *) {
-    return gConfiguration.navigation;
-}
-
-extern "C" int GameActivity_getNavigationHidden(GameActivity *) {
-    return gConfiguration.navigationHidden;
-}
-
-extern "C" int GameActivity_getOrientation(GameActivity *) {
-    return gConfiguration.orientation;
-}
-
-extern "C" int GameActivity_getScreenHeightDp(GameActivity *) {
-    return gConfiguration.screenHeightDp;
-}
-
-extern "C" int GameActivity_getScreenLayout(GameActivity *) {
-    return gConfiguration.screenLayout;
-}
-
-extern "C" int GameActivity_getScreenWidthDp(GameActivity *) {
-    return gConfiguration.screenWidthDp;
-}
-
-extern "C" int GameActivity_getSmallestScreenWidthDp(GameActivity *) {
-    return gConfiguration.smallestScreenWidthDp;
-}
-
-extern "C" int GameActivity_getTouchscreen(GameActivity *) {
-    return gConfiguration.touchscreen;
-}
-
-extern "C" int GameActivity_getUIMode(GameActivity *) {
-    return gConfiguration.uiMode;
-}
-
-static bool onTouchEvent_native(JNIEnv *env, jobject javaGameActivity,
-                                jlong handle, jobject motionEvent) {
-    if (handle == 0) return false;
-    NativeCode *code = (NativeCode *)handle;
-    if (code->callbacks.onTouchEvent == nullptr) return false;
-
-    static GameActivityMotionEvent c_event;
-    GameActivityMotionEvent_fromJava(env, motionEvent, &c_event);
-    return code->callbacks.onTouchEvent(code, &c_event);
-
-}
-
-static bool onKeyUp_native(JNIEnv *env, jobject javaGameActivity, jlong handle,
-                           jobject keyEvent) {
-    if (handle == 0) return false;
-    NativeCode *code = (NativeCode *)handle;
-    if (code->callbacks.onKeyUp == nullptr) return false;
-
-    static GameActivityKeyEvent c_event;
-    GameActivityKeyEvent_fromJava(env, keyEvent, &c_event);
-    return code->callbacks.onKeyUp(code, &c_event);
-}
-
-static bool onKeyDown_native(JNIEnv *env, jobject javaGameActivity,
-                             jlong handle, jobject keyEvent) {
-    if (handle == 0) return false;
-    NativeCode *code = (NativeCode *)handle;
-    if (code->callbacks.onKeyDown == nullptr) return false;
-
-    static GameActivityKeyEvent c_event;
-    GameActivityKeyEvent_fromJava(env, keyEvent, &c_event);
-    return code->callbacks.onKeyDown(code, &c_event);
-}
-
-static void onTextInput_native(JNIEnv *env, jobject activity, jlong handle,
-                               jobject textInputEvent) {
-    if (handle == 0) return;
-    NativeCode *code = (NativeCode *)handle;
-    GameTextInput_processEvent(code->gameTextInput, textInputEvent);
-}
-
-static void onWindowInsetsChanged_native(JNIEnv *env, jobject activity,
-                                         jlong handle) {
-    if (handle == 0) return;
-    NativeCode *code = (NativeCode *)handle;
-    if (code->callbacks.onWindowInsetsChanged == nullptr) return;
-    for (int type = 0; type < GAMECOMMON_INSETS_TYPE_COUNT; ++type) {
-        jobject jinsets;
-        // Note that waterfall insets are handled differently on the Java side.
-        if (type == GAMECOMMON_INSETS_TYPE_WATERFALL) {
-            jinsets = env->CallObjectMethod(
-                code->javaGameActivity,
-                gGameActivityClassInfo.getWaterfallInsets);
-        } else {
-            jint jtype = env->CallStaticIntMethod(
-                gWindowInsetsCompatTypeClassInfo.clazz,
-                gWindowInsetsCompatTypeClassInfo.methods[type]);
-            jinsets = env->CallObjectMethod(
-                code->javaGameActivity, gGameActivityClassInfo.getWindowInsets,
-                jtype);
-        }
-        ARect &insets = code->insetsState[type];
-        if (jinsets == nullptr) {
-            insets.left = 0;
-            insets.right = 0;
-            insets.top = 0;
-            insets.bottom = 0;
-        } else {
-            insets.left = env->GetIntField(jinsets, gInsetsClassInfo.left);
-            insets.right = env->GetIntField(jinsets, gInsetsClassInfo.right);
-            insets.top = env->GetIntField(jinsets, gInsetsClassInfo.top);
-            insets.bottom = env->GetIntField(jinsets, gInsetsClassInfo.bottom);
-        }
-    }
-    GameTextInput_processImeInsets(
-        code->gameTextInput, &code->insetsState[GAMECOMMON_INSETS_TYPE_IME]);
-    code->callbacks.onWindowInsetsChanged(code);
-}
-
-static void setInputConnection_native(JNIEnv *env, jobject activity,
-                                      jlong handle, jobject inputConnection) {
-    NativeCode *code = (NativeCode *)handle;
-    GameTextInput_setInputConnection(code->gameTextInput, inputConnection);
-}
-
-static void onContentRectChangedNative_native(JNIEnv *env, jobject activity,
-                                              jlong handle, jint x, jint y,
-                                              jint w, jint h) {
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-
-        if (code->callbacks.onContentRectChanged != nullptr) {
-            ARect rect;
-            rect.left = x;
-            rect.top = y;
-            rect.right = x+w;
-            rect.bottom = y+h;
-            code->callbacks.onContentRectChanged(code, &rect);
-        }
-    }
-}
-
-static const JNINativeMethod g_methods[] = {
-    {"initializeNativeCode",
-     "(Ljava/lang/String;Ljava/lang/String;"
-     "Ljava/lang/String;Landroid/content/res/AssetManager;"
-     "[BLandroid/content/res/Configuration;)J",
-     (void *)initializeNativeCode_native},
-    {"getDlError", "()Ljava/lang/String;", (void *)getDlError_native},
-    {"terminateNativeCode", "(J)V", (void *)terminateNativeCode_native},
-    {"onStartNative", "(J)V", (void *)onStart_native},
-    {"onResumeNative", "(J)V", (void *)onResume_native},
-    {"onSaveInstanceStateNative", "(J)[B", (void *)onSaveInstanceState_native},
-    {"onPauseNative", "(J)V", (void *)onPause_native},
-    {"onStopNative", "(J)V", (void *)onStop_native},
-    {"onConfigurationChangedNative", "(JLandroid/content/res/Configuration;)V",
-     (void *)onConfigurationChanged_native},
-    {"onTrimMemoryNative", "(JI)V", (void *)onTrimMemory_native},
-    {"onWindowFocusChangedNative", "(JZ)V",
-     (void *)onWindowFocusChanged_native},
-    {"onSurfaceCreatedNative", "(JLandroid/view/Surface;)V",
-     (void *)onSurfaceCreated_native},
-    {"onSurfaceChangedNative", "(JLandroid/view/Surface;III)V",
-     (void *)onSurfaceChanged_native},
-    {"onSurfaceRedrawNeededNative", "(JLandroid/view/Surface;)V",
-     (void *)onSurfaceRedrawNeeded_native},
-    {"onSurfaceDestroyedNative", "(J)V", (void *)onSurfaceDestroyed_native},
-    {"onTouchEventNative", "(JLandroid/view/MotionEvent;)Z",
-     (void *)onTouchEvent_native},
-    {"onKeyDownNative", "(JLandroid/view/KeyEvent;)Z",
-     (void *)onKeyDown_native},
-    {"onKeyUpNative", "(JLandroid/view/KeyEvent;)Z", (void *)onKeyUp_native},
-    {"onTextInputEventNative",
-     "(JLcom/google/androidgamesdk/gametextinput/State;)V",
-     (void *)onTextInput_native},
-    {"onWindowInsetsChangedNative", "(J)V",
-     (void *)onWindowInsetsChanged_native},
-    {"setInputConnectionNative",
-     "(JLcom/google/androidgamesdk/gametextinput/InputConnection;)V",
-     (void *)setInputConnection_native},
-    {"onContentRectChangedNative", "(JIIII)V",
-     (void *)onContentRectChangedNative_native},
-};
-
-static const char *const kGameActivityPathName =
-    "com/google/androidgamesdk/GameActivity";
-
-static const char *const kInsetsPathName = "androidx/core/graphics/Insets";
-static const char *const kConfigurationPathName =
-    "android/content/res/Configuration";
-static const char *const kWindowInsetsCompatTypePathName =
-    "androidx/core/view/WindowInsetsCompat$Type";
-
-#define FIND_CLASS(var, className)   \
-    var = env->FindClass(className); \
-    LOG_FATAL_IF(!var, "Unable to find class %s", className);
-
-#define GET_METHOD_ID(var, clazz, methodName, fieldDescriptor)  \
-    var = env->GetMethodID(clazz, methodName, fieldDescriptor); \
-    LOG_FATAL_IF(!var, "Unable to find method %s", methodName);
-
-#define GET_STATIC_METHOD_ID(var, clazz, methodName, fieldDescriptor) \
-    var = env->GetStaticMethodID(clazz, methodName, fieldDescriptor); \
-    LOG_FATAL_IF(!var, "Unable to find static method %s", methodName);
-
-#define GET_FIELD_ID(var, clazz, fieldName, fieldDescriptor)  \
-    var = env->GetFieldID(clazz, fieldName, fieldDescriptor); \
-    LOG_FATAL_IF(!var, "Unable to find field %s", fieldName);
-
-static int jniRegisterNativeMethods(JNIEnv *env, const char *className,
-                                    const JNINativeMethod *methods,
-                                    int numMethods) {
-    ALOGV("Registering %s's %d native methods...", className, numMethods);
-    jclass clazz = env->FindClass(className);
-    LOG_FATAL_IF(clazz == nullptr,
-                 "Native registration unable to find class '%s'; aborting...",
-                 className);
-    int result = env->RegisterNatives(clazz, methods, numMethods);
-    env->DeleteLocalRef(clazz);
-    if (result == 0) {
-        return 0;
-    }
-
-    // Failure to register natives is fatal. Try to report the corresponding
-    // exception, otherwise abort with generic failure message.
-    jthrowable thrown = env->ExceptionOccurred();
-    if (thrown != NULL) {
-        env->ExceptionDescribe();
-        env->DeleteLocalRef(thrown);
-    }
-    LOG_FATAL("RegisterNatives failed for '%s'; aborting...", className);
-}
-
-extern "C" int GameActivity_register(JNIEnv *env) {
-    ALOGD("GameActivity_register");
-    jclass activity_class;
-    FIND_CLASS(activity_class, kGameActivityPathName);
-    GET_METHOD_ID(gGameActivityClassInfo.finish, activity_class, "finish",
-                  "()V");
-    GET_METHOD_ID(gGameActivityClassInfo.setWindowFlags, activity_class,
-                  "setWindowFlags", "(II)V");
-    GET_METHOD_ID(gGameActivityClassInfo.getWindowInsets, activity_class,
-                  "getWindowInsets", "(I)Landroidx/core/graphics/Insets;");
-    GET_METHOD_ID(gGameActivityClassInfo.getWaterfallInsets, activity_class,
-                  "getWaterfallInsets", "()Landroidx/core/graphics/Insets;");
-    GET_METHOD_ID(gGameActivityClassInfo.setImeEditorInfoFields, activity_class,
-                  "setImeEditorInfoFields", "(III)V");
-
-    jclass insets_class;
-    FIND_CLASS(insets_class, kInsetsPathName);
-    GET_FIELD_ID(gInsetsClassInfo.left, insets_class, "left", "I");
-    GET_FIELD_ID(gInsetsClassInfo.right, insets_class, "right", "I");
-    GET_FIELD_ID(gInsetsClassInfo.top, insets_class, "top", "I");
-    GET_FIELD_ID(gInsetsClassInfo.bottom, insets_class, "bottom", "I");
-
-    jclass configuration_class;
-    FIND_CLASS(configuration_class, kConfigurationPathName);
-
-    if (android_get_device_api_level() >= 26) {
-        GET_FIELD_ID(gConfigurationClassInfo.colorMode, configuration_class,
-                     "colorMode", "I");
-    }
-
-    GET_FIELD_ID(gConfigurationClassInfo.densityDpi, configuration_class,
-                 "densityDpi", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.fontScale, configuration_class,
-                 "fontScale", "F");
-
-    if (android_get_device_api_level() >= 31) {
-        GET_FIELD_ID(gConfigurationClassInfo.fontWeightAdjustment,
-                     configuration_class, "fontWeightAdjustment", "I");
-    }
-
-    GET_FIELD_ID(gConfigurationClassInfo.hardKeyboardHidden,
-                 configuration_class, "hardKeyboardHidden", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.keyboard, configuration_class,
-                 "keyboard", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.keyboardHidden, configuration_class,
-                 "keyboardHidden", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.mcc, configuration_class, "mcc", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.mnc, configuration_class, "mnc", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.navigation, configuration_class,
-                 "navigation", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.navigationHidden, configuration_class,
-                 "navigationHidden", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.orientation, configuration_class,
-                 "orientation", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.screenHeightDp, configuration_class,
-                 "screenHeightDp", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.screenLayout, configuration_class,
-                 "screenLayout", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.screenWidthDp, configuration_class,
-                 "screenWidthDp", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.smallestScreenWidthDp,
-                 configuration_class, "smallestScreenWidthDp", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.touchscreen, configuration_class,
-                 "touchscreen", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.uiMode, configuration_class, "uiMode",
-                 "I");
-
-    jclass windowInsetsCompatType_class;
-    FIND_CLASS(windowInsetsCompatType_class, kWindowInsetsCompatTypePathName);
-    gWindowInsetsCompatTypeClassInfo.clazz =
-        (jclass)env->NewGlobalRef(windowInsetsCompatType_class);
-    // These names must match, in order, the GameCommonInsetsType enum fields
-    // Note that waterfall is handled differently by the insets API, so we
-    // exclude it here.
-    const char *methodNames[GAMECOMMON_INSETS_TYPE_WATERFALL] = {
-        "captionBar",
-        "displayCutout",
-        "ime",
-        "mandatorySystemGestures",
-        "navigationBars",
-        "statusBars",
-        "systemBars",
-        "systemGestures",
-        "tappableElement"};
-    for (int i = 0; i < GAMECOMMON_INSETS_TYPE_WATERFALL; ++i) {
-        GET_STATIC_METHOD_ID(gWindowInsetsCompatTypeClassInfo.methods[i],
-                             windowInsetsCompatType_class, methodNames[i],
-                             "()I");
-    }
-    return jniRegisterNativeMethods(env, kGameActivityPathName, g_methods,
-                                    NELEM(g_methods));
-}
-
-// XXX: This symbol is renamed with a _C suffix and then re-exported from
-// Rust because Rust/Cargo don't give us a way to directly export symbols
-// from C/C++ code: https://github.com/rust-lang/rfcs/issues/2771
-//
-extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_androidgamesdk_GameActivity_initializeNativeCode_C(
-    JNIEnv *env, jobject javaGameActivity, jstring internalDataDir,
-    jstring obbDir, jstring externalDataDir, jobject jAssetMgr,
-    jbyteArray savedState, jobject javaConfig) {
-    GameActivity_register(env);
-    jlong nativeCode = initializeNativeCode_native(
-        env, javaGameActivity, internalDataDir, obbDir, externalDataDir,
-        jAssetMgr, savedState, javaConfig);
-    return nativeCode;
-}
diff --git a/android-activity/game-activity-csrc/game-activity/GameActivity.h b/android-activity/game-activity-csrc/game-activity/GameActivity.h
deleted file mode 100644
index b945069..0000000
--- a/android-activity/game-activity-csrc/game-activity/GameActivity.h
+++ /dev/null
@@ -1,636 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @addtogroup GameActivity Game Activity
- * The interface to use GameActivity.
- * @{
- */
-
-/**
- * @file GameActivity.h
- */
-
-#ifndef ANDROID_GAME_SDK_GAME_ACTIVITY_H
-#define ANDROID_GAME_SDK_GAME_ACTIVITY_H
-
-#include <android/asset_manager.h>
-#include <android/input.h>
-#include <android/native_window.h>
-#include <android/rect.h>
-#include <jni.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <sys/types.h>
-
-#include "common/gamesdk_common.h"
-#include "game-activity/GameActivityEvents.h"
-#include "game-text-input/gametextinput.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define GAMEACTIVITY_MAJOR_VERSION 2
-#define GAMEACTIVITY_MINOR_VERSION 0
-#define GAMEACTIVITY_BUGFIX_VERSION 2
-#define GAMEACTIVITY_PACKED_VERSION                            \
-    ANDROID_GAMESDK_PACKED_VERSION(GAMEACTIVITY_MAJOR_VERSION, \
-                                   GAMEACTIVITY_MINOR_VERSION, \
-                                   GAMEACTIVITY_BUGFIX_VERSION)
-
-/**
- * {@link GameActivityCallbacks}
- */
-struct GameActivityCallbacks;
-
-/**
- * This structure defines the native side of an android.app.GameActivity.
- * It is created by the framework, and handed to the application's native
- * code as it is being launched.
- */
-typedef struct GameActivity {
-    /**
-     * Pointer to the callback function table of the native application.
-     * You can set the functions here to your own callbacks.  The callbacks
-     * pointer itself here should not be changed; it is allocated and managed
-     * for you by the framework.
-     */
-    struct GameActivityCallbacks* callbacks;
-
-    /**
-     * The global handle on the process's Java VM.
-     */
-    JavaVM* vm;
-
-    /**
-     * JNI context for the main thread of the app.  Note that this field
-     * can ONLY be used from the main thread of the process; that is, the
-     * thread that calls into the GameActivityCallbacks.
-     */
-    JNIEnv* env;
-
-    /**
-     * The GameActivity object handle.
-     */
-    jobject javaGameActivity;
-
-    /**
-     * Path to this application's internal data directory.
-     */
-    const char* internalDataPath;
-
-    /**
-     * Path to this application's external (removable/mountable) data directory.
-     */
-    const char* externalDataPath;
-
-    /**
-     * The platform's SDK version code.
-     */
-    int32_t sdkVersion;
-
-    /**
-     * This is the native instance of the application.  It is not used by
-     * the framework, but can be set by the application to its own instance
-     * state.
-     */
-    void* instance;
-
-    /**
-     * Pointer to the Asset Manager instance for the application.  The
-     * application uses this to access binary assets bundled inside its own .apk
-     * file.
-     */
-    AAssetManager* assetManager;
-
-    /**
-     * Available starting with Honeycomb: path to the directory containing
-     * the application's OBB files (if any).  If the app doesn't have any
-     * OBB files, this directory may not exist.
-     */
-    const char* obbPath;
-} GameActivity;
-
-/**
- * A function the user should call from their callback with the data, its length
- * and the library- supplied context.
- */
-typedef void (*SaveInstanceStateRecallback)(const char* bytes, int len,
-                                            void* context);
-
-/**
- * These are the callbacks the framework makes into a native application.
- * All of these callbacks happen on the main thread of the application.
- * By default, all callbacks are NULL; set to a pointer to your own function
- * to have it called.
- */
-typedef struct GameActivityCallbacks {
-    /**
-     * GameActivity has started.  See Java documentation for Activity.onStart()
-     * for more information.
-     */
-    void (*onStart)(GameActivity* activity);
-
-    /**
-     * GameActivity has resumed.  See Java documentation for Activity.onResume()
-     * for more information.
-     */
-    void (*onResume)(GameActivity* activity);
-
-    /**
-     * The framework is asking GameActivity to save its current instance state.
-     * See the Java documentation for Activity.onSaveInstanceState() for more
-     * information. The user should call the recallback with their data, its
-     * length and the provided context; they retain ownership of the data. Note
-     * that the saved state will be persisted, so it can not contain any active
-     * entities (pointers to memory, file descriptors, etc).
-     */
-    void (*onSaveInstanceState)(GameActivity* activity,
-                                SaveInstanceStateRecallback recallback,
-                                void* context);
-
-    /**
-     * GameActivity has paused.  See Java documentation for Activity.onPause()
-     * for more information.
-     */
-    void (*onPause)(GameActivity* activity);
-
-    /**
-     * GameActivity has stopped.  See Java documentation for Activity.onStop()
-     * for more information.
-     */
-    void (*onStop)(GameActivity* activity);
-
-    /**
-     * GameActivity is being destroyed.  See Java documentation for
-     * Activity.onDestroy() for more information.
-     */
-    void (*onDestroy)(GameActivity* activity);
-
-    /**
-     * Focus has changed in this GameActivity's window.  This is often used,
-     * for example, to pause a game when it loses input focus.
-     */
-    void (*onWindowFocusChanged)(GameActivity* activity, bool hasFocus);
-
-    /**
-     * The drawing window for this native activity has been created.  You
-     * can use the given native window object to start drawing.
-     */
-    void (*onNativeWindowCreated)(GameActivity* activity,
-                                  ANativeWindow* window);
-
-    /**
-     * The drawing window for this native activity has been resized.  You should
-     * retrieve the new size from the window and ensure that your rendering in
-     * it now matches.
-     */
-    void (*onNativeWindowResized)(GameActivity* activity, ANativeWindow* window,
-                                  int32_t newWidth, int32_t newHeight);
-
-    /**
-     * The drawing window for this native activity needs to be redrawn.  To
-     * avoid transient artifacts during screen changes (such resizing after
-     * rotation), applications should not return from this function until they
-     * have finished drawing their window in its current state.
-     */
-    void (*onNativeWindowRedrawNeeded)(GameActivity* activity,
-                                       ANativeWindow* window);
-
-    /**
-     * The drawing window for this native activity is going to be destroyed.
-     * You MUST ensure that you do not touch the window object after returning
-     * from this function: in the common case of drawing to the window from
-     * another thread, that means the implementation of this callback must
-     * properly synchronize with the other thread to stop its drawing before
-     * returning from here.
-     */
-    void (*onNativeWindowDestroyed)(GameActivity* activity,
-                                    ANativeWindow* window);
-
-    /**
-     * The current device AConfiguration has changed.  The new configuration can
-     * be retrieved from assetManager.
-     */
-    void (*onConfigurationChanged)(GameActivity* activity);
-
-    /**
-     * The system is running low on memory.  Use this callback to release
-     * resources you do not need, to help the system avoid killing more
-     * important processes.
-     */
-    void (*onTrimMemory)(GameActivity* activity, int level);
-
-    /**
-     * Callback called for every MotionEvent done on the GameActivity
-     * SurfaceView. Ownership of `event` is maintained by the library and it is
-     * only valid during the callback.
-     */
-    bool (*onTouchEvent)(GameActivity* activity,
-                         const GameActivityMotionEvent* event);
-
-    /**
-     * Callback called for every key down event on the GameActivity SurfaceView.
-     * Ownership of `event` is maintained by the library and it is only valid
-     * during the callback.
-     */
-    bool (*onKeyDown)(GameActivity* activity,
-                      const GameActivityKeyEvent* event);
-
-    /**
-     * Callback called for every key up event on the GameActivity SurfaceView.
-     * Ownership of `event` is maintained by the library and it is only valid
-     * during the callback.
-     */
-    bool (*onKeyUp)(GameActivity* activity, const GameActivityKeyEvent* event);
-
-    /**
-     * Callback called for every soft-keyboard text input event.
-     * Ownership of `state` is maintained by the library and it is only valid
-     * during the callback.
-     */
-    void (*onTextInputEvent)(GameActivity* activity,
-                             const GameTextInputState* state);
-
-    /**
-     * Callback called when WindowInsets of the main app window have changed.
-     * Call GameActivity_getWindowInsets to retrieve the insets themselves.
-     */
-    void (*onWindowInsetsChanged)(GameActivity* activity);
-
-    /**
-     * Callback called when the rectangle in the window where the content
-     * should be placed has changed.
-     */
-    void (*onContentRectChanged)(GameActivity *activity, const ARect *rect);
-} GameActivityCallbacks;
-
-/**
- * This is the function that must be in the native code to instantiate the
- * application's native activity.  It is called with the activity instance (see
- * above); if the code is being instantiated from a previously saved instance,
- * the savedState will be non-NULL and point to the saved data.  You must make
- * any copy of this data you need -- it will be released after you return from
- * this function.
- */
-typedef void GameActivity_createFunc(GameActivity* activity, void* savedState,
-                                     size_t savedStateSize);
-
-/**
- * The name of the function that NativeInstance looks for when launching its
- * native code.  This is the default function that is used, you can specify
- * "android.app.func_name" string meta-data in your manifest to use a different
- * function.
- */
-extern GameActivity_createFunc GameActivity_onCreate_C;
-
-/**
- * Finish the given activity.  Its finish() method will be called, causing it
- * to be stopped and destroyed.  Note that this method can be called from
- * *any* thread; it will send a message to the main thread of the process
- * where the Java finish call will take place.
- */
-void GameActivity_finish(GameActivity* activity);
-
-/**
- * Flags for GameActivity_setWindowFlags,
- * as per the Java API at android.view.WindowManager.LayoutParams.
- */
-enum GameActivitySetWindowFlags {
-    /**
-     * As long as this window is visible to the user, allow the lock
-     * screen to activate while the screen is on.  This can be used
-     * independently, or in combination with {@link
-     * GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} and/or {@link
-     * GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}
-     */
-    GAMEACTIVITY_FLAG_ALLOW_LOCK_WHILE_SCREEN_ON = 0x00000001,
-    /** Everything behind this window will be dimmed. */
-    GAMEACTIVITY_FLAG_DIM_BEHIND = 0x00000002,
-    /**
-     * Blur everything behind this window.
-     * @deprecated Blurring is no longer supported.
-     */
-    GAMEACTIVITY_FLAG_BLUR_BEHIND = 0x00000004,
-    /**
-     * This window won't ever get key input focus, so the
-     * user can not send key or other button events to it.  Those will
-     * instead go to whatever focusable window is behind it.  This flag
-     * will also enable {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL} whether or not
-     * that is explicitly set.
-     *
-     * Setting this flag also implies that the window will not need to
-     * interact with
-     * a soft input method, so it will be Z-ordered and positioned
-     * independently of any active input method (typically this means it
-     * gets Z-ordered on top of the input method, so it can use the full
-     * screen for its content and cover the input method if needed.  You
-     * can use {@link GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM} to modify this
-     * behavior.
-     */
-    GAMEACTIVITY_FLAG_NOT_FOCUSABLE = 0x00000008,
-    /** This window can never receive touch events. */
-    GAMEACTIVITY_FLAG_NOT_TOUCHABLE = 0x00000010,
-    /**
-     * Even when this window is focusable (its
-     * {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set), allow any pointer
-     * events outside of the window to be sent to the windows behind it.
-     * Otherwise it will consume all pointer events itself, regardless of
-     * whether they are inside of the window.
-     */
-    GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL = 0x00000020,
-    /**
-     * When set, if the device is asleep when the touch
-     * screen is pressed, you will receive this first touch event.  Usually
-     * the first touch event is consumed by the system since the user can
-     * not see what they are pressing on.
-     *
-     * @deprecated This flag has no effect.
-     */
-    GAMEACTIVITY_FLAG_TOUCHABLE_WHEN_WAKING = 0x00000040,
-    /**
-     * As long as this window is visible to the user, keep
-     * the device's screen turned on and bright.
-     */
-    GAMEACTIVITY_FLAG_KEEP_SCREEN_ON = 0x00000080,
-    /**
-     * Place the window within the entire screen, ignoring
-     * decorations around the border (such as the status bar).  The
-     * window must correctly position its contents to take the screen
-     * decoration into account.
-     */
-    GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN = 0x00000100,
-    /** Allows the window to extend outside of the screen. */
-    GAMEACTIVITY_FLAG_LAYOUT_NO_LIMITS = 0x00000200,
-    /**
-     * Hide all screen decorations (such as the status
-     * bar) while this window is displayed.  This allows the window to
-     * use the entire display space for itself -- the status bar will
-     * be hidden when an app window with this flag set is on the top
-     * layer. A fullscreen window will ignore a value of {@link
-     * GAMEACTIVITY_SOFT_INPUT_ADJUST_RESIZE}; the window will stay
-     * fullscreen and will not resize.
-     */
-    GAMEACTIVITY_FLAG_FULLSCREEN = 0x00000400,
-    /**
-     * Override {@link GAMEACTIVITY_FLAG_FULLSCREEN} and force the
-     * screen decorations (such as the status bar) to be shown.
-     */
-    GAMEACTIVITY_FLAG_FORCE_NOT_FULLSCREEN = 0x00000800,
-    /**
-     * Turn on dithering when compositing this window to
-     * the screen.
-     * @deprecated This flag is no longer used.
-     */
-    GAMEACTIVITY_FLAG_DITHER = 0x00001000,
-    /**
-     * Treat the content of the window as secure, preventing
-     * it from appearing in screenshots or from being viewed on non-secure
-     * displays.
-     */
-    GAMEACTIVITY_FLAG_SECURE = 0x00002000,
-    /**
-     * A special mode where the layout parameters are used
-     * to perform scaling of the surface when it is composited to the
-     * screen.
-     */
-    GAMEACTIVITY_FLAG_SCALED = 0x00004000,
-    /**
-     * Intended for windows that will often be used when the user is
-     * holding the screen against their face, it will aggressively
-     * filter the event stream to prevent unintended presses in this
-     * situation that may not be desired for a particular window, when
-     * such an event stream is detected, the application will receive
-     * a {@link AMOTION_EVENT_ACTION_CANCEL} to indicate this so
-     * applications can handle this accordingly by taking no action on
-     * the event until the finger is released.
-     */
-    GAMEACTIVITY_FLAG_IGNORE_CHEEK_PRESSES = 0x00008000,
-    /**
-     * A special option only for use in combination with
-     * {@link GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN}.  When requesting layout in
-     * the screen your window may appear on top of or behind screen decorations
-     * such as the status bar.  By also including this flag, the window
-     * manager will report the inset rectangle needed to ensure your
-     * content is not covered by screen decorations.
-     */
-    GAMEACTIVITY_FLAG_LAYOUT_INSET_DECOR = 0x00010000,
-    /**
-     * Invert the state of {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} with
-     * respect to how this window interacts with the current method.
-     * That is, if FLAG_NOT_FOCUSABLE is set and this flag is set,
-     * then the window will behave as if it needs to interact with the
-     * input method and thus be placed behind/away from it; if {@link
-     * GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set and this flag is set,
-     * then the window will behave as if it doesn't need to interact
-     * with the input method and can be placed to use more space and
-     * cover the input method.
-     */
-    GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM = 0x00020000,
-    /**
-     * If you have set {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL}, you
-     * can set this flag to receive a single special MotionEvent with
-     * the action
-     * {@link AMOTION_EVENT_ACTION_OUTSIDE} for
-     * touches that occur outside of your window.  Note that you will not
-     * receive the full down/move/up gesture, only the location of the
-     * first down as an {@link AMOTION_EVENT_ACTION_OUTSIDE}.
-     */
-    GAMEACTIVITY_FLAG_WATCH_OUTSIDE_TOUCH = 0x00040000,
-    /**
-     * Special flag to let windows be shown when the screen
-     * is locked. This will let application windows take precedence over
-     * key guard or any other lock screens. Can be used with
-     * {@link GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} to turn screen on and display
-     * windows directly before showing the key guard window.  Can be used with
-     * {@link GAMEACTIVITY_FLAG_DISMISS_KEYGUARD} to automatically fully
-     * dismisss non-secure keyguards.  This flag only applies to the top-most
-     * full-screen window.
-     */
-    GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED = 0x00080000,
-    /**
-     * Ask that the system wallpaper be shown behind
-     * your window.  The window surface must be translucent to be able
-     * to actually see the wallpaper behind it; this flag just ensures
-     * that the wallpaper surface will be there if this window actually
-     * has translucent regions.
-     */
-    GAMEACTIVITY_FLAG_SHOW_WALLPAPER = 0x00100000,
-    /**
-     * When set as a window is being added or made
-     * visible, once the window has been shown then the system will
-     * poke the power manager's user activity (as if the user had woken
-     * up the device) to turn the screen on.
-     */
-    GAMEACTIVITY_FLAG_TURN_SCREEN_ON = 0x00200000,
-    /**
-     * When set the window will cause the keyguard to
-     * be dismissed, only if it is not a secure lock keyguard.  Because such
-     * a keyguard is not needed for security, it will never re-appear if
-     * the user navigates to another window (in contrast to
-     * {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}, which will only temporarily
-     * hide both secure and non-secure keyguards but ensure they reappear
-     * when the user moves to another UI that doesn't hide them).
-     * If the keyguard is currently active and is secure (requires an
-     * unlock pattern) than the user will still need to confirm it before
-     * seeing this window, unless {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED} has
-     * also been set.
-     */
-    GAMEACTIVITY_FLAG_DISMISS_KEYGUARD = 0x00400000,
-};
-
-/**
- * Change the window flags of the given activity.  Calls getWindow().setFlags()
- * of the given activity.
- * Note that some flags must be set before the window decoration is created,
- * see
- * https://developer.android.com/reference/android/view/Window#setFlags(int,%20int).
- * Note also that this method can be called from
- * *any* thread; it will send a message to the main thread of the process
- * where the Java finish call will take place.
- */
-void GameActivity_setWindowFlags(GameActivity* activity, uint32_t addFlags,
-                                 uint32_t removeFlags);
-
-/**
- * Flags for GameActivity_showSoftInput; see the Java InputMethodManager
- * API for documentation.
- */
-enum GameActivityShowSoftInputFlags {
-    /**
-     * Implicit request to show the input window, not as the result
-     * of a direct request by the user.
-     */
-    GAMEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT = 0x0001,
-
-    /**
-     * The user has forced the input method open (such as by
-     * long-pressing menu) so it should not be closed until they
-     * explicitly do so.
-     */
-    GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED = 0x0002,
-};
-
-/**
- * Show the IME while in the given activity.  Calls
- * InputMethodManager.showSoftInput() for the given activity.  Note that this
- * method can be called from *any* thread; it will send a message to the main
- * thread of the process where the Java call will take place.
- */
-void GameActivity_showSoftInput(GameActivity* activity, uint32_t flags);
-
-/**
- * Set the text entry state (see documentation of the GameTextInputState struct
- * in the Game Text Input library reference).
- *
- * Ownership of the state is maintained by the caller.
- */
-void GameActivity_setTextInputState(GameActivity* activity,
-                                    const GameTextInputState* state);
-
-/**
- * Get the last-received text entry state (see documentation of the
- * GameTextInputState struct in the Game Text Input library reference).
- *
- */
-void GameActivity_getTextInputState(GameActivity* activity,
-                                    GameTextInputGetStateCallback callback,
-                                    void* context);
-
-/**
- * Get a pointer to the GameTextInput library instance.
- */
-GameTextInput* GameActivity_getTextInput(const GameActivity* activity);
-
-/**
- * Flags for GameActivity_hideSoftInput; see the Java InputMethodManager
- * API for documentation.
- */
-enum GameActivityHideSoftInputFlags {
-    /**
-     * The soft input window should only be hidden if it was not
-     * explicitly shown by the user.
-     */
-    GAMEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_ONLY = 0x0001,
-    /**
-     * The soft input window should normally be hidden, unless it was
-     * originally shown with {@link GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED}.
-     */
-    GAMEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS = 0x0002,
-};
-
-/**
- * Hide the IME while in the given activity.  Calls
- * InputMethodManager.hideSoftInput() for the given activity.  Note that this
- * method can be called from *any* thread; it will send a message to the main
- * thread of the process where the Java finish call will take place.
- */
-void GameActivity_hideSoftInput(GameActivity* activity, uint32_t flags);
-
-/**
- * Get the current window insets of the particular component. See
- * https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type
- * for more details.
- * You can use these insets to influence what you show on the screen.
- */
-void GameActivity_getWindowInsets(GameActivity* activity,
-                                  GameCommonInsetsType type, ARect* insets);
-
-/**
- * Set options on how the IME behaves when it is requested for text input.
- * See
- * https://developer.android.com/reference/android/view/inputmethod/EditorInfo
- * for the meaning of inputType, actionId and imeOptions.
- *
- * Note that this function will attach the current thread to the JVM if it is
- * not already attached, so the caller must detach the thread from the JVM
- * before the thread is destroyed using DetachCurrentThread.
- */
-void GameActivity_setImeEditorInfo(GameActivity* activity, int inputType,
-                                   int actionId, int imeOptions);
-
-/**
- * These are getters for Configuration class members. They may be called from
- * any thread.
- */
-int GameActivity_getOrientation(GameActivity* activity);
-int GameActivity_getColorMode(GameActivity* activity);
-int GameActivity_getDensityDpi(GameActivity* activity);
-float GameActivity_getFontScale(GameActivity* activity);
-int GameActivity_getFontWeightAdjustment(GameActivity* activity);
-int GameActivity_getHardKeyboardHidden(GameActivity* activity);
-int GameActivity_getKeyboard(GameActivity* activity);
-int GameActivity_getKeyboardHidden(GameActivity* activity);
-int GameActivity_getMcc(GameActivity* activity);
-int GameActivity_getMnc(GameActivity* activity);
-int GameActivity_getNavigation(GameActivity* activity);
-int GameActivity_getNavigationHidden(GameActivity* activity);
-int GameActivity_getOrientation(GameActivity* activity);
-int GameActivity_getScreenHeightDp(GameActivity* activity);
-int GameActivity_getScreenLayout(GameActivity* activity);
-int GameActivity_getScreenWidthDp(GameActivity* activity);
-int GameActivity_getSmallestScreenWidthDp(GameActivity* activity);
-int GameActivity_getTouchscreen(GameActivity* activity);
-int GameActivity_getUIMode(GameActivity* activity);
-
-#ifdef __cplusplus
-}
-#endif
-
-/** @} */
-
-#endif  // ANDROID_GAME_SDK_GAME_ACTIVITY_H
diff --git a/android-activity/game-activity-csrc/game-activity/GameActivityEvents.cpp b/android-activity/game-activity-csrc/game-activity/GameActivityEvents.cpp
deleted file mode 100644
index 028b55e..0000000
--- a/android-activity/game-activity-csrc/game-activity/GameActivityEvents.cpp
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "GameActivityEvents.h"
-
-#include <sys/system_properties.h>
-
-#include <string>
-
-#include "GameActivityLog.h"
-
-// TODO(b/187147166): these functions were extracted from the Game SDK
-// (gamesdk/src/common/system_utils.h). system_utils.h/cpp should be used
-// instead.
-namespace {
-
-std::string getSystemPropViaGet(const char *key,
-                                const char *default_value = "") {
-    char buffer[PROP_VALUE_MAX + 1] = "";  // +1 for terminator
-    int bufferLen = __system_property_get(key, buffer);
-    if (bufferLen > 0)
-        return buffer;
-    else
-        return "";
-}
-
-std::string GetSystemProp(const char *key, const char *default_value = "") {
-    return getSystemPropViaGet(key, default_value);
-}
-
-int GetSystemPropAsInt(const char *key, int default_value = 0) {
-    std::string prop = GetSystemProp(key);
-    return prop == "" ? default_value : strtoll(prop.c_str(), nullptr, 10);
-}
-
-}  // anonymous namespace
-
-#ifndef NELEM
-#define NELEM(x) ((int)(sizeof(x) / sizeof((x)[0])))
-#endif
-
-static bool enabledAxes[GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT] = {
-    /* AMOTION_EVENT_AXIS_X */ true,
-    /* AMOTION_EVENT_AXIS_Y */ true,
-    // Disable all other axes by default (they can be enabled using
-    // `GameActivityPointerAxes_enableAxis`).
-    false};
-
-extern "C" void GameActivityPointerAxes_enableAxis(int32_t axis) {
-    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
-        return;
-    }
-
-    enabledAxes[axis] = true;
-}
-
-float GameActivityPointerAxes_getAxisValue(
-    const GameActivityPointerAxes *pointerInfo, int32_t axis) {
-    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
-        return 0;
-    }
-
-    if (!enabledAxes[axis]) {
-        ALOGW("Axis %d must be enabled before it can be accessed.", axis);
-        return 0;
-    }
-
-    return pointerInfo->axisValues[axis];
-}
-
-extern "C" void GameActivityPointerAxes_disableAxis(int32_t axis) {
-    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
-        return;
-    }
-
-    enabledAxes[axis] = false;
-}
-
-float GameActivityMotionEvent_getHistoricalAxisValue(
-    const GameActivityMotionEvent *event, int axis, int pointerIndex,
-    int historyPos) {
-    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
-        ALOGE("Invalid axis %d", axis);
-        return -1;
-    }
-    if (pointerIndex < 0 || pointerIndex >= event->pointerCount) {
-        ALOGE("Invalid pointer index %d", pointerIndex);
-        return -1;
-    }
-    if (historyPos < 0 || historyPos >= event->historySize) {
-        ALOGE("Invalid history index %d", historyPos);
-        return -1;
-    }
-    if (!enabledAxes[axis]) {
-        ALOGW("Axis %d must be enabled before it can be accessed.", axis);
-        return 0;
-    }
-
-    int pointerOffset = pointerIndex * GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
-    int historyValuesOffset = historyPos * event->pointerCount *
-                              GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
-    return event
-        ->historicalAxisValues[historyValuesOffset + pointerOffset + axis];
-}
-
-static struct {
-    jmethodID getDeviceId;
-    jmethodID getSource;
-    jmethodID getAction;
-
-    jmethodID getEventTime;
-    jmethodID getDownTime;
-
-    jmethodID getFlags;
-    jmethodID getMetaState;
-
-    jmethodID getActionButton;
-    jmethodID getButtonState;
-    jmethodID getClassification;
-    jmethodID getEdgeFlags;
-
-    jmethodID getHistorySize;
-    jmethodID getHistoricalEventTime;
-
-    jmethodID getPointerCount;
-    jmethodID getPointerId;
-
-    jmethodID getToolType;
-
-    jmethodID getRawX;
-    jmethodID getRawY;
-    jmethodID getXPrecision;
-    jmethodID getYPrecision;
-    jmethodID getAxisValue;
-
-    jmethodID getHistoricalAxisValue;
-} gMotionEventClassInfo;
-
-extern "C" void GameActivityMotionEvent_destroy(
-    GameActivityMotionEvent *c_event) {
-    delete c_event->historicalAxisValues;
-    delete c_event->historicalEventTimesMillis;
-    delete c_event->historicalEventTimesNanos;
-}
-
-extern "C" void GameActivityMotionEvent_fromJava(
-    JNIEnv *env, jobject motionEvent, GameActivityMotionEvent *out_event) {
-    static bool gMotionEventClassInfoInitialized = false;
-    if (!gMotionEventClassInfoInitialized) {
-        int sdkVersion = GetSystemPropAsInt("ro.build.version.sdk");
-        gMotionEventClassInfo = {0};
-        jclass motionEventClass = env->FindClass("android/view/MotionEvent");
-        gMotionEventClassInfo.getDeviceId =
-            env->GetMethodID(motionEventClass, "getDeviceId", "()I");
-        gMotionEventClassInfo.getSource =
-            env->GetMethodID(motionEventClass, "getSource", "()I");
-        gMotionEventClassInfo.getAction =
-            env->GetMethodID(motionEventClass, "getAction", "()I");
-        gMotionEventClassInfo.getEventTime =
-            env->GetMethodID(motionEventClass, "getEventTime", "()J");
-        gMotionEventClassInfo.getDownTime =
-            env->GetMethodID(motionEventClass, "getDownTime", "()J");
-        gMotionEventClassInfo.getFlags =
-            env->GetMethodID(motionEventClass, "getFlags", "()I");
-        gMotionEventClassInfo.getMetaState =
-            env->GetMethodID(motionEventClass, "getMetaState", "()I");
-        if (sdkVersion >= 23) {
-            gMotionEventClassInfo.getActionButton =
-                env->GetMethodID(motionEventClass, "getActionButton", "()I");
-        }
-        if (sdkVersion >= 14) {
-            gMotionEventClassInfo.getButtonState =
-                env->GetMethodID(motionEventClass, "getButtonState", "()I");
-        }
-        if (sdkVersion >= 29) {
-            gMotionEventClassInfo.getClassification =
-                env->GetMethodID(motionEventClass, "getClassification", "()I");
-        }
-        gMotionEventClassInfo.getEdgeFlags =
-            env->GetMethodID(motionEventClass, "getEdgeFlags", "()I");
-
-        gMotionEventClassInfo.getHistorySize =
-            env->GetMethodID(motionEventClass, "getHistorySize", "()I");
-        gMotionEventClassInfo.getHistoricalEventTime = env->GetMethodID(
-            motionEventClass, "getHistoricalEventTime", "(I)J");
-
-        gMotionEventClassInfo.getPointerCount =
-            env->GetMethodID(motionEventClass, "getPointerCount", "()I");
-        gMotionEventClassInfo.getPointerId =
-            env->GetMethodID(motionEventClass, "getPointerId", "(I)I");
-        gMotionEventClassInfo.getToolType =
-            env->GetMethodID(motionEventClass, "getToolType", "(I)I");
-        if (sdkVersion >= 29) {
-            gMotionEventClassInfo.getRawX =
-                env->GetMethodID(motionEventClass, "getRawX", "(I)F");
-            gMotionEventClassInfo.getRawY =
-                env->GetMethodID(motionEventClass, "getRawY", "(I)F");
-        }
-        gMotionEventClassInfo.getXPrecision =
-            env->GetMethodID(motionEventClass, "getXPrecision", "()F");
-        gMotionEventClassInfo.getYPrecision =
-            env->GetMethodID(motionEventClass, "getYPrecision", "()F");
-        gMotionEventClassInfo.getAxisValue =
-            env->GetMethodID(motionEventClass, "getAxisValue", "(II)F");
-
-        gMotionEventClassInfo.getHistoricalAxisValue = env->GetMethodID(
-            motionEventClass, "getHistoricalAxisValue", "(III)F");
-        gMotionEventClassInfoInitialized = true;
-    }
-
-    int pointerCount =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getPointerCount);
-    pointerCount =
-        std::min(pointerCount, GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT);
-    out_event->pointerCount = pointerCount;
-    for (int i = 0; i < pointerCount; ++i) {
-        out_event->pointers[i] = {
-            /*id=*/env->CallIntMethod(motionEvent,
-                                      gMotionEventClassInfo.getPointerId, i),
-            /*toolType=*/
-            env->CallIntMethod(motionEvent, gMotionEventClassInfo.getToolType,
-                               i),
-            /*axisValues=*/{0},
-            /*rawX=*/gMotionEventClassInfo.getRawX
-                ? env->CallFloatMethod(motionEvent,
-                                       gMotionEventClassInfo.getRawX, i)
-                : 0,
-            /*rawY=*/gMotionEventClassInfo.getRawY
-                ? env->CallFloatMethod(motionEvent,
-                                       gMotionEventClassInfo.getRawY, i)
-                : 0,
-        };
-
-        for (int axisIndex = 0;
-             axisIndex < GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT; ++axisIndex) {
-            if (enabledAxes[axisIndex]) {
-                out_event->pointers[i].axisValues[axisIndex] =
-                    env->CallFloatMethod(motionEvent,
-                                         gMotionEventClassInfo.getAxisValue,
-                                         axisIndex, i);
-            }
-        }
-    }
-
-    int historySize =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getHistorySize);
-    out_event->historySize = historySize;
-    out_event->historicalAxisValues =
-        new float[historySize * pointerCount *
-                  GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT];
-    out_event->historicalEventTimesMillis = new int64_t[historySize];
-    out_event->historicalEventTimesNanos = new int64_t[historySize];
-
-    for (int historyIndex = 0; historyIndex < historySize; historyIndex++) {
-        out_event->historicalEventTimesMillis[historyIndex] =
-            env->CallLongMethod(motionEvent,
-                                gMotionEventClassInfo.getHistoricalEventTime,
-                                historyIndex);
-        out_event->historicalEventTimesNanos[historyIndex] =
-            out_event->historicalEventTimesMillis[historyIndex] * 1000000;
-        for (int i = 0; i < pointerCount; ++i) {
-            int pointerOffset = i * GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
-            int historyAxisOffset = historyIndex * pointerCount *
-                                    GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
-            float *axisValues =
-                &out_event
-                     ->historicalAxisValues[historyAxisOffset + pointerOffset];
-            for (int axisIndex = 0;
-                 axisIndex < GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
-                 ++axisIndex) {
-                if (enabledAxes[axisIndex]) {
-                    axisValues[axisIndex] = env->CallFloatMethod(
-                        motionEvent,
-                        gMotionEventClassInfo.getHistoricalAxisValue, axisIndex,
-                        i, historyIndex);
-                }
-            }
-        }
-    }
-
-    out_event->deviceId =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getDeviceId);
-    out_event->source =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getSource);
-    out_event->action =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getAction);
-    out_event->eventTime =
-        env->CallLongMethod(motionEvent, gMotionEventClassInfo.getEventTime) *
-        1000000;
-    out_event->downTime =
-        env->CallLongMethod(motionEvent, gMotionEventClassInfo.getDownTime) *
-        1000000;
-    out_event->flags =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getFlags);
-    out_event->metaState =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getMetaState);
-    out_event->actionButton =
-        gMotionEventClassInfo.getActionButton
-            ? env->CallIntMethod(motionEvent,
-                                 gMotionEventClassInfo.getActionButton)
-            : 0;
-    out_event->buttonState =
-        gMotionEventClassInfo.getButtonState
-            ? env->CallIntMethod(motionEvent,
-                                 gMotionEventClassInfo.getButtonState)
-            : 0;
-    out_event->classification =
-        gMotionEventClassInfo.getClassification
-            ? env->CallIntMethod(motionEvent,
-                                 gMotionEventClassInfo.getClassification)
-            : 0;
-    out_event->edgeFlags =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getEdgeFlags);
-    out_event->precisionX =
-        env->CallFloatMethod(motionEvent, gMotionEventClassInfo.getXPrecision);
-    out_event->precisionY =
-        env->CallFloatMethod(motionEvent, gMotionEventClassInfo.getYPrecision);
-}
-
-static struct {
-    jmethodID getDeviceId;
-    jmethodID getSource;
-    jmethodID getAction;
-
-    jmethodID getEventTime;
-    jmethodID getDownTime;
-
-    jmethodID getFlags;
-    jmethodID getMetaState;
-
-    jmethodID getModifiers;
-    jmethodID getRepeatCount;
-    jmethodID getKeyCode;
-    jmethodID getScanCode;
-    //jmethodID getUnicodeChar;
-} gKeyEventClassInfo;
-
-extern "C" void GameActivityKeyEvent_fromJava(JNIEnv *env, jobject keyEvent,
-                                              GameActivityKeyEvent *out_event) {
-    static bool gKeyEventClassInfoInitialized = false;
-    if (!gKeyEventClassInfoInitialized) {
-        int sdkVersion = GetSystemPropAsInt("ro.build.version.sdk");
-        gKeyEventClassInfo = {0};
-        jclass keyEventClass = env->FindClass("android/view/KeyEvent");
-        gKeyEventClassInfo.getDeviceId =
-            env->GetMethodID(keyEventClass, "getDeviceId", "()I");
-        gKeyEventClassInfo.getSource =
-            env->GetMethodID(keyEventClass, "getSource", "()I");
-        gKeyEventClassInfo.getAction =
-            env->GetMethodID(keyEventClass, "getAction", "()I");
-        gKeyEventClassInfo.getEventTime =
-            env->GetMethodID(keyEventClass, "getEventTime", "()J");
-        gKeyEventClassInfo.getDownTime =
-            env->GetMethodID(keyEventClass, "getDownTime", "()J");
-        gKeyEventClassInfo.getFlags =
-            env->GetMethodID(keyEventClass, "getFlags", "()I");
-        gKeyEventClassInfo.getMetaState =
-            env->GetMethodID(keyEventClass, "getMetaState", "()I");
-        if (sdkVersion >= 13) {
-            gKeyEventClassInfo.getModifiers =
-                env->GetMethodID(keyEventClass, "getModifiers", "()I");
-        }
-        gKeyEventClassInfo.getRepeatCount =
-            env->GetMethodID(keyEventClass, "getRepeatCount", "()I");
-        gKeyEventClassInfo.getKeyCode =
-            env->GetMethodID(keyEventClass, "getKeyCode", "()I");
-        gKeyEventClassInfo.getScanCode =
-            env->GetMethodID(keyEventClass, "getScanCode", "()I");
-        //gKeyEventClassInfo.getUnicodeChar =
-        //    env->GetMethodID(keyEventClass, "getUnicodeChar", "()I");
-
-        gKeyEventClassInfoInitialized = true;
-    }
-
-    *out_event = {
-        /*deviceId=*/env->CallIntMethod(keyEvent,
-                                        gKeyEventClassInfo.getDeviceId),
-        /*source=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getSource),
-        /*action=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getAction),
-        // TODO: introduce a millisecondsToNanoseconds helper:
-        /*eventTime=*/
-        env->CallLongMethod(keyEvent, gKeyEventClassInfo.getEventTime) *
-            1000000,
-        /*downTime=*/
-        env->CallLongMethod(keyEvent, gKeyEventClassInfo.getDownTime) * 1000000,
-        /*flags=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getFlags),
-        /*metaState=*/
-        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getMetaState),
-        /*modifiers=*/gKeyEventClassInfo.getModifiers
-            ? env->CallIntMethod(keyEvent, gKeyEventClassInfo.getModifiers)
-            : 0,
-        /*repeatCount=*/
-        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getRepeatCount),
-        /*keyCode=*/
-        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getKeyCode),
-        /*scanCode=*/
-        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getScanCode)
-        /*unicodeChar=*/
-        //env->CallIntMethod(keyEvent, gKeyEventClassInfo.getUnicodeChar)
-    };
-}
diff --git a/android-activity/game-activity-csrc/game-activity/GameActivityEvents.h b/android-activity/game-activity-csrc/game-activity/GameActivityEvents.h
deleted file mode 100644
index 015ffbe..0000000
--- a/android-activity/game-activity-csrc/game-activity/GameActivityEvents.h
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @addtogroup GameActivity Game Activity Events
- * The interface to use Game Activity Events.
- * @{
- */
-
-/**
- * @file GameActivityEvents.h
- */
-#ifndef ANDROID_GAME_SDK_GAME_ACTIVITY_EVENTS_H
-#define ANDROID_GAME_SDK_GAME_ACTIVITY_EVENTS_H
-
-#include <android/input.h>
-#include <jni.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <sys/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * The maximum number of axes supported in an Android MotionEvent.
- * See https://developer.android.com/ndk/reference/group/input.
- */
-#define GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT 48
-
-/**
- * \brief Describe information about a pointer, found in a
- * GameActivityMotionEvent.
- *
- * You can read values directly from this structure, or use helper functions
- * (`GameActivityPointerAxes_getX`, `GameActivityPointerAxes_getY` and
- * `GameActivityPointerAxes_getAxisValue`).
- *
- * The X axis and Y axis are enabled by default but any other axis that you want
- * to read **must** be enabled first, using
- * `GameActivityPointerAxes_enableAxis`.
- *
- * \see GameActivityMotionEvent
- */
-typedef struct GameActivityPointerAxes {
-    int32_t id;
-    int32_t toolType;
-    float axisValues[GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT];
-    float rawX;
-    float rawY;
-} GameActivityPointerAxes;
-
-/** \brief Get the toolType of the pointer. */
-inline int32_t GameActivityPointerAxes_getToolType(
-    const GameActivityPointerAxes* pointerInfo) {
-    return pointerInfo->toolType;
-}
-
-/** \brief Get the current X coordinate of the pointer. */
-inline float GameActivityPointerAxes_getX(
-    const GameActivityPointerAxes* pointerInfo) {
-    return pointerInfo->axisValues[AMOTION_EVENT_AXIS_X];
-}
-
-/** \brief Get the current Y coordinate of the pointer. */
-inline float GameActivityPointerAxes_getY(
-    const GameActivityPointerAxes* pointerInfo) {
-    return pointerInfo->axisValues[AMOTION_EVENT_AXIS_Y];
-}
-
-/**
- * \brief Enable the specified axis, so that its value is reported in the
- * GameActivityPointerAxes structures stored in a motion event.
- *
- * You must enable any axis that you want to read, apart from
- * `AMOTION_EVENT_AXIS_X` and `AMOTION_EVENT_AXIS_Y` that are enabled by
- * default.
- *
- * If the axis index is out of range, nothing is done.
- */
-void GameActivityPointerAxes_enableAxis(int32_t axis);
-
-/**
- * \brief Disable the specified axis. Its value won't be reported in the
- * GameActivityPointerAxes structures stored in a motion event anymore.
- *
- * Apart from X and Y, any axis that you want to read **must** be enabled first,
- * using `GameActivityPointerAxes_enableAxis`.
- *
- * If the axis index is out of range, nothing is done.
- */
-void GameActivityPointerAxes_disableAxis(int32_t axis);
-
-/**
- * \brief Get the value of the requested axis.
- *
- * Apart from X and Y, any axis that you want to read **must** be enabled first,
- * using `GameActivityPointerAxes_enableAxis`.
- *
- * Find the valid enums for the axis (`AMOTION_EVENT_AXIS_X`,
- * `AMOTION_EVENT_AXIS_Y`, `AMOTION_EVENT_AXIS_PRESSURE`...)
- * in https://developer.android.com/ndk/reference/group/input.
- *
- * @param pointerInfo The structure containing information about the pointer,
- * obtained from GameActivityMotionEvent.
- * @param axis The axis to get the value from
- * @return The value of the axis, or 0 if the axis is invalid or was not
- * enabled.
- */
-float GameActivityPointerAxes_getAxisValue(
-    const GameActivityPointerAxes* pointerInfo, int32_t axis);
-
-inline float GameActivityPointerAxes_getPressure(
-    const GameActivityPointerAxes* pointerInfo) {
-    return GameActivityPointerAxes_getAxisValue(pointerInfo,
-                                                AMOTION_EVENT_AXIS_PRESSURE);
-}
-
-inline float GameActivityPointerAxes_getSize(
-    const GameActivityPointerAxes* pointerInfo) {
-    return GameActivityPointerAxes_getAxisValue(pointerInfo,
-                                                AMOTION_EVENT_AXIS_SIZE);
-}
-
-inline float GameActivityPointerAxes_getTouchMajor(
-    const GameActivityPointerAxes* pointerInfo) {
-    return GameActivityPointerAxes_getAxisValue(pointerInfo,
-                                                AMOTION_EVENT_AXIS_TOUCH_MAJOR);
-}
-
-inline float GameActivityPointerAxes_getTouchMinor(
-    const GameActivityPointerAxes* pointerInfo) {
-    return GameActivityPointerAxes_getAxisValue(pointerInfo,
-                                                AMOTION_EVENT_AXIS_TOUCH_MINOR);
-}
-
-inline float GameActivityPointerAxes_getToolMajor(
-    const GameActivityPointerAxes* pointerInfo) {
-    return GameActivityPointerAxes_getAxisValue(pointerInfo,
-                                                AMOTION_EVENT_AXIS_TOOL_MAJOR);
-}
-
-inline float GameActivityPointerAxes_getToolMinor(
-    const GameActivityPointerAxes* pointerInfo) {
-    return GameActivityPointerAxes_getAxisValue(pointerInfo,
-                                                AMOTION_EVENT_AXIS_TOOL_MINOR);
-}
-
-inline float GameActivityPointerAxes_getOrientation(
-    const GameActivityPointerAxes* pointerInfo) {
-    return GameActivityPointerAxes_getAxisValue(pointerInfo,
-                                                AMOTION_EVENT_AXIS_ORIENTATION);
-}
-
-/**
- * The maximum number of pointers returned inside a motion event.
- */
-#if (defined GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT_OVERRIDE)
-#define GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT \
-    GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT_OVERRIDE
-#else
-#define GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT 8
-#endif
-
-/**
- * \brief Describe a motion event that happened on the GameActivity SurfaceView.
- *
- * This is 1:1 mapping to the information contained in a Java `MotionEvent`
- * (see https://developer.android.com/reference/android/view/MotionEvent).
- */
-typedef struct GameActivityMotionEvent {
-    int32_t deviceId;
-    int32_t source;
-    int32_t action;
-
-    int64_t eventTime;
-    int64_t downTime;
-
-    int32_t flags;
-    int32_t metaState;
-
-    int32_t actionButton;
-    int32_t buttonState;
-    int32_t classification;
-    int32_t edgeFlags;
-
-    uint32_t pointerCount;
-    GameActivityPointerAxes
-        pointers[GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT];
-
-    int historySize;
-    int64_t* historicalEventTimesMillis;
-    int64_t* historicalEventTimesNanos;
-    float* historicalAxisValues;
-
-    float precisionX;
-    float precisionY;
-} GameActivityMotionEvent;
-
-float GameActivityMotionEvent_getHistoricalAxisValue(
-    const GameActivityMotionEvent* event, int axis, int pointerIndex,
-    int historyPos);
-
-inline int GameActivityMotionEvent_getHistorySize(
-    const GameActivityMotionEvent* event) {
-    return event->historySize;
-}
-
-inline float GameActivityMotionEvent_getHistoricalX(
-    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_X, pointerIndex, historyPos);
-}
-
-inline float GameActivityMotionEvent_getHistoricalY(
-    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_Y, pointerIndex, historyPos);
-}
-
-inline float GameActivityMotionEvent_getHistoricalPressure(
-    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_PRESSURE, pointerIndex, historyPos);
-}
-
-inline float GameActivityMotionEvent_getHistoricalSize(
-    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_SIZE, pointerIndex, historyPos);
-}
-
-inline float GameActivityMotionEvent_getHistoricalTouchMajor(
-    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_TOUCH_MAJOR, pointerIndex, historyPos);
-}
-
-inline float GameActivityMotionEvent_getHistoricalTouchMinor(
-    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_TOUCH_MINOR, pointerIndex, historyPos);
-}
-
-inline float GameActivityMotionEvent_getHistoricalToolMajor(
-    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_TOOL_MAJOR, pointerIndex, historyPos);
-}
-
-inline float GameActivityMotionEvent_getHistoricalToolMinor(
-    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_TOOL_MINOR, pointerIndex, historyPos);
-}
-
-inline float GameActivityMotionEvent_getHistoricalOrientation(
-    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_ORIENTATION, pointerIndex, historyPos);
-}
-
-/** \brief Handle the freeing of the GameActivityMotionEvent struct. */
-void GameActivityMotionEvent_destroy(GameActivityMotionEvent* c_event);
-
-/**
- * \brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`.
- *
- * This is done automatically by the GameActivity: see `onTouchEvent` to set
- * a callback to consume the received events.
- * This function can be used if you re-implement events handling in your own
- * activity.
- * Ownership of out_event is maintained by the caller.
- */
-void GameActivityMotionEvent_fromJava(JNIEnv* env, jobject motionEvent,
-                                      GameActivityMotionEvent* out_event);
-
-/**
- * \brief Describe a key event that happened on the GameActivity SurfaceView.
- *
- * This is 1:1 mapping to the information contained in a Java `KeyEvent`
- * (see https://developer.android.com/reference/android/view/KeyEvent).
- * The only exception is the event times, which are reported as
- * nanoseconds in this struct.
- */
-typedef struct GameActivityKeyEvent {
-    int32_t deviceId;
-    int32_t source;
-    int32_t action;
-
-    int64_t eventTime;
-    int64_t downTime;
-
-    int32_t flags;
-    int32_t metaState;
-
-    int32_t modifiers;
-    int32_t repeatCount;
-    int32_t keyCode;
-    int32_t scanCode;
-    //int32_t unicodeChar;
-} GameActivityKeyEvent;
-
-/**
- * \brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.
- *
- * This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`
- * to set a callback to consume the received events.
- * This function can be used if you re-implement events handling in your own
- * activity.
- * Ownership of out_event is maintained by the caller.
- */
-void GameActivityKeyEvent_fromJava(JNIEnv* env, jobject motionEvent,
-                                   GameActivityKeyEvent* out_event);
-
-#ifdef __cplusplus
-}
-#endif
-
-/** @} */
-
-#endif  // ANDROID_GAME_SDK_GAME_ACTIVITY_EVENTS_H
diff --git a/android-activity/game-activity-csrc/game-activity/GameActivityLog.h b/android-activity/game-activity-csrc/game-activity/GameActivityLog.h
deleted file mode 100644
index ba9a9e9..0000000
--- a/android-activity/game-activity-csrc/game-activity/GameActivityLog.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef ANDROID_GAME_SDK_GAME_ACTIVITY_LOG_H_
-#define ANDROID_GAME_SDK_GAME_ACTIVITY_LOG_H_
-
-#define LOG_TAG "GameActivity"
-#include <android/log.h>
-
-#define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__);
-#define ALOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__);
-#define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__);
-#ifdef NDEBUG
-#define ALOGV(...)
-#else
-#define ALOGV(...) \
-    __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__);
-#endif
-
-/* Returns 2nd arg.  Used to substitute default value if caller's vararg list
- * is empty.
- */
-#define __android_second(first, second, ...) second
-
-/* If passed multiple args, returns ',' followed by all but 1st arg, otherwise
- * returns nothing.
- */
-#define __android_rest(first, ...) , ##__VA_ARGS__
-
-#define android_printAssert(cond, tag, fmt...) \
-    __android_log_assert(cond, tag,            \
-                         __android_second(0, ##fmt, NULL) __android_rest(fmt))
-
-#define CONDITION(cond) (__builtin_expect((cond) != 0, 0))
-
-#ifndef LOG_ALWAYS_FATAL_IF
-#define LOG_ALWAYS_FATAL_IF(cond, ...)                                \
-    ((CONDITION(cond))                                                \
-         ? ((void)android_printAssert(#cond, LOG_TAG, ##__VA_ARGS__)) \
-         : (void)0)
-#endif
-
-#ifndef LOG_ALWAYS_FATAL
-#define LOG_ALWAYS_FATAL(...) \
-    (((void)android_printAssert(NULL, LOG_TAG, ##__VA_ARGS__)))
-#endif
-
-/*
- * Simplified macro to send a warning system log message using current LOG_TAG.
- */
-#ifndef SLOGW
-#define SLOGW(...) \
-    ((void)__android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__))
-#endif
-
-#ifndef SLOGW_IF
-#define SLOGW_IF(cond, ...)                                                    \
-    ((__predict_false(cond))                                                   \
-         ? ((void)__android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)) \
-         : (void)0)
-#endif
-
-/*
- * Versions of LOG_ALWAYS_FATAL_IF and LOG_ALWAYS_FATAL that
- * are stripped out of release builds.
- */
-#if LOG_NDEBUG
-
-#ifndef LOG_FATAL_IF
-#define LOG_FATAL_IF(cond, ...) ((void)0)
-#endif
-#ifndef LOG_FATAL
-#define LOG_FATAL(...) ((void)0)
-#endif
-
-#else
-
-#ifndef LOG_FATAL_IF
-#define LOG_FATAL_IF(cond, ...) LOG_ALWAYS_FATAL_IF(cond, ##__VA_ARGS__)
-#endif
-#ifndef LOG_FATAL
-#define LOG_FATAL(...) LOG_ALWAYS_FATAL(__VA_ARGS__)
-#endif
-
-#endif
-
-/*
- * Assertion that generates a log message when the assertion fails.
- * Stripped out of release builds.  Uses the current LOG_TAG.
- */
-#ifndef ALOG_ASSERT
-#define ALOG_ASSERT(cond, ...) LOG_FATAL_IF(!(cond), ##__VA_ARGS__)
-#endif
-
-#define LOG_TRACE(...)
-
-#endif  // ANDROID_GAME_SDK_GAME_ACTIVITY_LOG_H_
diff --git a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
deleted file mode 100644
index a7bcb85..0000000
--- a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
+++ /dev/null
@@ -1,732 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "android_native_app_glue.h"
-
-#include <android/log.h>
-#include <assert.h>
-#include <errno.h>
-#include <jni.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#define NATIVE_APP_GLUE_MOTION_EVENTS_DEFAULT_BUF_SIZE 16
-#define NATIVE_APP_GLUE_KEY_EVENTS_DEFAULT_BUF_SIZE 4
-
-#define LOGI(...) \
-    ((void)__android_log_print(ANDROID_LOG_INFO, "threaded_app", __VA_ARGS__))
-#define LOGE(...) \
-    ((void)__android_log_print(ANDROID_LOG_ERROR, "threaded_app", __VA_ARGS__))
-#define LOGW(...) \
-    ((void)__android_log_print(ANDROID_LOG_WARN, "threaded_app", __VA_ARGS__))
-#define LOGW_ONCE(...)                                        \
-    do {                                                       \
-        static bool alogw_once##__FILE__##__LINE__##__ = true; \
-        if (alogw_once##__FILE__##__LINE__##__) {              \
-            alogw_once##__FILE__##__LINE__##__ = false;        \
-            LOGW(__VA_ARGS__);                                \
-        }                                                      \
-    } while (0)
-
-/* For debug builds, always enable the debug traces in this library */
-#ifndef NDEBUG
-#define LOGV(...)                                                   \
-    ((void)__android_log_print(ANDROID_LOG_VERBOSE, "threaded_app", \
-                               __VA_ARGS__))
-#else
-#define LOGV(...) ((void)0)
-#endif
-
-static void free_saved_state(struct android_app* android_app) {
-    pthread_mutex_lock(&android_app->mutex);
-    if (android_app->savedState != NULL) {
-        free(android_app->savedState);
-        android_app->savedState = NULL;
-        android_app->savedStateSize = 0;
-    }
-    pthread_mutex_unlock(&android_app->mutex);
-}
-
-int8_t android_app_read_cmd(struct android_app* android_app) {
-    int8_t cmd;
-    if (read(android_app->msgread, &cmd, sizeof(cmd)) != sizeof(cmd)) {
-        LOGE("No data on command pipe!");
-        return -1;
-    }
-    if (cmd == APP_CMD_SAVE_STATE) free_saved_state(android_app);
-    return cmd;
-}
-
-static void print_cur_config(struct android_app* android_app) {
-    char lang[2], country[2];
-    AConfiguration_getLanguage(android_app->config, lang);
-    AConfiguration_getCountry(android_app->config, country);
-
-    LOGV(
-        "Config: mcc=%d mnc=%d lang=%c%c cnt=%c%c orien=%d touch=%d dens=%d "
-        "keys=%d nav=%d keysHid=%d navHid=%d sdk=%d size=%d long=%d "
-        "modetype=%d modenight=%d",
-        AConfiguration_getMcc(android_app->config),
-        AConfiguration_getMnc(android_app->config), lang[0], lang[1],
-        country[0], country[1],
-        AConfiguration_getOrientation(android_app->config),
-        AConfiguration_getTouchscreen(android_app->config),
-        AConfiguration_getDensity(android_app->config),
-        AConfiguration_getKeyboard(android_app->config),
-        AConfiguration_getNavigation(android_app->config),
-        AConfiguration_getKeysHidden(android_app->config),
-        AConfiguration_getNavHidden(android_app->config),
-        AConfiguration_getSdkVersion(android_app->config),
-        AConfiguration_getScreenSize(android_app->config),
-        AConfiguration_getScreenLong(android_app->config),
-        AConfiguration_getUiModeType(android_app->config),
-        AConfiguration_getUiModeNight(android_app->config));
-}
-
-void android_app_pre_exec_cmd(struct android_app* android_app, int8_t cmd) {
-    switch (cmd) {
-        case UNUSED_APP_CMD_INPUT_CHANGED:
-            LOGV("UNUSED_APP_CMD_INPUT_CHANGED");
-            // Do nothing. This can be used in the future to handle AInputQueue
-            // natively, like done in NativeActivity.
-            break;
-
-        case APP_CMD_INIT_WINDOW:
-            LOGV("APP_CMD_INIT_WINDOW");
-            pthread_mutex_lock(&android_app->mutex);
-            android_app->window = android_app->pendingWindow;
-            pthread_cond_broadcast(&android_app->cond);
-            pthread_mutex_unlock(&android_app->mutex);
-            break;
-
-        case APP_CMD_TERM_WINDOW:
-            LOGV("APP_CMD_TERM_WINDOW");
-            pthread_cond_broadcast(&android_app->cond);
-            break;
-
-        case APP_CMD_RESUME:
-        case APP_CMD_START:
-        case APP_CMD_PAUSE:
-        case APP_CMD_STOP:
-            LOGV("activityState=%d", cmd);
-            pthread_mutex_lock(&android_app->mutex);
-            android_app->activityState = cmd;
-            pthread_cond_broadcast(&android_app->cond);
-            pthread_mutex_unlock(&android_app->mutex);
-            break;
-
-        case APP_CMD_CONFIG_CHANGED:
-            LOGV("APP_CMD_CONFIG_CHANGED");
-            AConfiguration_fromAssetManager(
-                android_app->config, android_app->activity->assetManager);
-            print_cur_config(android_app);
-            break;
-
-        case APP_CMD_DESTROY:
-            LOGV("APP_CMD_DESTROY");
-            android_app->destroyRequested = 1;
-            break;
-    }
-}
-
-void android_app_post_exec_cmd(struct android_app* android_app, int8_t cmd) {
-    switch (cmd) {
-        case APP_CMD_TERM_WINDOW:
-            LOGV("APP_CMD_TERM_WINDOW");
-            pthread_mutex_lock(&android_app->mutex);
-            android_app->window = NULL;
-            pthread_cond_broadcast(&android_app->cond);
-            pthread_mutex_unlock(&android_app->mutex);
-            break;
-
-        case APP_CMD_SAVE_STATE:
-            LOGV("APP_CMD_SAVE_STATE");
-            pthread_mutex_lock(&android_app->mutex);
-            android_app->stateSaved = 1;
-            pthread_cond_broadcast(&android_app->cond);
-            pthread_mutex_unlock(&android_app->mutex);
-            break;
-
-        case APP_CMD_RESUME:
-            free_saved_state(android_app);
-            break;
-    }
-}
-
-void app_dummy() {}
-
-static void android_app_destroy(struct android_app* android_app) {
-    LOGV("android_app_destroy!");
-    free_saved_state(android_app);
-    pthread_mutex_lock(&android_app->mutex);
-
-    AConfiguration_delete(android_app->config);
-    android_app->destroyed = 1;
-    pthread_cond_broadcast(&android_app->cond);
-    pthread_mutex_unlock(&android_app->mutex);
-    // Can't touch android_app object after this.
-}
-
-static void process_cmd(struct android_app* app,
-                        struct android_poll_source* source) {
-    int8_t cmd = android_app_read_cmd(app);
-    android_app_pre_exec_cmd(app, cmd);
-    if (app->onAppCmd != NULL) app->onAppCmd(app, cmd);
-    android_app_post_exec_cmd(app, cmd);
-}
-
-// This is run on a separate thread (i.e: not the main thread).
-static void* android_app_entry(void* param) {
-    struct android_app* android_app = (struct android_app*)param;
-    int input_buf_idx = 0;
-
-    LOGV("android_app_entry called");
-    android_app->config = AConfiguration_new();
-    LOGV("android_app = %p", android_app);
-    LOGV("config = %p", android_app->config);
-    LOGV("activity = %p", android_app->activity);
-    LOGV("assetmanager = %p", android_app->activity->assetManager);
-    AConfiguration_fromAssetManager(android_app->config,
-                                    android_app->activity->assetManager);
-
-    print_cur_config(android_app);
-
-    /* initialize event buffers */
-    for (input_buf_idx = 0; input_buf_idx < NATIVE_APP_GLUE_MAX_INPUT_BUFFERS; input_buf_idx++) {
-        struct android_input_buffer *buf = &android_app->inputBuffers[input_buf_idx];
-
-        buf->motionEventsBufferSize = NATIVE_APP_GLUE_MOTION_EVENTS_DEFAULT_BUF_SIZE;
-        buf->motionEvents = (GameActivityMotionEvent *) malloc(sizeof(GameActivityMotionEvent) *
-                                                               buf->motionEventsBufferSize);
-
-        buf->keyEventsBufferSize = NATIVE_APP_GLUE_KEY_EVENTS_DEFAULT_BUF_SIZE;
-        buf->keyEvents = (GameActivityKeyEvent *) malloc(sizeof(GameActivityKeyEvent) *
-                                                         buf->keyEventsBufferSize);
-    }
-
-    android_app->cmdPollSource.id = LOOPER_ID_MAIN;
-    android_app->cmdPollSource.app = android_app;
-    android_app->cmdPollSource.process = process_cmd;
-
-    ALooper* looper = ALooper_prepare(ALOOPER_PREPARE_ALLOW_NON_CALLBACKS);
-    ALooper_addFd(looper, android_app->msgread, LOOPER_ID_MAIN,
-                  ALOOPER_EVENT_INPUT, NULL, &android_app->cmdPollSource);
-    android_app->looper = looper;
-
-    pthread_mutex_lock(&android_app->mutex);
-    android_app->running = 1;
-    pthread_cond_broadcast(&android_app->cond);
-    pthread_mutex_unlock(&android_app->mutex);
-
-    _rust_glue_entry(android_app);
-
-    android_app_destroy(android_app);
-    return NULL;
-}
-
-// Codes from https://developer.android.com/reference/android/view/KeyEvent
-#define KEY_EVENT_KEYCODE_VOLUME_DOWN 25
-#define KEY_EVENT_KEYCODE_VOLUME_MUTE 164
-#define KEY_EVENT_KEYCODE_VOLUME_UP 24
-#define KEY_EVENT_KEYCODE_CAMERA 27
-#define KEY_EVENT_KEYCODE_ZOOM_IN 168
-#define KEY_EVENT_KEYCODE_ZOOM_OUT 169
-
-// Double-buffer the key event filter to avoid race condition.
-static bool default_key_filter(const GameActivityKeyEvent* event) {
-    // Ignore camera, volume, etc. buttons
-    return !(event->keyCode == KEY_EVENT_KEYCODE_VOLUME_DOWN ||
-             event->keyCode == KEY_EVENT_KEYCODE_VOLUME_MUTE ||
-             event->keyCode == KEY_EVENT_KEYCODE_VOLUME_UP ||
-             event->keyCode == KEY_EVENT_KEYCODE_CAMERA ||
-             event->keyCode == KEY_EVENT_KEYCODE_ZOOM_IN ||
-             event->keyCode == KEY_EVENT_KEYCODE_ZOOM_OUT);
-}
-
-// See
-// https://developer.android.com/reference/android/view/InputDevice#SOURCE_TOUCHSCREEN
-#define SOURCE_TOUCHSCREEN 0x00001002
-
-static bool default_motion_filter(const GameActivityMotionEvent* event) {
-    // Ignore any non-touch events.
-    return event->source == SOURCE_TOUCHSCREEN;
-}
-
-// --------------------------------------------------------------------
-// Native activity interaction (called from main thread)
-// --------------------------------------------------------------------
-
-static struct android_app* android_app_create(GameActivity* activity,
-                                              void* savedState,
-                                              size_t savedStateSize) {
-    //  struct android_app* android_app = calloc(1, sizeof(struct android_app));
-    struct android_app* android_app =
-        (struct android_app*)malloc(sizeof(struct android_app));
-    memset(android_app, 0, sizeof(struct android_app));
-    android_app->activity = activity;
-
-    pthread_mutex_init(&android_app->mutex, NULL);
-    pthread_cond_init(&android_app->cond, NULL);
-
-    if (savedState != NULL) {
-        android_app->savedState = malloc(savedStateSize);
-        android_app->savedStateSize = savedStateSize;
-        memcpy(android_app->savedState, savedState, savedStateSize);
-    }
-
-    int msgpipe[2];
-    if (pipe(msgpipe)) {
-        LOGE("could not create pipe: %s", strerror(errno));
-        return NULL;
-    }
-    android_app->msgread = msgpipe[0];
-    android_app->msgwrite = msgpipe[1];
-
-    android_app->keyEventFilter = default_key_filter;
-    android_app->motionEventFilter = default_motion_filter;
-
-    LOGV("Launching android_app_entry in a thread");
-    pthread_attr_t attr;
-    pthread_attr_init(&attr);
-    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-    pthread_create(&android_app->thread, &attr, android_app_entry, android_app);
-
-    // Wait for thread to start.
-    pthread_mutex_lock(&android_app->mutex);
-    while (!android_app->running) {
-        pthread_cond_wait(&android_app->cond, &android_app->mutex);
-    }
-    pthread_mutex_unlock(&android_app->mutex);
-
-    return android_app;
-}
-
-static void android_app_write_cmd(struct android_app* android_app, int8_t cmd) {
-    if (write(android_app->msgwrite, &cmd, sizeof(cmd)) != sizeof(cmd)) {
-        LOGE("Failure writing android_app cmd: %s", strerror(errno));
-    }
-}
-
-static void android_app_set_window(struct android_app* android_app,
-                                   ANativeWindow* window) {
-    LOGV("android_app_set_window called");
-    pthread_mutex_lock(&android_app->mutex);
-
-    // NB: we have to consider that the native thread could have already
-    // (gracefully) exit (setting android_app->destroyed) and so we need
-    // to be careful to avoid a deadlock waiting for a thread that's
-    // already exit.
-    if (android_app->destroyed) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return;
-    }
-    if (android_app->pendingWindow != NULL) {
-        android_app_write_cmd(android_app, APP_CMD_TERM_WINDOW);
-    }
-    android_app->pendingWindow = window;
-    if (window != NULL) {
-        android_app_write_cmd(android_app, APP_CMD_INIT_WINDOW);
-    }
-    while (android_app->window != android_app->pendingWindow) {
-        pthread_cond_wait(&android_app->cond, &android_app->mutex);
-    }
-    pthread_mutex_unlock(&android_app->mutex);
-}
-
-static void android_app_set_activity_state(struct android_app* android_app,
-                                           int8_t cmd) {
-    pthread_mutex_lock(&android_app->mutex);
-
-    // NB: we have to consider that the native thread could have already
-    // (gracefully) exit (setting android_app->destroyed) and so we need
-    // to be careful to avoid a deadlock waiting for a thread that's
-    // already exit.
-    if (!android_app->destroyed) {
-        android_app_write_cmd(android_app, cmd);
-        while (android_app->activityState != cmd) {
-            pthread_cond_wait(&android_app->cond, &android_app->mutex);
-        }
-    }
-    pthread_mutex_unlock(&android_app->mutex);
-}
-
-static void android_app_free(struct android_app* android_app) {
-    int input_buf_idx = 0;
-
-    pthread_mutex_lock(&android_app->mutex);
-
-    // It's possible that onDestroy is called after we have already 'destroyed'
-    // the app (via `android_app_destroy` due to `android_main` returning.
-    //
-    // In this case `->destroyed` will already be set (so we won't deadlock in
-    // the loop below) but we still need to close the messaging fds and finish
-    // freeing the android_app
-
-    android_app_write_cmd(android_app, APP_CMD_DESTROY);
-    while (!android_app->destroyed) {
-        pthread_cond_wait(&android_app->cond, &android_app->mutex);
-    }
-    pthread_mutex_unlock(&android_app->mutex);
-
-    for (input_buf_idx = 0; input_buf_idx < NATIVE_APP_GLUE_MAX_INPUT_BUFFERS; input_buf_idx++) {
-        struct android_input_buffer *buf = &android_app->inputBuffers[input_buf_idx];
-
-        android_app_clear_motion_events(buf);
-        free(buf->motionEvents);
-        free(buf->keyEvents);
-    }
-
-    close(android_app->msgread);
-    close(android_app->msgwrite);
-    pthread_cond_destroy(&android_app->cond);
-    pthread_mutex_destroy(&android_app->mutex);
-    free(android_app);
-}
-
-static inline struct android_app* ToApp(GameActivity* activity) {
-    return (struct android_app*)activity->instance;
-}
-
-static void onDestroy(GameActivity* activity) {
-    LOGV("Destroy: %p", activity);
-    android_app_free(ToApp(activity));
-}
-
-static void onStart(GameActivity* activity) {
-    LOGV("Start: %p", activity);
-    android_app_set_activity_state(ToApp(activity), APP_CMD_START);
-}
-
-static void onResume(GameActivity* activity) {
-    LOGV("Resume: %p", activity);
-    android_app_set_activity_state(ToApp(activity), APP_CMD_RESUME);
-}
-
-static void onSaveInstanceState(GameActivity* activity,
-                                SaveInstanceStateRecallback recallback,
-                                void* context) {
-    LOGV("SaveInstanceState: %p", activity);
-
-    struct android_app* android_app = ToApp(activity);
-    pthread_mutex_lock(&android_app->mutex);
-
-    // NB: we have to consider that the native thread could have already
-    // (gracefully) exit (setting android_app->destroyed) and so we need
-    // to be careful to avoid a deadlock waiting for a thread that's
-    // already exit.
-    if (android_app->destroyed) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return;
-    }
-
-    android_app->stateSaved = 0;
-    android_app_write_cmd(android_app, APP_CMD_SAVE_STATE);
-    while (!android_app->stateSaved) {
-        pthread_cond_wait(&android_app->cond, &android_app->mutex);
-    }
-
-    if (android_app->savedState != NULL) {
-        // Tell the Java side about our state.
-        recallback((const char*)android_app->savedState,
-                   android_app->savedStateSize, context);
-        // Now we can free it.
-        free(android_app->savedState);
-        android_app->savedState = NULL;
-        android_app->savedStateSize = 0;
-    }
-
-    pthread_mutex_unlock(&android_app->mutex);
-}
-
-static void onPause(GameActivity* activity) {
-    LOGV("Pause: %p", activity);
-    android_app_set_activity_state(ToApp(activity), APP_CMD_PAUSE);
-}
-
-static void onStop(GameActivity* activity) {
-    LOGV("Stop: %p", activity);
-    android_app_set_activity_state(ToApp(activity), APP_CMD_STOP);
-}
-
-static void onConfigurationChanged(GameActivity* activity) {
-    LOGV("ConfigurationChanged: %p", activity);
-    android_app_write_cmd(ToApp(activity), APP_CMD_CONFIG_CHANGED);
-}
-
-static void onTrimMemory(GameActivity* activity, int level) {
-    LOGV("TrimMemory: %p %d", activity, level);
-    android_app_write_cmd(ToApp(activity), APP_CMD_LOW_MEMORY);
-}
-
-static void onWindowFocusChanged(GameActivity* activity, bool focused) {
-    LOGV("WindowFocusChanged: %p -- %d", activity, focused);
-    android_app_write_cmd(ToApp(activity),
-                          focused ? APP_CMD_GAINED_FOCUS : APP_CMD_LOST_FOCUS);
-}
-
-static void onNativeWindowCreated(GameActivity* activity,
-                                  ANativeWindow* window) {
-    LOGV("NativeWindowCreated: %p -- %p", activity, window);
-    android_app_set_window(ToApp(activity), window);
-}
-
-static void onNativeWindowDestroyed(GameActivity* activity,
-                                    ANativeWindow* window) {
-    LOGV("NativeWindowDestroyed: %p -- %p", activity, window);
-    android_app_set_window(ToApp(activity), NULL);
-}
-
-static void onNativeWindowRedrawNeeded(GameActivity* activity,
-                                       ANativeWindow* window) {
-    LOGV("NativeWindowRedrawNeeded: %p -- %p", activity, window);
-    android_app_write_cmd(ToApp(activity), APP_CMD_WINDOW_REDRAW_NEEDED);
-}
-
-static void onNativeWindowResized(GameActivity* activity, ANativeWindow* window,
-                                  int32_t width, int32_t height) {
-    LOGV("NativeWindowResized: %p -- %p ( %d x %d )", activity, window, width,
-         height);
-    android_app_write_cmd(ToApp(activity), APP_CMD_WINDOW_RESIZED);
-}
-
-void android_app_set_motion_event_filter(struct android_app* app,
-                                         android_motion_event_filter filter) {
-    pthread_mutex_lock(&app->mutex);
-    app->motionEventFilter = filter;
-    pthread_mutex_unlock(&app->mutex);
-}
-
-bool android_app_input_available_wake_up(struct android_app* app) {
-    pthread_mutex_lock(&app->mutex);
-    bool available = app->inputAvailableWakeUp;
-    app->inputAvailableWakeUp = false;
-    pthread_mutex_unlock(&app->mutex);
-    return available;
-}
-
-// NB: should be called with the android_app->mutex held already
-static void notifyInput(struct android_app* android_app) {
-    // Don't spam the mainloop with wake ups if we've already sent one
-    if (android_app->inputSwapPending) {
-        return;
-    }
-
-    if (android_app->looper != NULL) {
-        // for the app thread to know why it received the wake() up
-        android_app->inputAvailableWakeUp = true;
-        android_app->inputSwapPending = true;
-        ALooper_wake(android_app->looper);
-    }
-}
-
-static bool onTouchEvent(GameActivity* activity,
-                         const GameActivityMotionEvent* event) {
-    struct android_app* android_app = ToApp(activity);
-    pthread_mutex_lock(&android_app->mutex);
-
-    // NB: we have to consider that the native thread could have already
-    // (gracefully) exit (setting android_app->destroyed) and so we need
-    // to be careful to avoid a deadlock waiting for a thread that's
-    // already exit.
-    if (android_app->destroyed) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return false;
-    }
-
-    if (android_app->motionEventFilter != NULL &&
-        !android_app->motionEventFilter(event)) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return false;
-    }
-
-    struct android_input_buffer* inputBuffer =
-        &android_app->inputBuffers[android_app->currentInputBuffer];
-
-    // Add to the list of active motion events
-    if (inputBuffer->motionEventsCount >= inputBuffer->motionEventsBufferSize) {
-        inputBuffer->motionEventsBufferSize *= 2;
-        inputBuffer->motionEvents = (GameActivityMotionEvent *) realloc(inputBuffer->motionEvents,
-            sizeof(GameActivityMotionEvent) * inputBuffer->motionEventsBufferSize);
-
-        if (inputBuffer->motionEvents == NULL) {
-            LOGE("onTouchEvent: out of memory");
-            abort();
-        }
-    }
-
-    int new_ix = inputBuffer->motionEventsCount;
-    memcpy(&inputBuffer->motionEvents[new_ix], event, sizeof(GameActivityMotionEvent));
-    ++inputBuffer->motionEventsCount;
-    notifyInput(android_app);
-
-    pthread_mutex_unlock(&android_app->mutex);
-    return true;
-}
-
-struct android_input_buffer* android_app_swap_input_buffers(
-    struct android_app* android_app) {
-    pthread_mutex_lock(&android_app->mutex);
-
-    struct android_input_buffer* inputBuffer =
-        &android_app->inputBuffers[android_app->currentInputBuffer];
-
-    if (inputBuffer->motionEventsCount == 0 &&
-        inputBuffer->keyEventsCount == 0) {
-        inputBuffer = NULL;
-    } else {
-        android_app->currentInputBuffer =
-            (android_app->currentInputBuffer + 1) %
-            NATIVE_APP_GLUE_MAX_INPUT_BUFFERS;
-    }
-
-    android_app->inputSwapPending = false;
-    android_app->inputAvailableWakeUp = false;
-
-    pthread_mutex_unlock(&android_app->mutex);
-
-    return inputBuffer;
-}
-
-void android_app_clear_motion_events(struct android_input_buffer* inputBuffer) {
-    // We do not need to lock here if the inputBuffer has already been swapped
-    // as is handled by the game loop thread
-    while (inputBuffer->motionEventsCount > 0) {
-        GameActivityMotionEvent_destroy(
-            &inputBuffer->motionEvents[inputBuffer->motionEventsCount - 1]);
-
-        inputBuffer->motionEventsCount--;
-    }
-    assert(inputBuffer->motionEventsCount == 0);
-}
-
-void android_app_set_key_event_filter(struct android_app* app,
-                                      android_key_event_filter filter) {
-    pthread_mutex_lock(&app->mutex);
-    app->keyEventFilter = filter;
-    pthread_mutex_unlock(&app->mutex);
-}
-
-static bool onKey(GameActivity* activity, const GameActivityKeyEvent* event) {
-    struct android_app* android_app = ToApp(activity);
-    pthread_mutex_lock(&android_app->mutex);
-
-    // NB: we have to consider that the native thread could have already
-    // (gracefully) exit (setting android_app->destroyed) and so we need
-    // to be careful to avoid a deadlock waiting for a thread that's
-    // already exit.
-    if (android_app->destroyed) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return false;
-    }
-
-    if (android_app->keyEventFilter != NULL &&
-        !android_app->keyEventFilter(event)) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return false;
-    }
-
-    struct android_input_buffer* inputBuffer =
-        &android_app->inputBuffers[android_app->currentInputBuffer];
-
-    // Add to the list of active key down events
-    if (inputBuffer->keyEventsCount >= inputBuffer->keyEventsBufferSize) {
-        inputBuffer->keyEventsBufferSize = inputBuffer->keyEventsBufferSize * 2;
-        inputBuffer->keyEvents = (GameActivityKeyEvent *) realloc(inputBuffer->keyEvents,
-            sizeof(GameActivityKeyEvent) * inputBuffer->keyEventsBufferSize);
-
-        if (inputBuffer->keyEvents == NULL) {
-            LOGE("onKey: out of memory");
-            abort();
-        }
-    }
-
-    int new_ix = inputBuffer->keyEventsCount;
-    memcpy(&inputBuffer->keyEvents[new_ix], event, sizeof(GameActivityKeyEvent));
-    ++inputBuffer->keyEventsCount;
-    notifyInput(android_app);
-
-    pthread_mutex_unlock(&android_app->mutex);
-    return true;
-}
-
-void android_app_clear_key_events(struct android_input_buffer* inputBuffer) {
-    inputBuffer->keyEventsCount = 0;
-}
-
-static void onTextInputEvent(GameActivity* activity,
-                             const GameTextInputState* state) {
-    struct android_app* android_app = ToApp(activity);
-    pthread_mutex_lock(&android_app->mutex);
-    if (!android_app->destroyed) {
-        android_app->textInputState = 1;
-        notifyInput(android_app);
-    }
-    pthread_mutex_unlock(&android_app->mutex);
-}
-
-static void onWindowInsetsChanged(GameActivity* activity) {
-    LOGV("WindowInsetsChanged: %p", activity);
-    android_app_write_cmd(ToApp(activity), APP_CMD_WINDOW_INSETS_CHANGED);
-}
-
-static void onContentRectChanged(GameActivity* activity, const ARect *rect) {
-    LOGV("ContentRectChanged: %p -- (%d %d) (%d %d)", activity, rect->left, rect->top,
-         rect->right, rect->bottom);
-
-    struct android_app* android_app = ToApp(activity);
-
-    pthread_mutex_lock(&android_app->mutex);
-    android_app->contentRect = *rect;
-
-    android_app_write_cmd(android_app, APP_CMD_CONTENT_RECT_CHANGED);
-    pthread_mutex_unlock(&android_app->mutex);
-}
-
-// XXX: This symbol is renamed with a _C suffix and then re-exported from
-// Rust because Rust/Cargo don't give us a way to directly export symbols
-// from C/C++ code: https://github.com/rust-lang/rfcs/issues/2771
-//
-JNIEXPORT
-void GameActivity_onCreate_C(GameActivity* activity, void* savedState,
-                           size_t savedStateSize) {
-    LOGV("Creating: %p", activity);
-    activity->callbacks->onDestroy = onDestroy;
-    activity->callbacks->onStart = onStart;
-    activity->callbacks->onResume = onResume;
-    activity->callbacks->onSaveInstanceState = onSaveInstanceState;
-    activity->callbacks->onPause = onPause;
-    activity->callbacks->onStop = onStop;
-    activity->callbacks->onTouchEvent = onTouchEvent;
-    activity->callbacks->onKeyDown = onKey;
-    activity->callbacks->onKeyUp = onKey;
-    activity->callbacks->onTextInputEvent = onTextInputEvent;
-    activity->callbacks->onConfigurationChanged = onConfigurationChanged;
-    activity->callbacks->onTrimMemory = onTrimMemory;
-    activity->callbacks->onWindowFocusChanged = onWindowFocusChanged;
-    activity->callbacks->onNativeWindowCreated = onNativeWindowCreated;
-    activity->callbacks->onNativeWindowDestroyed = onNativeWindowDestroyed;
-    activity->callbacks->onNativeWindowRedrawNeeded =
-        onNativeWindowRedrawNeeded;
-    activity->callbacks->onNativeWindowResized = onNativeWindowResized;
-    activity->callbacks->onWindowInsetsChanged = onWindowInsetsChanged;
-    activity->callbacks->onContentRectChanged = onContentRectChanged;
-    LOGV("Callbacks set: %p", activity->callbacks);
-
-    activity->instance =
-        android_app_create(activity, savedState, savedStateSize);
-}
diff --git a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h
deleted file mode 100644
index 6fa5721..0000000
--- a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.h
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-/**
- * @addtogroup android_native_app_glue Native App Glue library
- * The glue library to interface your game loop with GameActivity.
- * @{
- */
-
-#include <android/configuration.h>
-#include <android/looper.h>
-#include <poll.h>
-#include <pthread.h>
-#include <sched.h>
-
-#include "game-activity/GameActivity.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * The GameActivity interface provided by <game-activity/GameActivity.h>
- * is based on a set of application-provided callbacks that will be called
- * by the Activity's main thread when certain events occur.
- *
- * This means that each one of this callbacks _should_ _not_ block, or they
- * risk having the system force-close the application. This programming
- * model is direct, lightweight, but constraining.
- *
- * The 'android_native_app_glue' static library is used to provide a different
- * execution model where the application can implement its own main event
- * loop in a different thread instead. Here's how it works:
- *
- * 1/ The application must provide a function named "android_main()" that
- *    will be called when the activity is created, in a new thread that is
- *    distinct from the activity's main thread.
- *
- * 2/ android_main() receives a pointer to a valid "android_app" structure
- *    that contains references to other important objects, e.g. the
- *    GameActivity obejct instance the application is running in.
- *
- * 3/ the "android_app" object holds an ALooper instance that already
- *    listens to activity lifecycle events (e.g. "pause", "resume").
- *    See APP_CMD_XXX declarations below.
- *
- *    This corresponds to an ALooper identifier returned by
- *    ALooper_pollOnce with value LOOPER_ID_MAIN.
- *
- *    Your application can use the same ALooper to listen to additional
- *    file-descriptors.  They can either be callback based, or with return
- *    identifiers starting with LOOPER_ID_USER.
- *
- * 4/ Whenever you receive a LOOPER_ID_MAIN event,
- *    the returned data will point to an android_poll_source structure.  You
- *    can call the process() function on it, and fill in android_app->onAppCmd
- *    to be called for your own processing of the event.
- *
- *    Alternatively, you can call the low-level functions to read and process
- *    the data directly...  look at the process_cmd() and process_input()
- *    implementations in the glue to see how to do this.
- *
- * See the sample named "native-activity" that comes with the NDK with a
- * full usage example.  Also look at the documentation of GameActivity.
- */
-
-struct android_app;
-
-/**
- * Data associated with an ALooper fd that will be returned as the "outData"
- * when that source has data ready.
- */
-struct android_poll_source {
-    /**
-     * The identifier of this source.  May be LOOPER_ID_MAIN or
-     * LOOPER_ID_INPUT.
-     */
-    int32_t id;
-
-    /** The android_app this ident is associated with. */
-    struct android_app* app;
-
-    /**
-     * Function to call to perform the standard processing of data from
-     * this source.
-     */
-    void (*process)(struct android_app* app,
-                    struct android_poll_source* source);
-};
-
-struct android_input_buffer {
-    /**
-     * Pointer to a read-only array of GameActivityMotionEvent.
-     * Only the first motionEventsCount events are valid.
-     */
-    GameActivityMotionEvent *motionEvents;
-
-    /**
-     * The number of valid motion events in `motionEvents`.
-     */
-    uint64_t motionEventsCount;
-
-    /**
-     * The size of the `motionEvents` buffer.
-     */
-    uint64_t motionEventsBufferSize;
-
-    /**
-     * Pointer to a read-only array of GameActivityKeyEvent.
-     * Only the first keyEventsCount events are valid.
-     */
-    GameActivityKeyEvent *keyEvents;
-
-    /**
-     * The number of valid "Key" events in `keyEvents`.
-     */
-    uint64_t keyEventsCount;
-
-    /**
-     * The size of the `keyEvents` buffer.
-     */
-    uint64_t keyEventsBufferSize;
-};
-
-/**
- * Function pointer declaration for the filtering of key events.
- * A function with this signature should be passed to
- * android_app_set_key_event_filter and return false for any events that should
- * not be handled by android_native_app_glue. These events will be handled by
- * the system instead.
- */
-typedef bool (*android_key_event_filter)(const GameActivityKeyEvent*);
-
-/**
- * Function pointer definition for the filtering of motion events.
- * A function with this signature should be passed to
- * android_app_set_motion_event_filter and return false for any events that
- * should not be handled by android_native_app_glue. These events will be
- * handled by the system instead.
- */
-typedef bool (*android_motion_event_filter)(const GameActivityMotionEvent*);
-
-/**
- * This is the interface for the standard glue code of a threaded
- * application.  In this model, the application's code is running
- * in its own thread separate from the main thread of the process.
- * It is not required that this thread be associated with the Java
- * VM, although it will need to be in order to make JNI calls any
- * Java objects.
- */
-struct android_app {
-    /**
-     * An optional pointer to application-defined state.
-     */
-    void* userData;
-
-    /**
-     * A required callback for processing main app commands (`APP_CMD_*`).
-     * This is called each frame if there are app commands that need processing.
-     */
-    void (*onAppCmd)(struct android_app* app, int32_t cmd);
-
-    /** The GameActivity object instance that this app is running in. */
-    GameActivity* activity;
-
-    /** The current configuration the app is running in. */
-    AConfiguration* config;
-
-    /**
-     * The last activity saved state, as provided at creation time.
-     * It is NULL if there was no state.  You can use this as you need; the
-     * memory will remain around until you call android_app_exec_cmd() for
-     * APP_CMD_RESUME, at which point it will be freed and savedState set to
-     * NULL. These variables should only be changed when processing a
-     * APP_CMD_SAVE_STATE, at which point they will be initialized to NULL and
-     * you can malloc your state and place the information here.  In that case
-     * the memory will be freed for you later.
-     */
-    void* savedState;
-
-    /**
-     * The size of the activity saved state. It is 0 if `savedState` is NULL.
-     */
-    size_t savedStateSize;
-
-    /** The ALooper associated with the app's thread. */
-    ALooper* looper;
-
-    /** When non-NULL, this is the window surface that the app can draw in. */
-    ANativeWindow* window;
-
-    /**
-     * Current content rectangle of the window; this is the area where the
-     * window's content should be placed to be seen by the user.
-     */
-    ARect contentRect;
-
-    /**
-     * Current state of the app's activity.  May be either APP_CMD_START,
-     * APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP.
-     */
-    int activityState;
-
-    /**
-     * This is non-zero when the application's GameActivity is being
-     * destroyed and waiting for the app thread to complete.
-     */
-    int destroyRequested;
-
-#define NATIVE_APP_GLUE_MAX_INPUT_BUFFERS 2
-
-    /**
-     * This is used for buffering input from GameActivity. Once ready, the
-     * application thread switches the buffers and processes what was
-     * accumulated.
-     */
-    struct android_input_buffer inputBuffers[NATIVE_APP_GLUE_MAX_INPUT_BUFFERS];
-
-    int currentInputBuffer;
-
-    /**
-     * 0 if no text input event is outstanding, 1 if it is.
-     * Use `GameActivity_getTextInputState` to get information
-     * about the text entered by the user.
-     */
-    int textInputState;
-
-    // Below are "private" implementation of the glue code.
-    /** @cond INTERNAL */
-
-    pthread_mutex_t mutex;
-    pthread_cond_t cond;
-
-    int msgread;
-    int msgwrite;
-
-    pthread_t thread;
-
-    struct android_poll_source cmdPollSource;
-
-    int running;
-    int stateSaved;
-    int destroyed;
-    int redrawNeeded;
-    ANativeWindow* pendingWindow;
-    ARect pendingContentRect;
-
-    android_key_event_filter keyEventFilter;
-    android_motion_event_filter motionEventFilter;
-
-    // When new input is received we set both of these flags and use the looper to
-    // wake up the application mainloop.
-    //
-    // To avoid spamming the mainloop with wake ups from lots of input though we
-    // don't sent a wake up if the inputSwapPending flag is already set. (i.e.
-    // we already expect input to be processed in a finite amount of time due to
-    // our previous wake up)
-    //
-    // When a wake up is received then we will check this flag (clearing it
-    // at the same time). If it was set then an InputAvailable event is sent to
-    // the application - which should lead to all input being processed within
-    // a finite amount of time.
-    //
-    // The next time android_app_swap_input_buffers is called, both flags will be
-    // cleared.
-    //
-    // NB: both of these should only be read with the app mutex held
-    bool inputAvailableWakeUp;
-    bool inputSwapPending;
-
-    /** @endcond */
-};
-
-/**
- * Looper ID of commands coming from the app's main thread, an AInputQueue or
- * user-defined sources.
- */
-enum NativeAppGlueLooperId {
-    /**
-     * Looper data ID of commands coming from the app's main thread, which
-     * is returned as an identifier from ALooper_pollOnce().  The data for this
-     * identifier is a pointer to an android_poll_source structure.
-     * These can be retrieved and processed with android_app_read_cmd()
-     * and android_app_exec_cmd().
-     */
-    LOOPER_ID_MAIN = 1,
-
-    /**
-     * Unused. Reserved for future use when usage of AInputQueue will be
-     * supported.
-     */
-    LOOPER_ID_INPUT = 2,
-
-    /**
-     * Start of user-defined ALooper identifiers.
-     */
-    LOOPER_ID_USER = 3,
-};
-
-/**
- * Commands passed from the application's main Java thread to the game's thread.
- */
-enum NativeAppGlueAppCmd {
-    /**
-     * Unused. Reserved for future use when usage of AInputQueue will be
-     * supported.
-     */
-    UNUSED_APP_CMD_INPUT_CHANGED,
-
-    /**
-     * Command from main thread: a new ANativeWindow is ready for use.  Upon
-     * receiving this command, android_app->window will contain the new window
-     * surface.
-     */
-    APP_CMD_INIT_WINDOW,
-
-    /**
-     * Command from main thread: the existing ANativeWindow needs to be
-     * terminated.  Upon receiving this command, android_app->window still
-     * contains the existing window; after calling android_app_exec_cmd
-     * it will be set to NULL.
-     */
-    APP_CMD_TERM_WINDOW,
-
-    /**
-     * Command from main thread: the current ANativeWindow has been resized.
-     * Please redraw with its new size.
-     */
-    APP_CMD_WINDOW_RESIZED,
-
-    /**
-     * Command from main thread: the system needs that the current ANativeWindow
-     * be redrawn.  You should redraw the window before handing this to
-     * android_app_exec_cmd() in order to avoid transient drawing glitches.
-     */
-    APP_CMD_WINDOW_REDRAW_NEEDED,
-
-    /**
-     * Command from main thread: the content area of the window has changed,
-     * such as from the soft input window being shown or hidden.  You can
-     * find the new content rect in android_app::contentRect.
-     */
-    APP_CMD_CONTENT_RECT_CHANGED,
-
-    /**
-     * Command from main thread: the app's activity window has gained
-     * input focus.
-     */
-    APP_CMD_GAINED_FOCUS,
-
-    /**
-     * Command from main thread: the app's activity window has lost
-     * input focus.
-     */
-    APP_CMD_LOST_FOCUS,
-
-    /**
-     * Command from main thread: the current device configuration has changed.
-     */
-    APP_CMD_CONFIG_CHANGED,
-
-    /**
-     * Command from main thread: the system is running low on memory.
-     * Try to reduce your memory use.
-     */
-    APP_CMD_LOW_MEMORY,
-
-    /**
-     * Command from main thread: the app's activity has been started.
-     */
-    APP_CMD_START,
-
-    /**
-     * Command from main thread: the app's activity has been resumed.
-     */
-    APP_CMD_RESUME,
-
-    /**
-     * Command from main thread: the app should generate a new saved state
-     * for itself, to restore from later if needed.  If you have saved state,
-     * allocate it with malloc and place it in android_app.savedState with
-     * the size in android_app.savedStateSize.  The will be freed for you
-     * later.
-     */
-    APP_CMD_SAVE_STATE,
-
-    /**
-     * Command from main thread: the app's activity has been paused.
-     */
-    APP_CMD_PAUSE,
-
-    /**
-     * Command from main thread: the app's activity has been stopped.
-     */
-    APP_CMD_STOP,
-
-    /**
-     * Command from main thread: the app's activity is being destroyed,
-     * and waiting for the app thread to clean up and exit before proceeding.
-     */
-    APP_CMD_DESTROY,
-
-    /**
-     * Command from main thread: the app's insets have changed.
-     */
-    APP_CMD_WINDOW_INSETS_CHANGED,
-
-};
-
-/**
- * Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next
- * app command message.
- */
-int8_t android_app_read_cmd(struct android_app* android_app);
-
-/**
- * Call with the command returned by android_app_read_cmd() to do the
- * initial pre-processing of the given command.  You can perform your own
- * actions for the command after calling this function.
- */
-void android_app_pre_exec_cmd(struct android_app* android_app, int8_t cmd);
-
-/**
- * Call with the command returned by android_app_read_cmd() to do the
- * final post-processing of the given command.  You must have done your own
- * actions for the command before calling this function.
- */
-void android_app_post_exec_cmd(struct android_app* android_app, int8_t cmd);
-
-/**
- * Call this before processing input events to get the events buffer.
- * The function returns NULL if there are no events to process.
- */
-struct android_input_buffer* android_app_swap_input_buffers(
-    struct android_app* android_app);
-
-/**
- * Clear the array of motion events that were waiting to be handled, and release
- * each of them.
- *
- * This method should be called after you have processed the motion events in
- * your game loop. You should handle events at each iteration of your game loop.
- */
-void android_app_clear_motion_events(struct android_input_buffer* inputBuffer);
-
-/**
- * Clear the array of key events that were waiting to be handled, and release
- * each of them.
- *
- * This method should be called after you have processed the key up events in
- * your game loop. You should handle events at each iteration of your game loop.
- */
-void android_app_clear_key_events(struct android_input_buffer* inputBuffer);
-
-/**
- * This is a springboard into the Rust glue layer that wraps calling the
- * main entry for the app itself.
- */
-extern void _rust_glue_entry(struct android_app* app);
-
-/**
- * Set the filter to use when processing key events.
- * Any events for which the filter returns false will be ignored by
- * android_native_app_glue. If filter is set to NULL, no filtering is done.
- *
- * The default key filter will filter out volume and camera button presses.
- */
-void android_app_set_key_event_filter(struct android_app* app,
-                                      android_key_event_filter filter);
-
-/**
- * Set the filter to use when processing touch and motion events.
- * Any events for which the filter returns false will be ignored by
- * android_native_app_glue. If filter is set to NULL, no filtering is done.
- *
- * Note that the default motion event filter will only allow touchscreen events
- * through, in order to mimic NativeActivity's behaviour, so for controller
- * events to be passed to the app, set the filter to NULL.
- */
-void android_app_set_motion_event_filter(struct android_app* app,
-                                         android_motion_event_filter filter);
-
-/**
- * Determines if a looper wake up was due to new input becoming available
- */
-bool android_app_input_available_wake_up(struct android_app* app);
-
-#ifdef __cplusplus
-}
-#endif
-
-/** @} */
diff --git a/android-activity/game-activity-csrc/game-text-input/gamecommon.h b/android-activity/game-activity-csrc/game-text-input/gamecommon.h
deleted file mode 100755
index 38bffff..0000000
--- a/android-activity/game-activity-csrc/game-text-input/gamecommon.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @defgroup game_common Game Common
- * Common structures and functions used within AGDK
- * @{
- */
-
-#pragma once
-
-/**
- * The type of a component for which to retrieve insets. See
- * https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type
- */
-typedef enum GameCommonInsetsType {
-    GAMECOMMON_INSETS_TYPE_CAPTION_BAR = 0,
-    GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT,
-    GAMECOMMON_INSETS_TYPE_IME,
-    GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES,
-    GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS,
-    GAMECOMMON_INSETS_TYPE_STATUS_BARS,
-    GAMECOMMON_INSETS_TYPE_SYSTEM_BARS,
-    GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES,
-    GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT,
-    GAMECOMMON_INSETS_TYPE_WATERFALL,
-    GAMECOMMON_INSETS_TYPE_COUNT
-} GameCommonInsetsType;
diff --git a/android-activity/game-activity-csrc/game-text-input/gametextinput.cpp b/android-activity/game-activity-csrc/game-text-input/gametextinput.cpp
deleted file mode 100755
index b8244fb..0000000
--- a/android-activity/game-activity-csrc/game-text-input/gametextinput.cpp
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "game-text-input/gametextinput.h"
-
-#include <android/log.h>
-#include <jni.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <algorithm>
-#include <memory>
-#include <vector>
-
-#define LOG_TAG "GameTextInput"
-
-static constexpr int32_t DEFAULT_MAX_STRING_SIZE = 1 << 16;
-
-// Cache of field ids in the Java GameTextInputState class
-struct StateClassInfo {
-    jfieldID text;
-    jfieldID selectionStart;
-    jfieldID selectionEnd;
-    jfieldID composingRegionStart;
-    jfieldID composingRegionEnd;
-};
-
-// Main GameTextInput object.
-struct GameTextInput {
-   public:
-    GameTextInput(JNIEnv *env, uint32_t max_string_size);
-    ~GameTextInput();
-    void setState(const GameTextInputState &state);
-    const GameTextInputState &getState() const { return currentState_; }
-    void setInputConnection(jobject inputConnection);
-    void processEvent(jobject textInputEvent);
-    void showIme(uint32_t flags);
-    void hideIme(uint32_t flags);
-    void restartInput();
-    void setEventCallback(GameTextInputEventCallback callback, void *context);
-    jobject stateToJava(const GameTextInputState &state) const;
-    void stateFromJava(jobject textInputEvent,
-                       GameTextInputGetStateCallback callback,
-                       void *context) const;
-    void setImeInsetsCallback(GameTextInputImeInsetsCallback callback,
-                              void *context);
-    void processImeInsets(const ARect *insets);
-    const ARect &getImeInsets() const { return currentInsets_; }
-
-   private:
-    // Copy string and set other fields
-    void setStateInner(const GameTextInputState &state);
-    static void processCallback(void *context, const GameTextInputState *state);
-    JNIEnv *env_ = nullptr;
-    // Cached at initialization from
-    // com/google/androidgamesdk/gametextinput/State.
-    jclass stateJavaClass_ = nullptr;
-    // The latest text input update.
-    GameTextInputState currentState_ = {};
-    // An instance of gametextinput.InputConnection.
-    jclass inputConnectionClass_ = nullptr;
-    jobject inputConnection_ = nullptr;
-    jmethodID inputConnectionSetStateMethod_;
-    jmethodID setSoftKeyboardActiveMethod_;
-    jmethodID restartInputMethod_;
-    void (*eventCallback_)(void *context,
-                           const struct GameTextInputState *state) = nullptr;
-    void *eventCallbackContext_ = nullptr;
-    void (*insetsCallback_)(void *context,
-                            const struct ARect *insets) = nullptr;
-    ARect currentInsets_ = {};
-    void *insetsCallbackContext_ = nullptr;
-    StateClassInfo stateClassInfo_ = {};
-    // Constant-sized buffer used to store state text.
-    std::vector<char> stateStringBuffer_;
-};
-
-std::unique_ptr<GameTextInput> s_gameTextInput;
-
-extern "C" {
-
-///////////////////////////////////////////////////////////
-/// GameTextInputState C Functions
-///////////////////////////////////////////////////////////
-
-// Convert to a Java structure.
-jobject currentState_toJava(const GameTextInput *gameTextInput,
-                            const GameTextInputState *state) {
-    if (state == nullptr) return NULL;
-    return gameTextInput->stateToJava(*state);
-}
-
-// Convert from Java structure.
-void currentState_fromJava(const GameTextInput *gameTextInput,
-                           jobject textInputEvent,
-                           GameTextInputGetStateCallback callback,
-                           void *context) {
-    gameTextInput->stateFromJava(textInputEvent, callback, context);
-}
-
-///////////////////////////////////////////////////////////
-/// GameTextInput C Functions
-///////////////////////////////////////////////////////////
-
-struct GameTextInput *GameTextInput_init(JNIEnv *env,
-                                         uint32_t max_string_size) {
-    if (s_gameTextInput.get() != nullptr) {
-        __android_log_print(ANDROID_LOG_WARN, LOG_TAG,
-                            "Warning: called GameTextInput_init twice without "
-                            "calling GameTextInput_destroy");
-        return s_gameTextInput.get();
-    }
-    // Don't use make_unique, for C++11 compatibility
-    s_gameTextInput =
-        std::unique_ptr<GameTextInput>(new GameTextInput(env, max_string_size));
-    return s_gameTextInput.get();
-}
-
-void GameTextInput_destroy(GameTextInput *input) {
-    if (input == nullptr || s_gameTextInput.get() == nullptr) return;
-    s_gameTextInput.reset();
-}
-
-void GameTextInput_setState(GameTextInput *input,
-                            const GameTextInputState *state) {
-    if (state == nullptr) return;
-    input->setState(*state);
-}
-
-void GameTextInput_getState(GameTextInput *input,
-                            GameTextInputGetStateCallback callback,
-                            void *context) {
-    callback(context, &input->getState());
-}
-
-void GameTextInput_setInputConnection(GameTextInput *input,
-                                      jobject inputConnection) {
-    input->setInputConnection(inputConnection);
-}
-
-void GameTextInput_processEvent(GameTextInput *input, jobject textInputEvent) {
-    input->processEvent(textInputEvent);
-}
-
-void GameTextInput_processImeInsets(GameTextInput *input, const ARect *insets) {
-    input->processImeInsets(insets);
-}
-
-void GameTextInput_showIme(struct GameTextInput *input, uint32_t flags) {
-    input->showIme(flags);
-}
-
-void GameTextInput_hideIme(struct GameTextInput *input, uint32_t flags) {
-    input->hideIme(flags);
-}
-
-void GameTextInput_restartInput(struct GameTextInput *input) {
-    input->restartInput();
-}
-
-void GameTextInput_setEventCallback(struct GameTextInput *input,
-                                    GameTextInputEventCallback callback,
-                                    void *context) {
-    input->setEventCallback(callback, context);
-}
-
-void GameTextInput_setImeInsetsCallback(struct GameTextInput *input,
-                                        GameTextInputImeInsetsCallback callback,
-                                        void *context) {
-    input->setImeInsetsCallback(callback, context);
-}
-
-void GameTextInput_getImeInsets(const GameTextInput *input, ARect *insets) {
-    *insets = input->getImeInsets();
-}
-
-}  // extern "C"
-
-///////////////////////////////////////////////////////////
-/// GameTextInput C++ class Implementation
-///////////////////////////////////////////////////////////
-
-GameTextInput::GameTextInput(JNIEnv *env, uint32_t max_string_size)
-    : env_(env),
-      stateStringBuffer_(max_string_size == 0 ? DEFAULT_MAX_STRING_SIZE
-                                              : max_string_size) {
-    stateJavaClass_ = (jclass)env_->NewGlobalRef(
-        env_->FindClass("com/google/androidgamesdk/gametextinput/State"));
-    inputConnectionClass_ = (jclass)env_->NewGlobalRef(env_->FindClass(
-        "com/google/androidgamesdk/gametextinput/InputConnection"));
-    inputConnectionSetStateMethod_ =
-        env_->GetMethodID(inputConnectionClass_, "setState",
-                          "(Lcom/google/androidgamesdk/gametextinput/State;)V");
-    setSoftKeyboardActiveMethod_ = env_->GetMethodID(
-        inputConnectionClass_, "setSoftKeyboardActive", "(ZI)V");
-    restartInputMethod_ =
-        env_->GetMethodID(inputConnectionClass_, "restartInput", "()V");
-
-    stateClassInfo_.text =
-        env_->GetFieldID(stateJavaClass_, "text", "Ljava/lang/String;");
-    stateClassInfo_.selectionStart =
-        env_->GetFieldID(stateJavaClass_, "selectionStart", "I");
-    stateClassInfo_.selectionEnd =
-        env_->GetFieldID(stateJavaClass_, "selectionEnd", "I");
-    stateClassInfo_.composingRegionStart =
-        env_->GetFieldID(stateJavaClass_, "composingRegionStart", "I");
-    stateClassInfo_.composingRegionEnd =
-        env_->GetFieldID(stateJavaClass_, "composingRegionEnd", "I");
-}
-
-GameTextInput::~GameTextInput() {
-    if (stateJavaClass_ != NULL) {
-        env_->DeleteGlobalRef(stateJavaClass_);
-        stateJavaClass_ = NULL;
-    }
-    if (inputConnectionClass_ != NULL) {
-        env_->DeleteGlobalRef(inputConnectionClass_);
-        inputConnectionClass_ = NULL;
-    }
-    if (inputConnection_ != NULL) {
-        env_->DeleteGlobalRef(inputConnection_);
-        inputConnection_ = NULL;
-    }
-}
-
-void GameTextInput::setState(const GameTextInputState &state) {
-    if (inputConnection_ == nullptr) return;
-    jobject jstate = stateToJava(state);
-    env_->CallVoidMethod(inputConnection_, inputConnectionSetStateMethod_,
-                         jstate);
-    env_->DeleteLocalRef(jstate);
-    setStateInner(state);
-}
-
-void GameTextInput::setStateInner(const GameTextInputState &state) {
-    // Check if we're setting using our own string (other parts may be
-    // different)
-    if (state.text_UTF8 == currentState_.text_UTF8) {
-        currentState_ = state;
-        return;
-    }
-    // Otherwise, copy across the string.
-    auto bytes_needed =
-        std::min(static_cast<uint32_t>(state.text_length + 1),
-                 static_cast<uint32_t>(stateStringBuffer_.size()));
-    currentState_.text_UTF8 = stateStringBuffer_.data();
-    std::copy(state.text_UTF8, state.text_UTF8 + bytes_needed - 1,
-              stateStringBuffer_.data());
-    currentState_.text_length = state.text_length;
-    currentState_.selection = state.selection;
-    currentState_.composingRegion = state.composingRegion;
-    stateStringBuffer_[bytes_needed - 1] = 0;
-}
-
-void GameTextInput::setInputConnection(jobject inputConnection) {
-    if (inputConnection_ != NULL) {
-        env_->DeleteGlobalRef(inputConnection_);
-    }
-    inputConnection_ = env_->NewGlobalRef(inputConnection);
-}
-
-/*static*/ void GameTextInput::processCallback(
-    void *context, const GameTextInputState *state) {
-    auto thiz = static_cast<GameTextInput *>(context);
-    if (state != nullptr) thiz->setStateInner(*state);
-}
-
-void GameTextInput::processEvent(jobject textInputEvent) {
-    stateFromJava(textInputEvent, processCallback, this);
-    if (eventCallback_) {
-        eventCallback_(eventCallbackContext_, &currentState_);
-    }
-}
-
-void GameTextInput::showIme(uint32_t flags) {
-    if (inputConnection_ == nullptr) return;
-    env_->CallVoidMethod(inputConnection_, setSoftKeyboardActiveMethod_, true,
-                         flags);
-}
-
-void GameTextInput::setEventCallback(GameTextInputEventCallback callback,
-                                     void *context) {
-    eventCallback_ = callback;
-    eventCallbackContext_ = context;
-}
-
-void GameTextInput::setImeInsetsCallback(
-    GameTextInputImeInsetsCallback callback, void *context) {
-    insetsCallback_ = callback;
-    insetsCallbackContext_ = context;
-}
-
-void GameTextInput::processImeInsets(const ARect *insets) {
-    currentInsets_ = *insets;
-    if (insetsCallback_) {
-        insetsCallback_(insetsCallbackContext_, &currentInsets_);
-    }
-}
-
-void GameTextInput::hideIme(uint32_t flags) {
-    if (inputConnection_ == nullptr) return;
-    env_->CallVoidMethod(inputConnection_, setSoftKeyboardActiveMethod_, false,
-                         flags);
-}
-
-void GameTextInput::restartInput() {
-    if (inputConnection_ == nullptr) return;
-    env_->CallVoidMethod(inputConnection_, restartInputMethod_, false);
-}
-
-jobject GameTextInput::stateToJava(const GameTextInputState &state) const {
-    static jmethodID constructor = nullptr;
-    if (constructor == nullptr) {
-        constructor = env_->GetMethodID(stateJavaClass_, "<init>",
-                                        "(Ljava/lang/String;IIII)V");
-        if (constructor == nullptr) {
-            __android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
-                                "Can't find gametextinput.State constructor");
-            return nullptr;
-        }
-    }
-    const char *text = state.text_UTF8;
-    if (text == nullptr) {
-        static char empty_string[] = "";
-        text = empty_string;
-    }
-    // Note that this expects 'modified' UTF-8 which is not the same as UTF-8
-    // https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8
-    jstring jtext = env_->NewStringUTF(text);
-    jobject jobj =
-        env_->NewObject(stateJavaClass_, constructor, jtext,
-                        state.selection.start, state.selection.end,
-                        state.composingRegion.start, state.composingRegion.end);
-    env_->DeleteLocalRef(jtext);
-    return jobj;
-}
-
-void GameTextInput::stateFromJava(jobject textInputEvent,
-                                  GameTextInputGetStateCallback callback,
-                                  void *context) const {
-    jstring text =
-        (jstring)env_->GetObjectField(textInputEvent, stateClassInfo_.text);
-    // Note this is 'modified' UTF-8, not true UTF-8. It has no NULLs in it,
-    // except at the end. It's actually not specified whether the value returned
-    // by GetStringUTFChars includes a null at the end, but it *seems to* on
-    // Android.
-    const char *text_chars = env_->GetStringUTFChars(text, NULL);
-    int text_len = env_->GetStringUTFLength(
-        text);  // Length in bytes, *not* including the null.
-    int selectionStart =
-        env_->GetIntField(textInputEvent, stateClassInfo_.selectionStart);
-    int selectionEnd =
-        env_->GetIntField(textInputEvent, stateClassInfo_.selectionEnd);
-    int composingRegionStart =
-        env_->GetIntField(textInputEvent, stateClassInfo_.composingRegionStart);
-    int composingRegionEnd =
-        env_->GetIntField(textInputEvent, stateClassInfo_.composingRegionEnd);
-    GameTextInputState state{text_chars,
-                             text_len,
-                             {selectionStart, selectionEnd},
-                             {composingRegionStart, composingRegionEnd}};
-    callback(context, &state);
-    env_->ReleaseStringUTFChars(text, text_chars);
-    env_->DeleteLocalRef(text);
-}
diff --git a/android-activity/game-activity-csrc/game-text-input/gametextinput.h b/android-activity/game-activity-csrc/game-text-input/gametextinput.h
deleted file mode 100755
index 8c33da5..0000000
--- a/android-activity/game-activity-csrc/game-text-input/gametextinput.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @defgroup game_text_input Game Text Input
- * The interface to use GameTextInput.
- * @{
- */
-
-#pragma once
-
-#include <android/rect.h>
-#include <jni.h>
-#include <stdint.h>
-
-#include "common/gamesdk_common.h"
-#include "gamecommon.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define GAMETEXTINPUT_MAJOR_VERSION 2
-#define GAMETEXTINPUT_MINOR_VERSION 0
-#define GAMETEXTINPUT_BUGFIX_VERSION 0
-#define GAMETEXTINPUT_PACKED_VERSION                            \
-    ANDROID_GAMESDK_PACKED_VERSION(GAMETEXTINPUT_MAJOR_VERSION, \
-                                   GAMETEXTINPUT_MINOR_VERSION, \
-                                   GAMETEXTINPUT_BUGFIX_VERSION)
-
-/**
- * This struct holds a span within a region of text from start (inclusive) to
- * end (exclusive). An empty span or cursor position is specified with
- * start==end. An undefined span is specified with start = end = SPAN_UNDEFINED.
- */
-typedef struct GameTextInputSpan {
-    /** The start of the region (inclusive). */
-    int32_t start;
-    /** The end of the region (exclusive). */
-    int32_t end;
-} GameTextInputSpan;
-
-/**
- * Values with special meaning in a GameTextInputSpan.
- */
-enum GameTextInputSpanFlag { SPAN_UNDEFINED = -1 };
-
-/**
- * This struct holds the state of an editable section of text.
- * The text can have a selection and a composing region defined on it.
- * A composing region is used by IMEs that allow input using multiple steps to
- * compose a glyph or word. Use functions GameTextInput_getState and
- * GameTextInput_setState to read and modify the state that an IME is editing.
- */
-typedef struct GameTextInputState {
-    /**
-     * Text owned by the state, as a modified UTF-8 string. Null-terminated.
-     * https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8
-     */
-    const char *text_UTF8;
-    /**
-     * Length in bytes of text_UTF8, *not* including the null at end.
-     */
-    int32_t text_length;
-    /**
-     * A selection defined on the text.
-     */
-    GameTextInputSpan selection;
-    /**
-     * A composing region defined on the text.
-     */
-    GameTextInputSpan composingRegion;
-} GameTextInputState;
-
-/**
- * A callback called by GameTextInput_getState.
- * @param context User-defined context.
- * @param state State, owned by the library, that will be valid for the duration
- * of the callback.
- */
-typedef void (*GameTextInputGetStateCallback)(
-    void *context, const struct GameTextInputState *state);
-
-/**
- * Opaque handle to the GameTextInput API.
- */
-typedef struct GameTextInput GameTextInput;
-
-/**
- * Initialize the GameTextInput library.
- * If called twice without GameTextInput_destroy being called, the same pointer
- * will be returned and a warning will be issued.
- * @param env A JNI env valid on the calling thread.
- * @param max_string_size The maximum length of a string that can be edited. If
- * zero, the maximum defaults to 65536 bytes. A buffer of this size is allocated
- * at initialization.
- * @return A handle to the library.
- */
-GameTextInput *GameTextInput_init(JNIEnv *env, uint32_t max_string_size);
-
-/**
- * When using GameTextInput, you need to create a gametextinput.InputConnection
- * on the Java side and pass it using this function to the library, unless using
- * GameActivity in which case this will be done for you. See the GameActivity
- * source code or GameTextInput samples for examples of usage.
- * @param input A valid GameTextInput library handle.
- * @param inputConnection A gametextinput.InputConnection object.
- */
-void GameTextInput_setInputConnection(GameTextInput *input,
-                                      jobject inputConnection);
-
-/**
- * Unless using GameActivity, it is required to call this function from your
- * Java gametextinput.Listener.stateChanged method to convert eventState and
- * trigger any event callbacks. When using GameActivity, this does not need to
- * be called as event processing is handled by the Activity.
- * @param input A valid GameTextInput library handle.
- * @param eventState A Java gametextinput.State object.
- */
-void GameTextInput_processEvent(GameTextInput *input, jobject eventState);
-
-/**
- * Free any resources owned by the GameTextInput library.
- * Any subsequent calls to the library will fail until GameTextInput_init is
- * called again.
- * @param input A valid GameTextInput library handle.
- */
-void GameTextInput_destroy(GameTextInput *input);
-
-/**
- * Flags to be passed to GameTextInput_showIme.
- */
-enum ShowImeFlags {
-    SHOW_IME_UNDEFINED = 0,  // Default value.
-    SHOW_IMPLICIT =
-        1,  // Indicates that the user has forced the input method open so it
-            // should not be closed until they explicitly do so.
-    SHOW_FORCED = 2  // Indicates that this is an implicit request to show the
-                     // input window, not as the result of a direct request by
-                     // the user. The window may not be shown in this case.
-};
-
-/**
- * Show the IME. Calls InputMethodManager.showSoftInput().
- * @param input A valid GameTextInput library handle.
- * @param flags Defined in ShowImeFlags above. For more information see:
- * https://developer.android.com/reference/android/view/inputmethod/InputMethodManager
- */
-void GameTextInput_showIme(GameTextInput *input, uint32_t flags);
-
-/**
- * Flags to be passed to GameTextInput_hideIme.
- */
-enum HideImeFlags {
-    HIDE_IME_UNDEFINED = 0,  // Default value.
-    HIDE_IMPLICIT_ONLY =
-        1,  // Indicates that the soft input window should only be hidden if it
-            // was not explicitly shown by the user.
-    HIDE_NOT_ALWAYS =
-        2,  // Indicates that the soft input window should normally be hidden,
-            // unless it was originally shown with SHOW_FORCED.
-};
-
-/**
- * Show the IME. Calls InputMethodManager.hideSoftInputFromWindow().
- * @param input A valid GameTextInput library handle.
- * @param flags Defined in HideImeFlags above. For more information see:
- * https://developer.android.com/reference/android/view/inputmethod/InputMethodManager
- */
-void GameTextInput_hideIme(GameTextInput *input, uint32_t flags);
-
-/**
- * Restarts the input method. Calls InputMethodManager.restartInput().
- * @param input A valid GameTextInput library handle.
- */
-void GameTextInput_restartInput(GameTextInput *input);
-
-/**
- * Call a callback with the current GameTextInput state, which may have been
- * modified by changes in the IME and calls to GameTextInput_setState. We use a
- * callback rather than returning the state in order to simplify ownership of
- * text_UTF8 strings. These strings are only valid during the calling of the
- * callback.
- * @param input A valid GameTextInput library handle.
- * @param callback A function that will be called with valid state.
- * @param context Context used by the callback.
- */
-void GameTextInput_getState(GameTextInput *input,
-                            GameTextInputGetStateCallback callback,
-                            void *context);
-
-/**
- * Set the current GameTextInput state. This state is reflected to any active
- * IME.
- * @param input A valid GameTextInput library handle.
- * @param state The state to set. Ownership is maintained by the caller and must
- * remain valid for the duration of the call.
- */
-void GameTextInput_setState(GameTextInput *input,
-                            const GameTextInputState *state);
-
-/**
- * Type of the callback needed by GameTextInput_setEventCallback that will be
- * called every time the IME state changes.
- * @param context User-defined context set in GameTextInput_setEventCallback.
- * @param current_state Current IME state, owned by the library and valid during
- * the callback.
- */
-typedef void (*GameTextInputEventCallback)(
-    void *context, const GameTextInputState *current_state);
-
-/**
- * Optionally set a callback to be called whenever the IME state changes.
- * Not necessary if you are using GameActivity, which handles these callbacks
- * for you.
- * @param input A valid GameTextInput library handle.
- * @param callback Called by the library when the IME state changes.
- * @param context Context passed as first argument to the callback.
- */
-void GameTextInput_setEventCallback(GameTextInput *input,
-                                    GameTextInputEventCallback callback,
-                                    void *context);
-
-/**
- * Type of the callback needed by GameTextInput_setImeInsetsCallback that will
- * be called every time the IME window insets change.
- * @param context User-defined context set in
- * GameTextInput_setImeWIndowInsetsCallback.
- * @param current_insets Current IME insets, owned by the library and valid
- * during the callback.
- */
-typedef void (*GameTextInputImeInsetsCallback)(void *context,
-                                               const ARect *current_insets);
-
-/**
- * Optionally set a callback to be called whenever the IME insets change.
- * Not necessary if you are using GameActivity, which handles these callbacks
- * for you.
- * @param input A valid GameTextInput library handle.
- * @param callback Called by the library when the IME insets change.
- * @param context Context passed as first argument to the callback.
- */
-void GameTextInput_setImeInsetsCallback(GameTextInput *input,
-                                        GameTextInputImeInsetsCallback callback,
-                                        void *context);
-
-/**
- * Get the current window insets for the IME.
- * @param input A valid GameTextInput library handle.
- * @param insets Filled with the current insets by this function.
- */
-void GameTextInput_getImeInsets(const GameTextInput *input, ARect *insets);
-
-/**
- * Unless using GameActivity, it is required to call this function from your
- * Java gametextinput.Listener.onImeInsetsChanged method to
- * trigger any event callbacks. When using GameActivity, this does not need to
- * be called as insets processing is handled by the Activity.
- * @param input A valid GameTextInput library handle.
- * @param eventState A Java gametextinput.State object.
- */
-void GameTextInput_processImeInsets(GameTextInput *input, const ARect *insets);
-
-/**
- * Convert a GameTextInputState struct to a Java gametextinput.State object.
- * Don't forget to delete the returned Java local ref when you're done.
- * @param input A valid GameTextInput library handle.
- * @param state Input state to convert.
- * @return A Java object of class gametextinput.State. The caller is required to
- * delete this local reference.
- */
-jobject GameTextInputState_toJava(const GameTextInput *input,
-                                  const GameTextInputState *state);
-
-/**
- * Convert from a Java gametextinput.State object into a C GameTextInputState
- * struct.
- * @param input A valid GameTextInput library handle.
- * @param state A Java gametextinput.State object.
- * @param callback A function called with the C struct, valid for the duration
- * of the call.
- * @param context Context passed to the callback.
- */
-void GameTextInputState_fromJava(const GameTextInput *input, jobject state,
-                                 GameTextInputGetStateCallback callback,
-                                 void *context);
-
-#ifdef __cplusplus
-}
-#endif
-
-/** @} */

From 49f2b864247c887b4f894ecef1372e74c5975ff6 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Thu, 13 Mar 2025 17:28:19 -0700
Subject: [PATCH 76/93] switch to android-game-sdk-rs grafted repo at v2.0.2

Also includes our patches on top (branch android-activity-2.0.2). This
is mainly to test to make sure everything is still working. We will
switch to the android-activity-4.0.0 branch when we're done

Signed-off-by: William Casarin <jb55@jb55.com>
---
 android-activity/android-games-sdk/README.md  |   40 +
 android-activity/android-games-sdk/copy-files |   57 +
 .../android-games-sdk/file_list.txt           |   11 +
 .../include/game-activity/GameActivity.cpp    | 1147 +++++++++++++++++
 .../include/game-activity/GameActivity.h      |  636 +++++++++
 .../game-activity/GameActivityEvents.cpp      |  414 ++++++
 .../game-activity/GameActivityEvents.h        |  336 +++++
 .../include/game-activity/GameActivityLog.h   |  109 ++
 .../native_app_glue/android_native_app_glue.c |  732 +++++++++++
 .../native_app_glue/android_native_app_glue.h |  507 ++++++++
 .../include/game-text-input/gamecommon.h      |   41 +
 .../include/game-text-input/gametextinput.cpp |  377 ++++++
 .../include/game-text-input/gametextinput.h   |  305 +++++
 .../include/common/gamesdk_common.h           |   41 +
 android-activity/build.rs                     |   31 +-
 15 files changed, 4773 insertions(+), 11 deletions(-)
 create mode 100644 android-activity/android-games-sdk/README.md
 create mode 100755 android-activity/android-games-sdk/copy-files
 create mode 100644 android-activity/android-games-sdk/file_list.txt
 create mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.cpp
 create mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.h
 create mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.cpp
 create mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.h
 create mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityLog.h
 create mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.c
 create mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h
 create mode 100644 android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gamecommon.h
 create mode 100644 android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.cpp
 create mode 100644 android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h
 create mode 100644 android-activity/android-games-sdk/include/common/gamesdk_common.h

diff --git a/android-activity/android-games-sdk/README.md b/android-activity/android-games-sdk/README.md
new file mode 100644
index 0000000..bfe6452
--- /dev/null
+++ b/android-activity/android-games-sdk/README.md
@@ -0,0 +1,40 @@
+# android-games-sdk-rs
+
+This is a grafted version of [android-games-sdk-rs][agdk].
+
+The purpose of android-games-sdk-rs is to track our patches on top of the Android Game Development Kit (AGDK) so that it is easier to update to new upstream versions.
+
+## Updating to new agdk version checklist
+
+This is a basic checklist for things that need to be done before updating to a new agdk version:
+
+- [ ] Ensure all patches applied to the local repo have been backported (see section below on backporting patches)
+- [ ] Rebase patches on top of a new *release* version of agdk. If you're not sure which version you should be rebasing on, open an issue.
+- [ ] Copy any new files over from the new version using the [copy_files](./copy_files) script (see section below on copying files)
+- [ ] Update [build.rs](../build.rs) with any new includes and src files
+- [ ] Regenerate ffi bindings using [generate_bindings.sh](./generate_bindings.sh)
+
+## Backporting patches
+
+Changes made to these files must be backported to [android-games-sdk-rs][agdk], otherwise they will be lost when updating to newer upstream versions. This can be done like so (running from the project root):
+
+```bash
+git format-patch -o ~/agdk-patches last-import.. -- android-activity/android-games-sdk
+```
+
+When applying on the [android-games-sdk-rs][agdk] side:
+
+```bash
+git checkout android-activity-4.0.0
+git am -p3 ~/agdk-patches/*.patch
+```
+
+Once these are applied on top of the current imported agdk version (in this example 4.0.0). Then they can be rebased onto future agdk versions easily.
+
+## Copying files from agdk
+
+When updating to a new version of upstream agdk properly, you can use the [copy_files](./copy_files) script.
+
+This script takes in a list of files from [file_list.txt](./file_list.txt), and grafts those files into the local directory. This ensures that pathes are aligned so that patching is easier.
+
+[agdk]: https://github.com/rust-mobile/android-games-sdk-rs
diff --git a/android-activity/android-games-sdk/copy-files b/android-activity/android-games-sdk/copy-files
new file mode 100755
index 0000000..5e21578
--- /dev/null
+++ b/android-activity/android-games-sdk/copy-files
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+# Copies files from android-games-sdk-rs so that we don't have to use
+# it has a submodule (see https://github.com/rust-mobile/android-activity/issues/190)
+
+# Usage: ./copy_files source_dir dest_dir file_list.txt
+# file_list.txt should contain one filename or path pattern per line
+
+# Check if correct number of arguments
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <android-games-sdk-rs dir>"
+    exit 1
+fi
+
+SOURCE_DIR="$1"
+DEST_DIR="${2:-.}"
+FILE_LIST="${3:-file_list.txt}"
+
+# Check if source directory exists
+if [ ! -d "$SOURCE_DIR" ]; then
+    echo "Error: Source directory '$SOURCE_DIR' does not exist."
+    exit 1
+fi
+
+# Check if file list exists
+if [ ! -f "$FILE_LIST" ]; then
+    echo "Error: File list '$FILE_LIST' does not exist."
+    exit 1
+fi
+
+# Create destination directory if it doesn't exist
+mkdir -p "$DEST_DIR"
+
+# Read file list and copy each file
+while IFS= read -r file || [ -n "$file" ]; do
+    # Skip empty lines and comments
+    if [ -z "$file" ] || [[ "$file" =~ ^# ]]; then
+	continue
+    fi
+
+    # Find matching files
+    find "$SOURCE_DIR" -name "$file" -type f | while read -r file; do
+	# Get the relative path
+	rel_path="${file#$SOURCE_DIR/}"
+	dest_file="$DEST_DIR/$rel_path"
+	dest_dir=$(dirname "$dest_file")
+
+	# Create destination directory structure
+	mkdir -p "$dest_dir"
+
+	# Copy the file
+	cp "$file" "$dest_file"
+	echo "Copied: $rel_path"
+    done
+done < "$FILE_LIST"
+
+echo "Copy operation completed."
diff --git a/android-activity/android-games-sdk/file_list.txt b/android-activity/android-games-sdk/file_list.txt
new file mode 100644
index 0000000..503ef41
--- /dev/null
+++ b/android-activity/android-games-sdk/file_list.txt
@@ -0,0 +1,11 @@
+GameActivity.h
+GameActivity.cpp
+GameActivityEvents.h
+GameActivityEvents.cpp
+GameActivityLog.h
+gametextinput.cpp
+gametextinput.h
+gamecommon.h
+gamesdk_common.h
+android_native_app_glue.h
+android_native_app_glue.c
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.cpp b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.cpp
new file mode 100644
index 0000000..4dbc9e8
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.cpp
@@ -0,0 +1,1147 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "GameActivity.h"
+
+#include <android/api-level.h>
+#include <android/asset_manager.h>
+#include <android/asset_manager_jni.h>
+#include <android/log.h>
+#include <android/looper.h>
+#include <android/native_window.h>
+#include <android/native_window_jni.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <jni.h>
+#include <poll.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/system_properties.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <memory>
+#include <mutex>
+#include <string>
+
+#include "GameActivityLog.h"
+
+namespace {
+
+struct OwnedGameTextInputState {
+    OwnedGameTextInputState &operator=(const GameTextInputState &rhs) {
+        inner = rhs;
+        owned_string = std::string(rhs.text_UTF8, rhs.text_length);
+        inner.text_UTF8 = owned_string.data();
+        return *this;
+    }
+    GameTextInputState inner;
+    std::string owned_string;
+};
+
+}  // anonymous namespace
+
+#ifndef NELEM
+#define NELEM(x) ((int)(sizeof(x) / sizeof((x)[0])))
+#endif
+
+/*
+ * JNI methods of the GameActivity Java class.
+ */
+static struct {
+    jmethodID finish;
+    jmethodID setWindowFlags;
+    jmethodID getWindowInsets;
+    jmethodID getWaterfallInsets;
+    jmethodID setImeEditorInfoFields;
+} gGameActivityClassInfo;
+
+/*
+ * JNI fields of the androidx.core.graphics.Insets Java class.
+ */
+static struct {
+    jfieldID left;
+    jfieldID right;
+    jfieldID top;
+    jfieldID bottom;
+} gInsetsClassInfo;
+
+/*
+ * JNI fields of the Configuration Java class.
+ */
+static struct ConfigurationClassInfo {
+    jfieldID colorMode;
+    jfieldID densityDpi;
+    jfieldID fontScale;
+    jfieldID fontWeightAdjustment;
+    jfieldID hardKeyboardHidden;
+    jfieldID keyboard;
+    jfieldID keyboardHidden;
+    jfieldID mcc;
+    jfieldID mnc;
+    jfieldID navigation;
+    jfieldID navigationHidden;
+    jfieldID orientation;
+    jfieldID screenHeightDp;
+    jfieldID screenLayout;
+    jfieldID screenWidthDp;
+    jfieldID smallestScreenWidthDp;
+    jfieldID touchscreen;
+    jfieldID uiMode;
+} gConfigurationClassInfo;
+
+/*
+ * JNI methods of the WindowInsetsCompat.Type Java class.
+ */
+static struct {
+    jmethodID methods[GAMECOMMON_INSETS_TYPE_COUNT];
+    jclass clazz;
+} gWindowInsetsCompatTypeClassInfo;
+
+/*
+ * Contains a command to be executed by the GameActivity
+ * on the application main thread.
+ */
+struct ActivityWork {
+    int32_t cmd;
+    int64_t arg1;
+    int64_t arg2;
+    int64_t arg3;
+};
+
+/*
+ * The type of commands that can be passed to the GameActivity and that
+ * are executed on the application main thread.
+ */
+enum {
+    CMD_FINISH = 1,
+    CMD_SET_WINDOW_FORMAT,
+    CMD_SET_WINDOW_FLAGS,
+    CMD_SHOW_SOFT_INPUT,
+    CMD_HIDE_SOFT_INPUT,
+    CMD_SET_SOFT_INPUT_STATE,
+    CMD_SET_IME_EDITOR_INFO
+};
+
+/*
+ * Last known Configuration values. They may be accessed from the different
+ * thread, this is why they are made atomic.
+ */
+static struct Configuration {
+    std::atomic_int colorMode;
+    std::atomic_int densityDpi;
+    std::atomic<float> fontScale;
+    std::atomic_int fontWeightAdjustment;
+    std::atomic_int hardKeyboardHidden;
+    std::atomic_int keyboard;
+    std::atomic_int keyboardHidden;
+    std::atomic_int mcc;
+    std::atomic_int mnc;
+    std::atomic_int navigation;
+    std::atomic_int navigationHidden;
+    std::atomic_int orientation;
+    std::atomic_int screenHeightDp;
+    std::atomic_int screenLayout;
+    std::atomic_int screenWidthDp;
+    std::atomic_int smallestScreenWidthDp;
+    std::atomic_int touchscreen;
+    std::atomic_int uiMode;
+} gConfiguration;
+
+/*
+ * Write a command to be executed by the GameActivity on the application main
+ * thread.
+ */
+static void write_work(int fd, int32_t cmd, int64_t arg1 = 0, int64_t arg2 = 0,
+                       int64_t arg3 = 0) {
+    ActivityWork work;
+    work.cmd = cmd;
+    work.arg1 = arg1;
+    work.arg2 = arg2;
+    work.arg3 = arg3;
+
+    LOG_TRACE("write_work: cmd=%d", cmd);
+restart:
+    int res = write(fd, &work, sizeof(work));
+    if (res < 0 && errno == EINTR) {
+        goto restart;
+    }
+
+    if (res == sizeof(work)) return;
+
+    if (res < 0) {
+        ALOGW("Failed writing to work fd: %s", strerror(errno));
+    } else {
+        ALOGW("Truncated writing to work fd: %d", res);
+    }
+}
+
+/*
+ * Read commands to be executed by the GameActivity on the application main
+ * thread.
+ */
+static bool read_work(int fd, ActivityWork *outWork) {
+    int res = read(fd, outWork, sizeof(ActivityWork));
+    // no need to worry about EINTR, poll loop will just come back again.
+    if (res == sizeof(ActivityWork)) return true;
+
+    if (res < 0) {
+        ALOGW("Failed reading work fd: %s", strerror(errno));
+    } else {
+        ALOGW("Truncated reading work fd: %d", res);
+    }
+    return false;
+}
+
+/*
+ * Native state for interacting with the GameActivity class.
+ */
+struct NativeCode : public GameActivity {
+    NativeCode() {
+        memset((GameActivity *)this, 0, sizeof(GameActivity));
+        memset(&callbacks, 0, sizeof(callbacks));
+        memset(&insetsState, 0, sizeof(insetsState));
+        nativeWindow = NULL;
+        mainWorkRead = mainWorkWrite = -1;
+        gameTextInput = NULL;
+    }
+
+    ~NativeCode() {
+        if (callbacks.onDestroy != NULL) {
+            callbacks.onDestroy(this);
+        }
+        if (env != NULL) {
+            if (javaGameActivity != NULL) {
+                env->DeleteGlobalRef(javaGameActivity);
+            }
+            if (javaAssetManager != NULL) {
+                env->DeleteGlobalRef(javaAssetManager);
+            }
+        }
+        GameTextInput_destroy(gameTextInput);
+        if (looper != NULL && mainWorkRead >= 0) {
+            ALooper_removeFd(looper, mainWorkRead);
+        }
+        ALooper_release(looper);
+        looper = NULL;
+
+        setSurface(NULL);
+        if (mainWorkRead >= 0) close(mainWorkRead);
+        if (mainWorkWrite >= 0) close(mainWorkWrite);
+    }
+
+    void setSurface(jobject _surface) {
+        if (nativeWindow != NULL) {
+            ANativeWindow_release(nativeWindow);
+        }
+        if (_surface != NULL) {
+            nativeWindow = ANativeWindow_fromSurface(env, _surface);
+        } else {
+            nativeWindow = NULL;
+        }
+    }
+
+    GameActivityCallbacks callbacks;
+
+    std::string internalDataPathObj;
+    std::string externalDataPathObj;
+    std::string obbPathObj;
+
+    ANativeWindow *nativeWindow;
+    int32_t lastWindowWidth;
+    int32_t lastWindowHeight;
+
+    // These are used to wake up the main thread to process work.
+    int mainWorkRead;
+    int mainWorkWrite;
+    ALooper *looper;
+
+    // Need to hold on to a reference here in case the upper layers destroy our
+    // AssetManager.
+    jobject javaAssetManager;
+
+    GameTextInput *gameTextInput;
+    // Set by users in GameActivity_setTextInputState, then passed to
+    // GameTextInput.
+    OwnedGameTextInputState gameTextInputState;
+    std::mutex gameTextInputStateMutex;
+
+    ARect insetsState[GAMECOMMON_INSETS_TYPE_COUNT];
+};
+
+static void readConfigurationValues(NativeCode *code, jobject javaConfig);
+
+extern "C" void GameActivity_finish(GameActivity *activity) {
+    NativeCode *code = static_cast<NativeCode *>(activity);
+    write_work(code->mainWorkWrite, CMD_FINISH, 0);
+}
+
+extern "C" void GameActivity_setWindowFlags(GameActivity *activity,
+                                            uint32_t values, uint32_t mask) {
+    NativeCode *code = static_cast<NativeCode *>(activity);
+    write_work(code->mainWorkWrite, CMD_SET_WINDOW_FLAGS, values, mask);
+}
+
+extern "C" void GameActivity_showSoftInput(GameActivity *activity,
+                                           uint32_t flags) {
+    NativeCode *code = static_cast<NativeCode *>(activity);
+    write_work(code->mainWorkWrite, CMD_SHOW_SOFT_INPUT, flags);
+}
+
+extern "C" void GameActivity_setTextInputState(
+    GameActivity *activity, const GameTextInputState *state) {
+    NativeCode *code = static_cast<NativeCode *>(activity);
+    std::lock_guard<std::mutex> lock(code->gameTextInputStateMutex);
+    code->gameTextInputState = *state;
+    write_work(code->mainWorkWrite, CMD_SET_SOFT_INPUT_STATE);
+}
+
+extern "C" void GameActivity_getTextInputState(
+    GameActivity *activity, GameTextInputGetStateCallback callback,
+    void *context) {
+    NativeCode *code = static_cast<NativeCode *>(activity);
+    return GameTextInput_getState(code->gameTextInput, callback, context);
+}
+
+extern "C" void GameActivity_hideSoftInput(GameActivity *activity,
+                                           uint32_t flags) {
+    NativeCode *code = static_cast<NativeCode *>(activity);
+    write_work(code->mainWorkWrite, CMD_HIDE_SOFT_INPUT, flags);
+}
+
+extern "C" void GameActivity_getWindowInsets(GameActivity *activity,
+                                             GameCommonInsetsType type,
+                                             ARect *insets) {
+    if (type < 0 || type >= GAMECOMMON_INSETS_TYPE_COUNT) return;
+    NativeCode *code = static_cast<NativeCode *>(activity);
+    *insets = code->insetsState[type];
+}
+
+extern "C" GameTextInput *GameActivity_getTextInput(
+    const GameActivity *activity) {
+    const NativeCode *code = static_cast<const NativeCode *>(activity);
+    return code->gameTextInput;
+}
+
+/*
+ * Log the JNI exception, if any.
+ */
+static void checkAndClearException(JNIEnv *env, const char *methodName) {
+    if (env->ExceptionCheck()) {
+        ALOGE("Exception while running %s", methodName);
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+    }
+}
+
+/*
+ * Callback for handling native events on the application's main thread.
+ */
+static int mainWorkCallback(int fd, int events, void *data) {
+    ALOGD("************** mainWorkCallback *********");
+    NativeCode *code = (NativeCode *)data;
+    if ((events & POLLIN) == 0) {
+        return 1;
+    }
+
+    ActivityWork work;
+    if (!read_work(code->mainWorkRead, &work)) {
+        return 1;
+    }
+    LOG_TRACE("mainWorkCallback: cmd=%d", work.cmd);
+    switch (work.cmd) {
+        case CMD_FINISH: {
+            code->env->CallVoidMethod(code->javaGameActivity,
+                                      gGameActivityClassInfo.finish);
+            checkAndClearException(code->env, "finish");
+        } break;
+        case CMD_SET_WINDOW_FLAGS: {
+            code->env->CallVoidMethod(code->javaGameActivity,
+                                      gGameActivityClassInfo.setWindowFlags,
+                                      work.arg1, work.arg2);
+            checkAndClearException(code->env, "setWindowFlags");
+        } break;
+        case CMD_SHOW_SOFT_INPUT: {
+            GameTextInput_showIme(code->gameTextInput, work.arg1);
+        } break;
+        case CMD_SET_SOFT_INPUT_STATE: {
+            std::lock_guard<std::mutex> lock(code->gameTextInputStateMutex);
+            GameTextInput_setState(code->gameTextInput,
+                                   &code->gameTextInputState.inner);
+            checkAndClearException(code->env, "setTextInputState");
+        } break;
+        case CMD_HIDE_SOFT_INPUT: {
+            GameTextInput_hideIme(code->gameTextInput, work.arg1);
+        } break;
+        case CMD_SET_IME_EDITOR_INFO: {
+            code->env->CallVoidMethod(
+                code->javaGameActivity,
+                gGameActivityClassInfo.setImeEditorInfoFields, work.arg1,
+                work.arg2, work.arg3);
+            checkAndClearException(code->env, "setImeEditorInfo");
+        } break;
+        default:
+            ALOGW("Unknown work command: %d", work.cmd);
+            break;
+    }
+
+    return 1;
+}
+
+// ------------------------------------------------------------------------
+static thread_local std::string g_error_msg;
+
+static jlong initializeNativeCode_native(
+    JNIEnv *env, jobject javaGameActivity, jstring internalDataDir,
+    jstring obbDir, jstring externalDataDir, jobject jAssetMgr,
+    jbyteArray savedState, jobject javaConfig) {
+    LOG_TRACE("initializeNativeCode_native");
+    NativeCode *code = NULL;
+
+    code = new NativeCode();
+
+    code->looper = ALooper_forThread();
+    if (code->looper == nullptr) {
+        g_error_msg = "Unable to retrieve native ALooper";
+        ALOGW("%s", g_error_msg.c_str());
+        delete code;
+        return 0;
+    }
+    ALooper_acquire(code->looper);
+
+    int msgpipe[2];
+    if (pipe(msgpipe)) {
+        g_error_msg = "could not create pipe: ";
+        g_error_msg += strerror(errno);
+
+        ALOGW("%s", g_error_msg.c_str());
+        delete code;
+        return 0;
+    }
+    code->mainWorkRead = msgpipe[0];
+    code->mainWorkWrite = msgpipe[1];
+    int result = fcntl(code->mainWorkRead, F_SETFL, O_NONBLOCK);
+    SLOGW_IF(result != 0,
+             "Could not make main work read pipe "
+             "non-blocking: %s",
+             strerror(errno));
+    result = fcntl(code->mainWorkWrite, F_SETFL, O_NONBLOCK);
+    SLOGW_IF(result != 0,
+             "Could not make main work write pipe "
+             "non-blocking: %s",
+             strerror(errno));
+    ALooper_addFd(code->looper, code->mainWorkRead, 0, ALOOPER_EVENT_INPUT,
+                  mainWorkCallback, code);
+
+    code->GameActivity::callbacks = &code->callbacks;
+    if (env->GetJavaVM(&code->vm) < 0) {
+        ALOGW("GameActivity GetJavaVM failed");
+        delete code;
+        return 0;
+    }
+    code->env = env;
+    code->javaGameActivity = env->NewGlobalRef(javaGameActivity);
+
+    const char *dirStr =
+        internalDataDir ? env->GetStringUTFChars(internalDataDir, NULL) : "";
+    code->internalDataPathObj = dirStr;
+    code->internalDataPath = code->internalDataPathObj.c_str();
+    if (internalDataDir) env->ReleaseStringUTFChars(internalDataDir, dirStr);
+
+    dirStr =
+        externalDataDir ? env->GetStringUTFChars(externalDataDir, NULL) : "";
+    code->externalDataPathObj = dirStr;
+    code->externalDataPath = code->externalDataPathObj.c_str();
+    if (externalDataDir) env->ReleaseStringUTFChars(externalDataDir, dirStr);
+
+    code->javaAssetManager = env->NewGlobalRef(jAssetMgr);
+    code->assetManager = AAssetManager_fromJava(env, jAssetMgr);
+
+    dirStr = obbDir ? env->GetStringUTFChars(obbDir, NULL) : "";
+    code->obbPathObj = dirStr;
+    code->obbPath = code->obbPathObj.c_str();
+    if (obbDir) env->ReleaseStringUTFChars(obbDir, dirStr);
+
+    jbyte *rawSavedState = NULL;
+    jsize rawSavedSize = 0;
+    if (savedState != NULL) {
+        rawSavedState = env->GetByteArrayElements(savedState, NULL);
+        rawSavedSize = env->GetArrayLength(savedState);
+    }
+
+    readConfigurationValues(code, javaConfig);
+
+    GameActivity_onCreate_C(code, rawSavedState, rawSavedSize);
+
+    code->gameTextInput = GameTextInput_init(env, 0);
+    GameTextInput_setEventCallback(code->gameTextInput,
+                                   reinterpret_cast<GameTextInputEventCallback>(
+                                       code->callbacks.onTextInputEvent),
+                                   code);
+
+    if (rawSavedState != NULL) {
+        env->ReleaseByteArrayElements(savedState, rawSavedState, 0);
+    }
+
+    return reinterpret_cast<jlong>(code);
+}
+
+static jstring getDlError_native(JNIEnv *env, jobject javaGameActivity) {
+    jstring result = env->NewStringUTF(g_error_msg.c_str());
+    g_error_msg.clear();
+    return result;
+}
+
+static void terminateNativeCode_native(JNIEnv *env, jobject javaGameActivity,
+                                    jlong handle) {
+    LOG_TRACE("terminateNativeCode_native");
+    if (handle != 0) {
+        NativeCode *code = (NativeCode *)handle;
+        delete code;
+    }
+}
+
+static void onStart_native(JNIEnv *env, jobject javaGameActivity,
+                           jlong handle) {
+    ALOGV("onStart_native");
+    if (handle != 0) {
+        NativeCode *code = (NativeCode *)handle;
+        if (code->callbacks.onStart != NULL) {
+            code->callbacks.onStart(code);
+        }
+    }
+}
+
+static void onResume_native(JNIEnv *env, jobject javaGameActivity,
+                            jlong handle) {
+    LOG_TRACE("onResume_native");
+    if (handle != 0) {
+        NativeCode *code = (NativeCode *)handle;
+        if (code->callbacks.onResume != NULL) {
+            code->callbacks.onResume(code);
+        }
+    }
+}
+
+struct SaveInstanceLocals {
+    JNIEnv *env;
+    jbyteArray array;
+};
+
+static jbyteArray onSaveInstanceState_native(JNIEnv *env,
+                                             jobject javaGameActivity,
+                                             jlong handle) {
+    LOG_TRACE("onSaveInstanceState_native");
+
+    SaveInstanceLocals locals{
+        env, NULL};  // Passed through the user's state prep function.
+
+    if (handle != 0) {
+        NativeCode *code = (NativeCode *)handle;
+        if (code->callbacks.onSaveInstanceState != NULL) {
+            code->callbacks.onSaveInstanceState(
+                code,
+                [](const char *bytes, int len, void *context) {
+                    auto locals = static_cast<SaveInstanceLocals *>(context);
+                    if (len > 0) {
+                        locals->array = locals->env->NewByteArray(len);
+                        if (locals->array != NULL) {
+                            locals->env->SetByteArrayRegion(
+                                locals->array, 0, len, (const jbyte *)bytes);
+                        }
+                    }
+                },
+                &locals);
+        }
+    }
+    return locals.array;
+}
+
+static void onPause_native(JNIEnv *env, jobject javaGameActivity,
+                           jlong handle) {
+    LOG_TRACE("onPause_native");
+    if (handle != 0) {
+        NativeCode *code = (NativeCode *)handle;
+        if (code->callbacks.onPause != NULL) {
+            code->callbacks.onPause(code);
+        }
+    }
+}
+
+static void onStop_native(JNIEnv *env, jobject javaGameActivity, jlong handle) {
+    LOG_TRACE("onStop_native");
+    if (handle != 0) {
+        NativeCode *code = (NativeCode *)handle;
+        if (code->callbacks.onStop != NULL) {
+            code->callbacks.onStop(code);
+        }
+    }
+}
+
+static void readConfigurationValues(NativeCode *code, jobject javaConfig) {
+    if (gConfigurationClassInfo.colorMode != NULL) {
+        gConfiguration.colorMode = code->env->GetIntField(
+            javaConfig, gConfigurationClassInfo.colorMode);
+    }
+
+    gConfiguration.densityDpi =
+        code->env->GetIntField(javaConfig, gConfigurationClassInfo.densityDpi);
+    gConfiguration.fontScale =
+        code->env->GetFloatField(javaConfig, gConfigurationClassInfo.fontScale);
+
+    if (gConfigurationClassInfo.fontWeightAdjustment != NULL) {
+        gConfiguration.fontWeightAdjustment = code->env->GetIntField(
+            javaConfig, gConfigurationClassInfo.fontWeightAdjustment);
+    }
+
+    gConfiguration.hardKeyboardHidden = code->env->GetIntField(
+        javaConfig, gConfigurationClassInfo.hardKeyboardHidden);
+    gConfiguration.mcc =
+        code->env->GetIntField(javaConfig, gConfigurationClassInfo.mcc);
+    gConfiguration.mnc =
+        code->env->GetIntField(javaConfig, gConfigurationClassInfo.mnc);
+    gConfiguration.navigation =
+        code->env->GetIntField(javaConfig, gConfigurationClassInfo.navigation);
+    gConfiguration.navigationHidden = code->env->GetIntField(
+        javaConfig, gConfigurationClassInfo.navigationHidden);
+    gConfiguration.orientation =
+        code->env->GetIntField(javaConfig, gConfigurationClassInfo.orientation);
+    gConfiguration.screenHeightDp = code->env->GetIntField(
+        javaConfig, gConfigurationClassInfo.screenHeightDp);
+    gConfiguration.screenLayout = code->env->GetIntField(
+        javaConfig, gConfigurationClassInfo.screenLayout);
+    gConfiguration.screenWidthDp = code->env->GetIntField(
+        javaConfig, gConfigurationClassInfo.screenWidthDp);
+    gConfiguration.smallestScreenWidthDp = code->env->GetIntField(
+        javaConfig, gConfigurationClassInfo.smallestScreenWidthDp);
+    gConfiguration.touchscreen =
+        code->env->GetIntField(javaConfig, gConfigurationClassInfo.touchscreen);
+    gConfiguration.uiMode =
+        code->env->GetIntField(javaConfig, gConfigurationClassInfo.uiMode);
+
+    checkAndClearException(code->env, "Configuration.get");
+}
+
+static void onConfigurationChanged_native(JNIEnv *env, jobject javaGameActivity,
+                                          jlong handle, jobject javaNewConfig) {
+    LOG_TRACE("onConfigurationChanged_native");
+    if (handle != 0) {
+        NativeCode *code = (NativeCode *)handle;
+        readConfigurationValues(code, javaNewConfig);
+
+        if (code->callbacks.onConfigurationChanged != NULL) {
+            code->callbacks.onConfigurationChanged(code);
+        }
+    }
+}
+
+static void onTrimMemory_native(JNIEnv *env, jobject javaGameActivity,
+                                jlong handle, jint level) {
+    LOG_TRACE("onTrimMemory_native");
+    if (handle != 0) {
+        NativeCode *code = (NativeCode *)handle;
+        if (code->callbacks.onTrimMemory != NULL) {
+            code->callbacks.onTrimMemory(code, level);
+        }
+    }
+}
+
+static void onWindowFocusChanged_native(JNIEnv *env, jobject javaGameActivity,
+                                        jlong handle, jboolean focused) {
+    LOG_TRACE("onWindowFocusChanged_native");
+    if (handle != 0) {
+        NativeCode *code = (NativeCode *)handle;
+        if (code->callbacks.onWindowFocusChanged != NULL) {
+            code->callbacks.onWindowFocusChanged(code, focused ? 1 : 0);
+        }
+    }
+}
+
+static void onSurfaceCreated_native(JNIEnv *env, jobject javaGameActivity,
+                                    jlong handle, jobject surface) {
+    ALOGV("onSurfaceCreated_native");
+    LOG_TRACE("onSurfaceCreated_native");
+    if (handle != 0) {
+        NativeCode *code = (NativeCode *)handle;
+        code->setSurface(surface);
+
+        if (code->nativeWindow != NULL &&
+            code->callbacks.onNativeWindowCreated != NULL) {
+            code->callbacks.onNativeWindowCreated(code, code->nativeWindow);
+        }
+    }
+}
+
+static void onSurfaceChanged_native(JNIEnv *env, jobject javaGameActivity,
+                                    jlong handle, jobject surface, jint format,
+                                    jint width, jint height) {
+    LOG_TRACE("onSurfaceChanged_native");
+    if (handle != 0) {
+        NativeCode *code = (NativeCode *)handle;
+        ANativeWindow *oldNativeWindow = code->nativeWindow;
+        // Fix for window being destroyed behind the scenes on older Android
+        // versions.
+        if (oldNativeWindow != NULL) {
+            ANativeWindow_acquire(oldNativeWindow);
+        }
+        code->setSurface(surface);
+        if (oldNativeWindow != code->nativeWindow) {
+            if (oldNativeWindow != NULL &&
+                code->callbacks.onNativeWindowDestroyed != NULL) {
+                code->callbacks.onNativeWindowDestroyed(code, oldNativeWindow);
+            }
+            if (code->nativeWindow != NULL) {
+                if (code->callbacks.onNativeWindowCreated != NULL) {
+                    code->callbacks.onNativeWindowCreated(code,
+                                                          code->nativeWindow);
+                }
+
+                code->lastWindowWidth =
+                    ANativeWindow_getWidth(code->nativeWindow);
+                code->lastWindowHeight =
+                    ANativeWindow_getHeight(code->nativeWindow);
+            }
+        } else {
+            // Maybe it was resized?
+            int32_t newWidth = ANativeWindow_getWidth(code->nativeWindow);
+            int32_t newHeight = ANativeWindow_getHeight(code->nativeWindow);
+
+            if (newWidth != code->lastWindowWidth ||
+                newHeight != code->lastWindowHeight) {
+                code->lastWindowWidth = newWidth;
+                code->lastWindowHeight = newHeight;
+
+                if (code->callbacks.onNativeWindowResized != NULL) {
+                    code->callbacks.onNativeWindowResized(
+                        code, code->nativeWindow, newWidth, newHeight);
+                }
+            }
+        }
+        // Release the window we acquired earlier.
+        if (oldNativeWindow != NULL) {
+            ANativeWindow_release(oldNativeWindow);
+        }
+    }
+}
+
+static void onSurfaceRedrawNeeded_native(JNIEnv *env, jobject javaGameActivity,
+                                         jlong handle) {
+    LOG_TRACE("onSurfaceRedrawNeeded_native");
+    if (handle != 0) {
+        NativeCode *code = (NativeCode *)handle;
+        if (code->nativeWindow != NULL &&
+            code->callbacks.onNativeWindowRedrawNeeded != NULL) {
+            code->callbacks.onNativeWindowRedrawNeeded(code,
+                                                       code->nativeWindow);
+        }
+    }
+}
+
+static void onSurfaceDestroyed_native(JNIEnv *env, jobject javaGameActivity,
+                                      jlong handle) {
+    LOG_TRACE("onSurfaceDestroyed_native");
+    if (handle != 0) {
+        NativeCode *code = (NativeCode *)handle;
+        if (code->nativeWindow != NULL &&
+            code->callbacks.onNativeWindowDestroyed != NULL) {
+            code->callbacks.onNativeWindowDestroyed(code, code->nativeWindow);
+        }
+        code->setSurface(NULL);
+    }
+}
+
+extern "C" void GameActivity_setImeEditorInfo(GameActivity *activity,
+                                              int inputType, int actionId,
+                                              int imeOptions) {
+    NativeCode *code = static_cast<NativeCode *>(activity);
+    write_work(code->mainWorkWrite, CMD_SET_IME_EDITOR_INFO, inputType,
+               actionId, imeOptions);
+}
+
+extern "C" int GameActivity_getColorMode(GameActivity *) {
+    return gConfiguration.colorMode;
+}
+
+extern "C" int GameActivity_getDensityDpi(GameActivity *) {
+    return gConfiguration.densityDpi;
+}
+
+extern "C" float GameActivity_getFontScale(GameActivity *) {
+    return gConfiguration.fontScale;
+}
+
+extern "C" int GameActivity_getFontWeightAdjustment(GameActivity *) {
+    return gConfiguration.fontWeightAdjustment;
+}
+
+extern "C" int GameActivity_getHardKeyboardHidden(GameActivity *) {
+    return gConfiguration.hardKeyboardHidden;
+}
+
+extern "C" int GameActivity_getKeyboard(GameActivity *) {
+    return gConfiguration.keyboard;
+}
+
+extern "C" int GameActivity_getKeyboardHidden(GameActivity *) {
+    return gConfiguration.keyboardHidden;
+}
+
+extern "C" int GameActivity_getMcc(GameActivity *) {
+    return gConfiguration.mcc;
+}
+
+extern "C" int GameActivity_getMnc(GameActivity *) {
+    return gConfiguration.mnc;
+}
+
+extern "C" int GameActivity_getNavigation(GameActivity *) {
+    return gConfiguration.navigation;
+}
+
+extern "C" int GameActivity_getNavigationHidden(GameActivity *) {
+    return gConfiguration.navigationHidden;
+}
+
+extern "C" int GameActivity_getOrientation(GameActivity *) {
+    return gConfiguration.orientation;
+}
+
+extern "C" int GameActivity_getScreenHeightDp(GameActivity *) {
+    return gConfiguration.screenHeightDp;
+}
+
+extern "C" int GameActivity_getScreenLayout(GameActivity *) {
+    return gConfiguration.screenLayout;
+}
+
+extern "C" int GameActivity_getScreenWidthDp(GameActivity *) {
+    return gConfiguration.screenWidthDp;
+}
+
+extern "C" int GameActivity_getSmallestScreenWidthDp(GameActivity *) {
+    return gConfiguration.smallestScreenWidthDp;
+}
+
+extern "C" int GameActivity_getTouchscreen(GameActivity *) {
+    return gConfiguration.touchscreen;
+}
+
+extern "C" int GameActivity_getUIMode(GameActivity *) {
+    return gConfiguration.uiMode;
+}
+
+static bool onTouchEvent_native(JNIEnv *env, jobject javaGameActivity,
+                                jlong handle, jobject motionEvent) {
+    if (handle == 0) return false;
+    NativeCode *code = (NativeCode *)handle;
+    if (code->callbacks.onTouchEvent == nullptr) return false;
+
+    static GameActivityMotionEvent c_event;
+    GameActivityMotionEvent_fromJava(env, motionEvent, &c_event);
+    return code->callbacks.onTouchEvent(code, &c_event);
+
+}
+
+static bool onKeyUp_native(JNIEnv *env, jobject javaGameActivity, jlong handle,
+                           jobject keyEvent) {
+    if (handle == 0) return false;
+    NativeCode *code = (NativeCode *)handle;
+    if (code->callbacks.onKeyUp == nullptr) return false;
+
+    static GameActivityKeyEvent c_event;
+    GameActivityKeyEvent_fromJava(env, keyEvent, &c_event);
+    return code->callbacks.onKeyUp(code, &c_event);
+}
+
+static bool onKeyDown_native(JNIEnv *env, jobject javaGameActivity,
+                             jlong handle, jobject keyEvent) {
+    if (handle == 0) return false;
+    NativeCode *code = (NativeCode *)handle;
+    if (code->callbacks.onKeyDown == nullptr) return false;
+
+    static GameActivityKeyEvent c_event;
+    GameActivityKeyEvent_fromJava(env, keyEvent, &c_event);
+    return code->callbacks.onKeyDown(code, &c_event);
+}
+
+static void onTextInput_native(JNIEnv *env, jobject activity, jlong handle,
+                               jobject textInputEvent) {
+    if (handle == 0) return;
+    NativeCode *code = (NativeCode *)handle;
+    GameTextInput_processEvent(code->gameTextInput, textInputEvent);
+}
+
+static void onWindowInsetsChanged_native(JNIEnv *env, jobject activity,
+                                         jlong handle) {
+    if (handle == 0) return;
+    NativeCode *code = (NativeCode *)handle;
+    if (code->callbacks.onWindowInsetsChanged == nullptr) return;
+    for (int type = 0; type < GAMECOMMON_INSETS_TYPE_COUNT; ++type) {
+        jobject jinsets;
+        // Note that waterfall insets are handled differently on the Java side.
+        if (type == GAMECOMMON_INSETS_TYPE_WATERFALL) {
+            jinsets = env->CallObjectMethod(
+                code->javaGameActivity,
+                gGameActivityClassInfo.getWaterfallInsets);
+        } else {
+            jint jtype = env->CallStaticIntMethod(
+                gWindowInsetsCompatTypeClassInfo.clazz,
+                gWindowInsetsCompatTypeClassInfo.methods[type]);
+            jinsets = env->CallObjectMethod(
+                code->javaGameActivity, gGameActivityClassInfo.getWindowInsets,
+                jtype);
+        }
+        ARect &insets = code->insetsState[type];
+        if (jinsets == nullptr) {
+            insets.left = 0;
+            insets.right = 0;
+            insets.top = 0;
+            insets.bottom = 0;
+        } else {
+            insets.left = env->GetIntField(jinsets, gInsetsClassInfo.left);
+            insets.right = env->GetIntField(jinsets, gInsetsClassInfo.right);
+            insets.top = env->GetIntField(jinsets, gInsetsClassInfo.top);
+            insets.bottom = env->GetIntField(jinsets, gInsetsClassInfo.bottom);
+        }
+    }
+    GameTextInput_processImeInsets(
+        code->gameTextInput, &code->insetsState[GAMECOMMON_INSETS_TYPE_IME]);
+    code->callbacks.onWindowInsetsChanged(code);
+}
+
+static void setInputConnection_native(JNIEnv *env, jobject activity,
+                                      jlong handle, jobject inputConnection) {
+    NativeCode *code = (NativeCode *)handle;
+    GameTextInput_setInputConnection(code->gameTextInput, inputConnection);
+}
+
+static void onContentRectChangedNative_native(JNIEnv *env, jobject activity,
+                                              jlong handle, jint x, jint y,
+                                              jint w, jint h) {
+    if (handle != 0) {
+        NativeCode *code = (NativeCode *)handle;
+
+        if (code->callbacks.onContentRectChanged != nullptr) {
+            ARect rect;
+            rect.left = x;
+            rect.top = y;
+            rect.right = x+w;
+            rect.bottom = y+h;
+            code->callbacks.onContentRectChanged(code, &rect);
+        }
+    }
+}
+
+static const JNINativeMethod g_methods[] = {
+    {"initializeNativeCode",
+     "(Ljava/lang/String;Ljava/lang/String;"
+     "Ljava/lang/String;Landroid/content/res/AssetManager;"
+     "[BLandroid/content/res/Configuration;)J",
+     (void *)initializeNativeCode_native},
+    {"getDlError", "()Ljava/lang/String;", (void *)getDlError_native},
+    {"terminateNativeCode", "(J)V", (void *)terminateNativeCode_native},
+    {"onStartNative", "(J)V", (void *)onStart_native},
+    {"onResumeNative", "(J)V", (void *)onResume_native},
+    {"onSaveInstanceStateNative", "(J)[B", (void *)onSaveInstanceState_native},
+    {"onPauseNative", "(J)V", (void *)onPause_native},
+    {"onStopNative", "(J)V", (void *)onStop_native},
+    {"onConfigurationChangedNative", "(JLandroid/content/res/Configuration;)V",
+     (void *)onConfigurationChanged_native},
+    {"onTrimMemoryNative", "(JI)V", (void *)onTrimMemory_native},
+    {"onWindowFocusChangedNative", "(JZ)V",
+     (void *)onWindowFocusChanged_native},
+    {"onSurfaceCreatedNative", "(JLandroid/view/Surface;)V",
+     (void *)onSurfaceCreated_native},
+    {"onSurfaceChangedNative", "(JLandroid/view/Surface;III)V",
+     (void *)onSurfaceChanged_native},
+    {"onSurfaceRedrawNeededNative", "(JLandroid/view/Surface;)V",
+     (void *)onSurfaceRedrawNeeded_native},
+    {"onSurfaceDestroyedNative", "(J)V", (void *)onSurfaceDestroyed_native},
+    {"onTouchEventNative", "(JLandroid/view/MotionEvent;)Z",
+     (void *)onTouchEvent_native},
+    {"onKeyDownNative", "(JLandroid/view/KeyEvent;)Z",
+     (void *)onKeyDown_native},
+    {"onKeyUpNative", "(JLandroid/view/KeyEvent;)Z", (void *)onKeyUp_native},
+    {"onTextInputEventNative",
+     "(JLcom/google/androidgamesdk/gametextinput/State;)V",
+     (void *)onTextInput_native},
+    {"onWindowInsetsChangedNative", "(J)V",
+     (void *)onWindowInsetsChanged_native},
+    {"setInputConnectionNative",
+     "(JLcom/google/androidgamesdk/gametextinput/InputConnection;)V",
+     (void *)setInputConnection_native},
+    {"onContentRectChangedNative", "(JIIII)V",
+     (void *)onContentRectChangedNative_native},
+};
+
+static const char *const kGameActivityPathName =
+    "com/google/androidgamesdk/GameActivity";
+
+static const char *const kInsetsPathName = "androidx/core/graphics/Insets";
+static const char *const kConfigurationPathName =
+    "android/content/res/Configuration";
+static const char *const kWindowInsetsCompatTypePathName =
+    "androidx/core/view/WindowInsetsCompat$Type";
+
+#define FIND_CLASS(var, className)   \
+    var = env->FindClass(className); \
+    LOG_FATAL_IF(!var, "Unable to find class %s", className);
+
+#define GET_METHOD_ID(var, clazz, methodName, fieldDescriptor)  \
+    var = env->GetMethodID(clazz, methodName, fieldDescriptor); \
+    LOG_FATAL_IF(!var, "Unable to find method %s", methodName);
+
+#define GET_STATIC_METHOD_ID(var, clazz, methodName, fieldDescriptor) \
+    var = env->GetStaticMethodID(clazz, methodName, fieldDescriptor); \
+    LOG_FATAL_IF(!var, "Unable to find static method %s", methodName);
+
+#define GET_FIELD_ID(var, clazz, fieldName, fieldDescriptor)  \
+    var = env->GetFieldID(clazz, fieldName, fieldDescriptor); \
+    LOG_FATAL_IF(!var, "Unable to find field %s", fieldName);
+
+static int jniRegisterNativeMethods(JNIEnv *env, const char *className,
+                                    const JNINativeMethod *methods,
+                                    int numMethods) {
+    ALOGV("Registering %s's %d native methods...", className, numMethods);
+    jclass clazz = env->FindClass(className);
+    LOG_FATAL_IF(clazz == nullptr,
+                 "Native registration unable to find class '%s'; aborting...",
+                 className);
+    int result = env->RegisterNatives(clazz, methods, numMethods);
+    env->DeleteLocalRef(clazz);
+    if (result == 0) {
+        return 0;
+    }
+
+    // Failure to register natives is fatal. Try to report the corresponding
+    // exception, otherwise abort with generic failure message.
+    jthrowable thrown = env->ExceptionOccurred();
+    if (thrown != NULL) {
+        env->ExceptionDescribe();
+        env->DeleteLocalRef(thrown);
+    }
+    LOG_FATAL("RegisterNatives failed for '%s'; aborting...", className);
+}
+
+extern "C" int GameActivity_register(JNIEnv *env) {
+    ALOGD("GameActivity_register");
+    jclass activity_class;
+    FIND_CLASS(activity_class, kGameActivityPathName);
+    GET_METHOD_ID(gGameActivityClassInfo.finish, activity_class, "finish",
+                  "()V");
+    GET_METHOD_ID(gGameActivityClassInfo.setWindowFlags, activity_class,
+                  "setWindowFlags", "(II)V");
+    GET_METHOD_ID(gGameActivityClassInfo.getWindowInsets, activity_class,
+                  "getWindowInsets", "(I)Landroidx/core/graphics/Insets;");
+    GET_METHOD_ID(gGameActivityClassInfo.getWaterfallInsets, activity_class,
+                  "getWaterfallInsets", "()Landroidx/core/graphics/Insets;");
+    GET_METHOD_ID(gGameActivityClassInfo.setImeEditorInfoFields, activity_class,
+                  "setImeEditorInfoFields", "(III)V");
+
+    jclass insets_class;
+    FIND_CLASS(insets_class, kInsetsPathName);
+    GET_FIELD_ID(gInsetsClassInfo.left, insets_class, "left", "I");
+    GET_FIELD_ID(gInsetsClassInfo.right, insets_class, "right", "I");
+    GET_FIELD_ID(gInsetsClassInfo.top, insets_class, "top", "I");
+    GET_FIELD_ID(gInsetsClassInfo.bottom, insets_class, "bottom", "I");
+
+    jclass configuration_class;
+    FIND_CLASS(configuration_class, kConfigurationPathName);
+
+    if (android_get_device_api_level() >= 26) {
+        GET_FIELD_ID(gConfigurationClassInfo.colorMode, configuration_class,
+                     "colorMode", "I");
+    }
+
+    GET_FIELD_ID(gConfigurationClassInfo.densityDpi, configuration_class,
+                 "densityDpi", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.fontScale, configuration_class,
+                 "fontScale", "F");
+
+    if (android_get_device_api_level() >= 31) {
+        GET_FIELD_ID(gConfigurationClassInfo.fontWeightAdjustment,
+                     configuration_class, "fontWeightAdjustment", "I");
+    }
+
+    GET_FIELD_ID(gConfigurationClassInfo.hardKeyboardHidden,
+                 configuration_class, "hardKeyboardHidden", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.keyboard, configuration_class,
+                 "keyboard", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.keyboardHidden, configuration_class,
+                 "keyboardHidden", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.mcc, configuration_class, "mcc", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.mnc, configuration_class, "mnc", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.navigation, configuration_class,
+                 "navigation", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.navigationHidden, configuration_class,
+                 "navigationHidden", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.orientation, configuration_class,
+                 "orientation", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.screenHeightDp, configuration_class,
+                 "screenHeightDp", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.screenLayout, configuration_class,
+                 "screenLayout", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.screenWidthDp, configuration_class,
+                 "screenWidthDp", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.smallestScreenWidthDp,
+                 configuration_class, "smallestScreenWidthDp", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.touchscreen, configuration_class,
+                 "touchscreen", "I");
+    GET_FIELD_ID(gConfigurationClassInfo.uiMode, configuration_class, "uiMode",
+                 "I");
+
+    jclass windowInsetsCompatType_class;
+    FIND_CLASS(windowInsetsCompatType_class, kWindowInsetsCompatTypePathName);
+    gWindowInsetsCompatTypeClassInfo.clazz =
+        (jclass)env->NewGlobalRef(windowInsetsCompatType_class);
+    // These names must match, in order, the GameCommonInsetsType enum fields
+    // Note that waterfall is handled differently by the insets API, so we
+    // exclude it here.
+    const char *methodNames[GAMECOMMON_INSETS_TYPE_WATERFALL] = {
+        "captionBar",
+        "displayCutout",
+        "ime",
+        "mandatorySystemGestures",
+        "navigationBars",
+        "statusBars",
+        "systemBars",
+        "systemGestures",
+        "tappableElement"};
+    for (int i = 0; i < GAMECOMMON_INSETS_TYPE_WATERFALL; ++i) {
+        GET_STATIC_METHOD_ID(gWindowInsetsCompatTypeClassInfo.methods[i],
+                             windowInsetsCompatType_class, methodNames[i],
+                             "()I");
+    }
+    return jniRegisterNativeMethods(env, kGameActivityPathName, g_methods,
+                                    NELEM(g_methods));
+}
+
+// XXX: This symbol is renamed with a _C suffix and then re-exported from
+// Rust because Rust/Cargo don't give us a way to directly export symbols
+// from C/C++ code: https://github.com/rust-lang/rfcs/issues/2771
+//
+extern "C" JNIEXPORT jlong JNICALL
+Java_com_google_androidgamesdk_GameActivity_initializeNativeCode_C(
+    JNIEnv *env, jobject javaGameActivity, jstring internalDataDir,
+    jstring obbDir, jstring externalDataDir, jobject jAssetMgr,
+    jbyteArray savedState, jobject javaConfig) {
+    GameActivity_register(env);
+    jlong nativeCode = initializeNativeCode_native(
+        env, javaGameActivity, internalDataDir, obbDir, externalDataDir,
+        jAssetMgr, savedState, javaConfig);
+    return nativeCode;
+}
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.h b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.h
new file mode 100644
index 0000000..b945069
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.h
@@ -0,0 +1,636 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @addtogroup GameActivity Game Activity
+ * The interface to use GameActivity.
+ * @{
+ */
+
+/**
+ * @file GameActivity.h
+ */
+
+#ifndef ANDROID_GAME_SDK_GAME_ACTIVITY_H
+#define ANDROID_GAME_SDK_GAME_ACTIVITY_H
+
+#include <android/asset_manager.h>
+#include <android/input.h>
+#include <android/native_window.h>
+#include <android/rect.h>
+#include <jni.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <sys/types.h>
+
+#include "common/gamesdk_common.h"
+#include "game-activity/GameActivityEvents.h"
+#include "game-text-input/gametextinput.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define GAMEACTIVITY_MAJOR_VERSION 2
+#define GAMEACTIVITY_MINOR_VERSION 0
+#define GAMEACTIVITY_BUGFIX_VERSION 2
+#define GAMEACTIVITY_PACKED_VERSION                            \
+    ANDROID_GAMESDK_PACKED_VERSION(GAMEACTIVITY_MAJOR_VERSION, \
+                                   GAMEACTIVITY_MINOR_VERSION, \
+                                   GAMEACTIVITY_BUGFIX_VERSION)
+
+/**
+ * {@link GameActivityCallbacks}
+ */
+struct GameActivityCallbacks;
+
+/**
+ * This structure defines the native side of an android.app.GameActivity.
+ * It is created by the framework, and handed to the application's native
+ * code as it is being launched.
+ */
+typedef struct GameActivity {
+    /**
+     * Pointer to the callback function table of the native application.
+     * You can set the functions here to your own callbacks.  The callbacks
+     * pointer itself here should not be changed; it is allocated and managed
+     * for you by the framework.
+     */
+    struct GameActivityCallbacks* callbacks;
+
+    /**
+     * The global handle on the process's Java VM.
+     */
+    JavaVM* vm;
+
+    /**
+     * JNI context for the main thread of the app.  Note that this field
+     * can ONLY be used from the main thread of the process; that is, the
+     * thread that calls into the GameActivityCallbacks.
+     */
+    JNIEnv* env;
+
+    /**
+     * The GameActivity object handle.
+     */
+    jobject javaGameActivity;
+
+    /**
+     * Path to this application's internal data directory.
+     */
+    const char* internalDataPath;
+
+    /**
+     * Path to this application's external (removable/mountable) data directory.
+     */
+    const char* externalDataPath;
+
+    /**
+     * The platform's SDK version code.
+     */
+    int32_t sdkVersion;
+
+    /**
+     * This is the native instance of the application.  It is not used by
+     * the framework, but can be set by the application to its own instance
+     * state.
+     */
+    void* instance;
+
+    /**
+     * Pointer to the Asset Manager instance for the application.  The
+     * application uses this to access binary assets bundled inside its own .apk
+     * file.
+     */
+    AAssetManager* assetManager;
+
+    /**
+     * Available starting with Honeycomb: path to the directory containing
+     * the application's OBB files (if any).  If the app doesn't have any
+     * OBB files, this directory may not exist.
+     */
+    const char* obbPath;
+} GameActivity;
+
+/**
+ * A function the user should call from their callback with the data, its length
+ * and the library- supplied context.
+ */
+typedef void (*SaveInstanceStateRecallback)(const char* bytes, int len,
+                                            void* context);
+
+/**
+ * These are the callbacks the framework makes into a native application.
+ * All of these callbacks happen on the main thread of the application.
+ * By default, all callbacks are NULL; set to a pointer to your own function
+ * to have it called.
+ */
+typedef struct GameActivityCallbacks {
+    /**
+     * GameActivity has started.  See Java documentation for Activity.onStart()
+     * for more information.
+     */
+    void (*onStart)(GameActivity* activity);
+
+    /**
+     * GameActivity has resumed.  See Java documentation for Activity.onResume()
+     * for more information.
+     */
+    void (*onResume)(GameActivity* activity);
+
+    /**
+     * The framework is asking GameActivity to save its current instance state.
+     * See the Java documentation for Activity.onSaveInstanceState() for more
+     * information. The user should call the recallback with their data, its
+     * length and the provided context; they retain ownership of the data. Note
+     * that the saved state will be persisted, so it can not contain any active
+     * entities (pointers to memory, file descriptors, etc).
+     */
+    void (*onSaveInstanceState)(GameActivity* activity,
+                                SaveInstanceStateRecallback recallback,
+                                void* context);
+
+    /**
+     * GameActivity has paused.  See Java documentation for Activity.onPause()
+     * for more information.
+     */
+    void (*onPause)(GameActivity* activity);
+
+    /**
+     * GameActivity has stopped.  See Java documentation for Activity.onStop()
+     * for more information.
+     */
+    void (*onStop)(GameActivity* activity);
+
+    /**
+     * GameActivity is being destroyed.  See Java documentation for
+     * Activity.onDestroy() for more information.
+     */
+    void (*onDestroy)(GameActivity* activity);
+
+    /**
+     * Focus has changed in this GameActivity's window.  This is often used,
+     * for example, to pause a game when it loses input focus.
+     */
+    void (*onWindowFocusChanged)(GameActivity* activity, bool hasFocus);
+
+    /**
+     * The drawing window for this native activity has been created.  You
+     * can use the given native window object to start drawing.
+     */
+    void (*onNativeWindowCreated)(GameActivity* activity,
+                                  ANativeWindow* window);
+
+    /**
+     * The drawing window for this native activity has been resized.  You should
+     * retrieve the new size from the window and ensure that your rendering in
+     * it now matches.
+     */
+    void (*onNativeWindowResized)(GameActivity* activity, ANativeWindow* window,
+                                  int32_t newWidth, int32_t newHeight);
+
+    /**
+     * The drawing window for this native activity needs to be redrawn.  To
+     * avoid transient artifacts during screen changes (such resizing after
+     * rotation), applications should not return from this function until they
+     * have finished drawing their window in its current state.
+     */
+    void (*onNativeWindowRedrawNeeded)(GameActivity* activity,
+                                       ANativeWindow* window);
+
+    /**
+     * The drawing window for this native activity is going to be destroyed.
+     * You MUST ensure that you do not touch the window object after returning
+     * from this function: in the common case of drawing to the window from
+     * another thread, that means the implementation of this callback must
+     * properly synchronize with the other thread to stop its drawing before
+     * returning from here.
+     */
+    void (*onNativeWindowDestroyed)(GameActivity* activity,
+                                    ANativeWindow* window);
+
+    /**
+     * The current device AConfiguration has changed.  The new configuration can
+     * be retrieved from assetManager.
+     */
+    void (*onConfigurationChanged)(GameActivity* activity);
+
+    /**
+     * The system is running low on memory.  Use this callback to release
+     * resources you do not need, to help the system avoid killing more
+     * important processes.
+     */
+    void (*onTrimMemory)(GameActivity* activity, int level);
+
+    /**
+     * Callback called for every MotionEvent done on the GameActivity
+     * SurfaceView. Ownership of `event` is maintained by the library and it is
+     * only valid during the callback.
+     */
+    bool (*onTouchEvent)(GameActivity* activity,
+                         const GameActivityMotionEvent* event);
+
+    /**
+     * Callback called for every key down event on the GameActivity SurfaceView.
+     * Ownership of `event` is maintained by the library and it is only valid
+     * during the callback.
+     */
+    bool (*onKeyDown)(GameActivity* activity,
+                      const GameActivityKeyEvent* event);
+
+    /**
+     * Callback called for every key up event on the GameActivity SurfaceView.
+     * Ownership of `event` is maintained by the library and it is only valid
+     * during the callback.
+     */
+    bool (*onKeyUp)(GameActivity* activity, const GameActivityKeyEvent* event);
+
+    /**
+     * Callback called for every soft-keyboard text input event.
+     * Ownership of `state` is maintained by the library and it is only valid
+     * during the callback.
+     */
+    void (*onTextInputEvent)(GameActivity* activity,
+                             const GameTextInputState* state);
+
+    /**
+     * Callback called when WindowInsets of the main app window have changed.
+     * Call GameActivity_getWindowInsets to retrieve the insets themselves.
+     */
+    void (*onWindowInsetsChanged)(GameActivity* activity);
+
+    /**
+     * Callback called when the rectangle in the window where the content
+     * should be placed has changed.
+     */
+    void (*onContentRectChanged)(GameActivity *activity, const ARect *rect);
+} GameActivityCallbacks;
+
+/**
+ * This is the function that must be in the native code to instantiate the
+ * application's native activity.  It is called with the activity instance (see
+ * above); if the code is being instantiated from a previously saved instance,
+ * the savedState will be non-NULL and point to the saved data.  You must make
+ * any copy of this data you need -- it will be released after you return from
+ * this function.
+ */
+typedef void GameActivity_createFunc(GameActivity* activity, void* savedState,
+                                     size_t savedStateSize);
+
+/**
+ * The name of the function that NativeInstance looks for when launching its
+ * native code.  This is the default function that is used, you can specify
+ * "android.app.func_name" string meta-data in your manifest to use a different
+ * function.
+ */
+extern GameActivity_createFunc GameActivity_onCreate_C;
+
+/**
+ * Finish the given activity.  Its finish() method will be called, causing it
+ * to be stopped and destroyed.  Note that this method can be called from
+ * *any* thread; it will send a message to the main thread of the process
+ * where the Java finish call will take place.
+ */
+void GameActivity_finish(GameActivity* activity);
+
+/**
+ * Flags for GameActivity_setWindowFlags,
+ * as per the Java API at android.view.WindowManager.LayoutParams.
+ */
+enum GameActivitySetWindowFlags {
+    /**
+     * As long as this window is visible to the user, allow the lock
+     * screen to activate while the screen is on.  This can be used
+     * independently, or in combination with {@link
+     * GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} and/or {@link
+     * GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}
+     */
+    GAMEACTIVITY_FLAG_ALLOW_LOCK_WHILE_SCREEN_ON = 0x00000001,
+    /** Everything behind this window will be dimmed. */
+    GAMEACTIVITY_FLAG_DIM_BEHIND = 0x00000002,
+    /**
+     * Blur everything behind this window.
+     * @deprecated Blurring is no longer supported.
+     */
+    GAMEACTIVITY_FLAG_BLUR_BEHIND = 0x00000004,
+    /**
+     * This window won't ever get key input focus, so the
+     * user can not send key or other button events to it.  Those will
+     * instead go to whatever focusable window is behind it.  This flag
+     * will also enable {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL} whether or not
+     * that is explicitly set.
+     *
+     * Setting this flag also implies that the window will not need to
+     * interact with
+     * a soft input method, so it will be Z-ordered and positioned
+     * independently of any active input method (typically this means it
+     * gets Z-ordered on top of the input method, so it can use the full
+     * screen for its content and cover the input method if needed.  You
+     * can use {@link GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM} to modify this
+     * behavior.
+     */
+    GAMEACTIVITY_FLAG_NOT_FOCUSABLE = 0x00000008,
+    /** This window can never receive touch events. */
+    GAMEACTIVITY_FLAG_NOT_TOUCHABLE = 0x00000010,
+    /**
+     * Even when this window is focusable (its
+     * {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set), allow any pointer
+     * events outside of the window to be sent to the windows behind it.
+     * Otherwise it will consume all pointer events itself, regardless of
+     * whether they are inside of the window.
+     */
+    GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL = 0x00000020,
+    /**
+     * When set, if the device is asleep when the touch
+     * screen is pressed, you will receive this first touch event.  Usually
+     * the first touch event is consumed by the system since the user can
+     * not see what they are pressing on.
+     *
+     * @deprecated This flag has no effect.
+     */
+    GAMEACTIVITY_FLAG_TOUCHABLE_WHEN_WAKING = 0x00000040,
+    /**
+     * As long as this window is visible to the user, keep
+     * the device's screen turned on and bright.
+     */
+    GAMEACTIVITY_FLAG_KEEP_SCREEN_ON = 0x00000080,
+    /**
+     * Place the window within the entire screen, ignoring
+     * decorations around the border (such as the status bar).  The
+     * window must correctly position its contents to take the screen
+     * decoration into account.
+     */
+    GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN = 0x00000100,
+    /** Allows the window to extend outside of the screen. */
+    GAMEACTIVITY_FLAG_LAYOUT_NO_LIMITS = 0x00000200,
+    /**
+     * Hide all screen decorations (such as the status
+     * bar) while this window is displayed.  This allows the window to
+     * use the entire display space for itself -- the status bar will
+     * be hidden when an app window with this flag set is on the top
+     * layer. A fullscreen window will ignore a value of {@link
+     * GAMEACTIVITY_SOFT_INPUT_ADJUST_RESIZE}; the window will stay
+     * fullscreen and will not resize.
+     */
+    GAMEACTIVITY_FLAG_FULLSCREEN = 0x00000400,
+    /**
+     * Override {@link GAMEACTIVITY_FLAG_FULLSCREEN} and force the
+     * screen decorations (such as the status bar) to be shown.
+     */
+    GAMEACTIVITY_FLAG_FORCE_NOT_FULLSCREEN = 0x00000800,
+    /**
+     * Turn on dithering when compositing this window to
+     * the screen.
+     * @deprecated This flag is no longer used.
+     */
+    GAMEACTIVITY_FLAG_DITHER = 0x00001000,
+    /**
+     * Treat the content of the window as secure, preventing
+     * it from appearing in screenshots or from being viewed on non-secure
+     * displays.
+     */
+    GAMEACTIVITY_FLAG_SECURE = 0x00002000,
+    /**
+     * A special mode where the layout parameters are used
+     * to perform scaling of the surface when it is composited to the
+     * screen.
+     */
+    GAMEACTIVITY_FLAG_SCALED = 0x00004000,
+    /**
+     * Intended for windows that will often be used when the user is
+     * holding the screen against their face, it will aggressively
+     * filter the event stream to prevent unintended presses in this
+     * situation that may not be desired for a particular window, when
+     * such an event stream is detected, the application will receive
+     * a {@link AMOTION_EVENT_ACTION_CANCEL} to indicate this so
+     * applications can handle this accordingly by taking no action on
+     * the event until the finger is released.
+     */
+    GAMEACTIVITY_FLAG_IGNORE_CHEEK_PRESSES = 0x00008000,
+    /**
+     * A special option only for use in combination with
+     * {@link GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN}.  When requesting layout in
+     * the screen your window may appear on top of or behind screen decorations
+     * such as the status bar.  By also including this flag, the window
+     * manager will report the inset rectangle needed to ensure your
+     * content is not covered by screen decorations.
+     */
+    GAMEACTIVITY_FLAG_LAYOUT_INSET_DECOR = 0x00010000,
+    /**
+     * Invert the state of {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} with
+     * respect to how this window interacts with the current method.
+     * That is, if FLAG_NOT_FOCUSABLE is set and this flag is set,
+     * then the window will behave as if it needs to interact with the
+     * input method and thus be placed behind/away from it; if {@link
+     * GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set and this flag is set,
+     * then the window will behave as if it doesn't need to interact
+     * with the input method and can be placed to use more space and
+     * cover the input method.
+     */
+    GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM = 0x00020000,
+    /**
+     * If you have set {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL}, you
+     * can set this flag to receive a single special MotionEvent with
+     * the action
+     * {@link AMOTION_EVENT_ACTION_OUTSIDE} for
+     * touches that occur outside of your window.  Note that you will not
+     * receive the full down/move/up gesture, only the location of the
+     * first down as an {@link AMOTION_EVENT_ACTION_OUTSIDE}.
+     */
+    GAMEACTIVITY_FLAG_WATCH_OUTSIDE_TOUCH = 0x00040000,
+    /**
+     * Special flag to let windows be shown when the screen
+     * is locked. This will let application windows take precedence over
+     * key guard or any other lock screens. Can be used with
+     * {@link GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} to turn screen on and display
+     * windows directly before showing the key guard window.  Can be used with
+     * {@link GAMEACTIVITY_FLAG_DISMISS_KEYGUARD} to automatically fully
+     * dismisss non-secure keyguards.  This flag only applies to the top-most
+     * full-screen window.
+     */
+    GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED = 0x00080000,
+    /**
+     * Ask that the system wallpaper be shown behind
+     * your window.  The window surface must be translucent to be able
+     * to actually see the wallpaper behind it; this flag just ensures
+     * that the wallpaper surface will be there if this window actually
+     * has translucent regions.
+     */
+    GAMEACTIVITY_FLAG_SHOW_WALLPAPER = 0x00100000,
+    /**
+     * When set as a window is being added or made
+     * visible, once the window has been shown then the system will
+     * poke the power manager's user activity (as if the user had woken
+     * up the device) to turn the screen on.
+     */
+    GAMEACTIVITY_FLAG_TURN_SCREEN_ON = 0x00200000,
+    /**
+     * When set the window will cause the keyguard to
+     * be dismissed, only if it is not a secure lock keyguard.  Because such
+     * a keyguard is not needed for security, it will never re-appear if
+     * the user navigates to another window (in contrast to
+     * {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}, which will only temporarily
+     * hide both secure and non-secure keyguards but ensure they reappear
+     * when the user moves to another UI that doesn't hide them).
+     * If the keyguard is currently active and is secure (requires an
+     * unlock pattern) than the user will still need to confirm it before
+     * seeing this window, unless {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED} has
+     * also been set.
+     */
+    GAMEACTIVITY_FLAG_DISMISS_KEYGUARD = 0x00400000,
+};
+
+/**
+ * Change the window flags of the given activity.  Calls getWindow().setFlags()
+ * of the given activity.
+ * Note that some flags must be set before the window decoration is created,
+ * see
+ * https://developer.android.com/reference/android/view/Window#setFlags(int,%20int).
+ * Note also that this method can be called from
+ * *any* thread; it will send a message to the main thread of the process
+ * where the Java finish call will take place.
+ */
+void GameActivity_setWindowFlags(GameActivity* activity, uint32_t addFlags,
+                                 uint32_t removeFlags);
+
+/**
+ * Flags for GameActivity_showSoftInput; see the Java InputMethodManager
+ * API for documentation.
+ */
+enum GameActivityShowSoftInputFlags {
+    /**
+     * Implicit request to show the input window, not as the result
+     * of a direct request by the user.
+     */
+    GAMEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT = 0x0001,
+
+    /**
+     * The user has forced the input method open (such as by
+     * long-pressing menu) so it should not be closed until they
+     * explicitly do so.
+     */
+    GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED = 0x0002,
+};
+
+/**
+ * Show the IME while in the given activity.  Calls
+ * InputMethodManager.showSoftInput() for the given activity.  Note that this
+ * method can be called from *any* thread; it will send a message to the main
+ * thread of the process where the Java call will take place.
+ */
+void GameActivity_showSoftInput(GameActivity* activity, uint32_t flags);
+
+/**
+ * Set the text entry state (see documentation of the GameTextInputState struct
+ * in the Game Text Input library reference).
+ *
+ * Ownership of the state is maintained by the caller.
+ */
+void GameActivity_setTextInputState(GameActivity* activity,
+                                    const GameTextInputState* state);
+
+/**
+ * Get the last-received text entry state (see documentation of the
+ * GameTextInputState struct in the Game Text Input library reference).
+ *
+ */
+void GameActivity_getTextInputState(GameActivity* activity,
+                                    GameTextInputGetStateCallback callback,
+                                    void* context);
+
+/**
+ * Get a pointer to the GameTextInput library instance.
+ */
+GameTextInput* GameActivity_getTextInput(const GameActivity* activity);
+
+/**
+ * Flags for GameActivity_hideSoftInput; see the Java InputMethodManager
+ * API for documentation.
+ */
+enum GameActivityHideSoftInputFlags {
+    /**
+     * The soft input window should only be hidden if it was not
+     * explicitly shown by the user.
+     */
+    GAMEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_ONLY = 0x0001,
+    /**
+     * The soft input window should normally be hidden, unless it was
+     * originally shown with {@link GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED}.
+     */
+    GAMEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS = 0x0002,
+};
+
+/**
+ * Hide the IME while in the given activity.  Calls
+ * InputMethodManager.hideSoftInput() for the given activity.  Note that this
+ * method can be called from *any* thread; it will send a message to the main
+ * thread of the process where the Java finish call will take place.
+ */
+void GameActivity_hideSoftInput(GameActivity* activity, uint32_t flags);
+
+/**
+ * Get the current window insets of the particular component. See
+ * https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type
+ * for more details.
+ * You can use these insets to influence what you show on the screen.
+ */
+void GameActivity_getWindowInsets(GameActivity* activity,
+                                  GameCommonInsetsType type, ARect* insets);
+
+/**
+ * Set options on how the IME behaves when it is requested for text input.
+ * See
+ * https://developer.android.com/reference/android/view/inputmethod/EditorInfo
+ * for the meaning of inputType, actionId and imeOptions.
+ *
+ * Note that this function will attach the current thread to the JVM if it is
+ * not already attached, so the caller must detach the thread from the JVM
+ * before the thread is destroyed using DetachCurrentThread.
+ */
+void GameActivity_setImeEditorInfo(GameActivity* activity, int inputType,
+                                   int actionId, int imeOptions);
+
+/**
+ * These are getters for Configuration class members. They may be called from
+ * any thread.
+ */
+int GameActivity_getOrientation(GameActivity* activity);
+int GameActivity_getColorMode(GameActivity* activity);
+int GameActivity_getDensityDpi(GameActivity* activity);
+float GameActivity_getFontScale(GameActivity* activity);
+int GameActivity_getFontWeightAdjustment(GameActivity* activity);
+int GameActivity_getHardKeyboardHidden(GameActivity* activity);
+int GameActivity_getKeyboard(GameActivity* activity);
+int GameActivity_getKeyboardHidden(GameActivity* activity);
+int GameActivity_getMcc(GameActivity* activity);
+int GameActivity_getMnc(GameActivity* activity);
+int GameActivity_getNavigation(GameActivity* activity);
+int GameActivity_getNavigationHidden(GameActivity* activity);
+int GameActivity_getOrientation(GameActivity* activity);
+int GameActivity_getScreenHeightDp(GameActivity* activity);
+int GameActivity_getScreenLayout(GameActivity* activity);
+int GameActivity_getScreenWidthDp(GameActivity* activity);
+int GameActivity_getSmallestScreenWidthDp(GameActivity* activity);
+int GameActivity_getTouchscreen(GameActivity* activity);
+int GameActivity_getUIMode(GameActivity* activity);
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @} */
+
+#endif  // ANDROID_GAME_SDK_GAME_ACTIVITY_H
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.cpp b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.cpp
new file mode 100644
index 0000000..028b55e
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.cpp
@@ -0,0 +1,414 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "GameActivityEvents.h"
+
+#include <sys/system_properties.h>
+
+#include <string>
+
+#include "GameActivityLog.h"
+
+// TODO(b/187147166): these functions were extracted from the Game SDK
+// (gamesdk/src/common/system_utils.h). system_utils.h/cpp should be used
+// instead.
+namespace {
+
+std::string getSystemPropViaGet(const char *key,
+                                const char *default_value = "") {
+    char buffer[PROP_VALUE_MAX + 1] = "";  // +1 for terminator
+    int bufferLen = __system_property_get(key, buffer);
+    if (bufferLen > 0)
+        return buffer;
+    else
+        return "";
+}
+
+std::string GetSystemProp(const char *key, const char *default_value = "") {
+    return getSystemPropViaGet(key, default_value);
+}
+
+int GetSystemPropAsInt(const char *key, int default_value = 0) {
+    std::string prop = GetSystemProp(key);
+    return prop == "" ? default_value : strtoll(prop.c_str(), nullptr, 10);
+}
+
+}  // anonymous namespace
+
+#ifndef NELEM
+#define NELEM(x) ((int)(sizeof(x) / sizeof((x)[0])))
+#endif
+
+static bool enabledAxes[GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT] = {
+    /* AMOTION_EVENT_AXIS_X */ true,
+    /* AMOTION_EVENT_AXIS_Y */ true,
+    // Disable all other axes by default (they can be enabled using
+    // `GameActivityPointerAxes_enableAxis`).
+    false};
+
+extern "C" void GameActivityPointerAxes_enableAxis(int32_t axis) {
+    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
+        return;
+    }
+
+    enabledAxes[axis] = true;
+}
+
+float GameActivityPointerAxes_getAxisValue(
+    const GameActivityPointerAxes *pointerInfo, int32_t axis) {
+    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
+        return 0;
+    }
+
+    if (!enabledAxes[axis]) {
+        ALOGW("Axis %d must be enabled before it can be accessed.", axis);
+        return 0;
+    }
+
+    return pointerInfo->axisValues[axis];
+}
+
+extern "C" void GameActivityPointerAxes_disableAxis(int32_t axis) {
+    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
+        return;
+    }
+
+    enabledAxes[axis] = false;
+}
+
+float GameActivityMotionEvent_getHistoricalAxisValue(
+    const GameActivityMotionEvent *event, int axis, int pointerIndex,
+    int historyPos) {
+    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
+        ALOGE("Invalid axis %d", axis);
+        return -1;
+    }
+    if (pointerIndex < 0 || pointerIndex >= event->pointerCount) {
+        ALOGE("Invalid pointer index %d", pointerIndex);
+        return -1;
+    }
+    if (historyPos < 0 || historyPos >= event->historySize) {
+        ALOGE("Invalid history index %d", historyPos);
+        return -1;
+    }
+    if (!enabledAxes[axis]) {
+        ALOGW("Axis %d must be enabled before it can be accessed.", axis);
+        return 0;
+    }
+
+    int pointerOffset = pointerIndex * GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+    int historyValuesOffset = historyPos * event->pointerCount *
+                              GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+    return event
+        ->historicalAxisValues[historyValuesOffset + pointerOffset + axis];
+}
+
+static struct {
+    jmethodID getDeviceId;
+    jmethodID getSource;
+    jmethodID getAction;
+
+    jmethodID getEventTime;
+    jmethodID getDownTime;
+
+    jmethodID getFlags;
+    jmethodID getMetaState;
+
+    jmethodID getActionButton;
+    jmethodID getButtonState;
+    jmethodID getClassification;
+    jmethodID getEdgeFlags;
+
+    jmethodID getHistorySize;
+    jmethodID getHistoricalEventTime;
+
+    jmethodID getPointerCount;
+    jmethodID getPointerId;
+
+    jmethodID getToolType;
+
+    jmethodID getRawX;
+    jmethodID getRawY;
+    jmethodID getXPrecision;
+    jmethodID getYPrecision;
+    jmethodID getAxisValue;
+
+    jmethodID getHistoricalAxisValue;
+} gMotionEventClassInfo;
+
+extern "C" void GameActivityMotionEvent_destroy(
+    GameActivityMotionEvent *c_event) {
+    delete c_event->historicalAxisValues;
+    delete c_event->historicalEventTimesMillis;
+    delete c_event->historicalEventTimesNanos;
+}
+
+extern "C" void GameActivityMotionEvent_fromJava(
+    JNIEnv *env, jobject motionEvent, GameActivityMotionEvent *out_event) {
+    static bool gMotionEventClassInfoInitialized = false;
+    if (!gMotionEventClassInfoInitialized) {
+        int sdkVersion = GetSystemPropAsInt("ro.build.version.sdk");
+        gMotionEventClassInfo = {0};
+        jclass motionEventClass = env->FindClass("android/view/MotionEvent");
+        gMotionEventClassInfo.getDeviceId =
+            env->GetMethodID(motionEventClass, "getDeviceId", "()I");
+        gMotionEventClassInfo.getSource =
+            env->GetMethodID(motionEventClass, "getSource", "()I");
+        gMotionEventClassInfo.getAction =
+            env->GetMethodID(motionEventClass, "getAction", "()I");
+        gMotionEventClassInfo.getEventTime =
+            env->GetMethodID(motionEventClass, "getEventTime", "()J");
+        gMotionEventClassInfo.getDownTime =
+            env->GetMethodID(motionEventClass, "getDownTime", "()J");
+        gMotionEventClassInfo.getFlags =
+            env->GetMethodID(motionEventClass, "getFlags", "()I");
+        gMotionEventClassInfo.getMetaState =
+            env->GetMethodID(motionEventClass, "getMetaState", "()I");
+        if (sdkVersion >= 23) {
+            gMotionEventClassInfo.getActionButton =
+                env->GetMethodID(motionEventClass, "getActionButton", "()I");
+        }
+        if (sdkVersion >= 14) {
+            gMotionEventClassInfo.getButtonState =
+                env->GetMethodID(motionEventClass, "getButtonState", "()I");
+        }
+        if (sdkVersion >= 29) {
+            gMotionEventClassInfo.getClassification =
+                env->GetMethodID(motionEventClass, "getClassification", "()I");
+        }
+        gMotionEventClassInfo.getEdgeFlags =
+            env->GetMethodID(motionEventClass, "getEdgeFlags", "()I");
+
+        gMotionEventClassInfo.getHistorySize =
+            env->GetMethodID(motionEventClass, "getHistorySize", "()I");
+        gMotionEventClassInfo.getHistoricalEventTime = env->GetMethodID(
+            motionEventClass, "getHistoricalEventTime", "(I)J");
+
+        gMotionEventClassInfo.getPointerCount =
+            env->GetMethodID(motionEventClass, "getPointerCount", "()I");
+        gMotionEventClassInfo.getPointerId =
+            env->GetMethodID(motionEventClass, "getPointerId", "(I)I");
+        gMotionEventClassInfo.getToolType =
+            env->GetMethodID(motionEventClass, "getToolType", "(I)I");
+        if (sdkVersion >= 29) {
+            gMotionEventClassInfo.getRawX =
+                env->GetMethodID(motionEventClass, "getRawX", "(I)F");
+            gMotionEventClassInfo.getRawY =
+                env->GetMethodID(motionEventClass, "getRawY", "(I)F");
+        }
+        gMotionEventClassInfo.getXPrecision =
+            env->GetMethodID(motionEventClass, "getXPrecision", "()F");
+        gMotionEventClassInfo.getYPrecision =
+            env->GetMethodID(motionEventClass, "getYPrecision", "()F");
+        gMotionEventClassInfo.getAxisValue =
+            env->GetMethodID(motionEventClass, "getAxisValue", "(II)F");
+
+        gMotionEventClassInfo.getHistoricalAxisValue = env->GetMethodID(
+            motionEventClass, "getHistoricalAxisValue", "(III)F");
+        gMotionEventClassInfoInitialized = true;
+    }
+
+    int pointerCount =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getPointerCount);
+    pointerCount =
+        std::min(pointerCount, GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT);
+    out_event->pointerCount = pointerCount;
+    for (int i = 0; i < pointerCount; ++i) {
+        out_event->pointers[i] = {
+            /*id=*/env->CallIntMethod(motionEvent,
+                                      gMotionEventClassInfo.getPointerId, i),
+            /*toolType=*/
+            env->CallIntMethod(motionEvent, gMotionEventClassInfo.getToolType,
+                               i),
+            /*axisValues=*/{0},
+            /*rawX=*/gMotionEventClassInfo.getRawX
+                ? env->CallFloatMethod(motionEvent,
+                                       gMotionEventClassInfo.getRawX, i)
+                : 0,
+            /*rawY=*/gMotionEventClassInfo.getRawY
+                ? env->CallFloatMethod(motionEvent,
+                                       gMotionEventClassInfo.getRawY, i)
+                : 0,
+        };
+
+        for (int axisIndex = 0;
+             axisIndex < GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT; ++axisIndex) {
+            if (enabledAxes[axisIndex]) {
+                out_event->pointers[i].axisValues[axisIndex] =
+                    env->CallFloatMethod(motionEvent,
+                                         gMotionEventClassInfo.getAxisValue,
+                                         axisIndex, i);
+            }
+        }
+    }
+
+    int historySize =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getHistorySize);
+    out_event->historySize = historySize;
+    out_event->historicalAxisValues =
+        new float[historySize * pointerCount *
+                  GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT];
+    out_event->historicalEventTimesMillis = new int64_t[historySize];
+    out_event->historicalEventTimesNanos = new int64_t[historySize];
+
+    for (int historyIndex = 0; historyIndex < historySize; historyIndex++) {
+        out_event->historicalEventTimesMillis[historyIndex] =
+            env->CallLongMethod(motionEvent,
+                                gMotionEventClassInfo.getHistoricalEventTime,
+                                historyIndex);
+        out_event->historicalEventTimesNanos[historyIndex] =
+            out_event->historicalEventTimesMillis[historyIndex] * 1000000;
+        for (int i = 0; i < pointerCount; ++i) {
+            int pointerOffset = i * GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+            int historyAxisOffset = historyIndex * pointerCount *
+                                    GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+            float *axisValues =
+                &out_event
+                     ->historicalAxisValues[historyAxisOffset + pointerOffset];
+            for (int axisIndex = 0;
+                 axisIndex < GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+                 ++axisIndex) {
+                if (enabledAxes[axisIndex]) {
+                    axisValues[axisIndex] = env->CallFloatMethod(
+                        motionEvent,
+                        gMotionEventClassInfo.getHistoricalAxisValue, axisIndex,
+                        i, historyIndex);
+                }
+            }
+        }
+    }
+
+    out_event->deviceId =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getDeviceId);
+    out_event->source =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getSource);
+    out_event->action =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getAction);
+    out_event->eventTime =
+        env->CallLongMethod(motionEvent, gMotionEventClassInfo.getEventTime) *
+        1000000;
+    out_event->downTime =
+        env->CallLongMethod(motionEvent, gMotionEventClassInfo.getDownTime) *
+        1000000;
+    out_event->flags =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getFlags);
+    out_event->metaState =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getMetaState);
+    out_event->actionButton =
+        gMotionEventClassInfo.getActionButton
+            ? env->CallIntMethod(motionEvent,
+                                 gMotionEventClassInfo.getActionButton)
+            : 0;
+    out_event->buttonState =
+        gMotionEventClassInfo.getButtonState
+            ? env->CallIntMethod(motionEvent,
+                                 gMotionEventClassInfo.getButtonState)
+            : 0;
+    out_event->classification =
+        gMotionEventClassInfo.getClassification
+            ? env->CallIntMethod(motionEvent,
+                                 gMotionEventClassInfo.getClassification)
+            : 0;
+    out_event->edgeFlags =
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getEdgeFlags);
+    out_event->precisionX =
+        env->CallFloatMethod(motionEvent, gMotionEventClassInfo.getXPrecision);
+    out_event->precisionY =
+        env->CallFloatMethod(motionEvent, gMotionEventClassInfo.getYPrecision);
+}
+
+static struct {
+    jmethodID getDeviceId;
+    jmethodID getSource;
+    jmethodID getAction;
+
+    jmethodID getEventTime;
+    jmethodID getDownTime;
+
+    jmethodID getFlags;
+    jmethodID getMetaState;
+
+    jmethodID getModifiers;
+    jmethodID getRepeatCount;
+    jmethodID getKeyCode;
+    jmethodID getScanCode;
+    //jmethodID getUnicodeChar;
+} gKeyEventClassInfo;
+
+extern "C" void GameActivityKeyEvent_fromJava(JNIEnv *env, jobject keyEvent,
+                                              GameActivityKeyEvent *out_event) {
+    static bool gKeyEventClassInfoInitialized = false;
+    if (!gKeyEventClassInfoInitialized) {
+        int sdkVersion = GetSystemPropAsInt("ro.build.version.sdk");
+        gKeyEventClassInfo = {0};
+        jclass keyEventClass = env->FindClass("android/view/KeyEvent");
+        gKeyEventClassInfo.getDeviceId =
+            env->GetMethodID(keyEventClass, "getDeviceId", "()I");
+        gKeyEventClassInfo.getSource =
+            env->GetMethodID(keyEventClass, "getSource", "()I");
+        gKeyEventClassInfo.getAction =
+            env->GetMethodID(keyEventClass, "getAction", "()I");
+        gKeyEventClassInfo.getEventTime =
+            env->GetMethodID(keyEventClass, "getEventTime", "()J");
+        gKeyEventClassInfo.getDownTime =
+            env->GetMethodID(keyEventClass, "getDownTime", "()J");
+        gKeyEventClassInfo.getFlags =
+            env->GetMethodID(keyEventClass, "getFlags", "()I");
+        gKeyEventClassInfo.getMetaState =
+            env->GetMethodID(keyEventClass, "getMetaState", "()I");
+        if (sdkVersion >= 13) {
+            gKeyEventClassInfo.getModifiers =
+                env->GetMethodID(keyEventClass, "getModifiers", "()I");
+        }
+        gKeyEventClassInfo.getRepeatCount =
+            env->GetMethodID(keyEventClass, "getRepeatCount", "()I");
+        gKeyEventClassInfo.getKeyCode =
+            env->GetMethodID(keyEventClass, "getKeyCode", "()I");
+        gKeyEventClassInfo.getScanCode =
+            env->GetMethodID(keyEventClass, "getScanCode", "()I");
+        //gKeyEventClassInfo.getUnicodeChar =
+        //    env->GetMethodID(keyEventClass, "getUnicodeChar", "()I");
+
+        gKeyEventClassInfoInitialized = true;
+    }
+
+    *out_event = {
+        /*deviceId=*/env->CallIntMethod(keyEvent,
+                                        gKeyEventClassInfo.getDeviceId),
+        /*source=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getSource),
+        /*action=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getAction),
+        // TODO: introduce a millisecondsToNanoseconds helper:
+        /*eventTime=*/
+        env->CallLongMethod(keyEvent, gKeyEventClassInfo.getEventTime) *
+            1000000,
+        /*downTime=*/
+        env->CallLongMethod(keyEvent, gKeyEventClassInfo.getDownTime) * 1000000,
+        /*flags=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getFlags),
+        /*metaState=*/
+        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getMetaState),
+        /*modifiers=*/gKeyEventClassInfo.getModifiers
+            ? env->CallIntMethod(keyEvent, gKeyEventClassInfo.getModifiers)
+            : 0,
+        /*repeatCount=*/
+        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getRepeatCount),
+        /*keyCode=*/
+        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getKeyCode),
+        /*scanCode=*/
+        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getScanCode)
+        /*unicodeChar=*/
+        //env->CallIntMethod(keyEvent, gKeyEventClassInfo.getUnicodeChar)
+    };
+}
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.h b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.h
new file mode 100644
index 0000000..015ffbe
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.h
@@ -0,0 +1,336 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @addtogroup GameActivity Game Activity Events
+ * The interface to use Game Activity Events.
+ * @{
+ */
+
+/**
+ * @file GameActivityEvents.h
+ */
+#ifndef ANDROID_GAME_SDK_GAME_ACTIVITY_EVENTS_H
+#define ANDROID_GAME_SDK_GAME_ACTIVITY_EVENTS_H
+
+#include <android/input.h>
+#include <jni.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * The maximum number of axes supported in an Android MotionEvent.
+ * See https://developer.android.com/ndk/reference/group/input.
+ */
+#define GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT 48
+
+/**
+ * \brief Describe information about a pointer, found in a
+ * GameActivityMotionEvent.
+ *
+ * You can read values directly from this structure, or use helper functions
+ * (`GameActivityPointerAxes_getX`, `GameActivityPointerAxes_getY` and
+ * `GameActivityPointerAxes_getAxisValue`).
+ *
+ * The X axis and Y axis are enabled by default but any other axis that you want
+ * to read **must** be enabled first, using
+ * `GameActivityPointerAxes_enableAxis`.
+ *
+ * \see GameActivityMotionEvent
+ */
+typedef struct GameActivityPointerAxes {
+    int32_t id;
+    int32_t toolType;
+    float axisValues[GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT];
+    float rawX;
+    float rawY;
+} GameActivityPointerAxes;
+
+/** \brief Get the toolType of the pointer. */
+inline int32_t GameActivityPointerAxes_getToolType(
+    const GameActivityPointerAxes* pointerInfo) {
+    return pointerInfo->toolType;
+}
+
+/** \brief Get the current X coordinate of the pointer. */
+inline float GameActivityPointerAxes_getX(
+    const GameActivityPointerAxes* pointerInfo) {
+    return pointerInfo->axisValues[AMOTION_EVENT_AXIS_X];
+}
+
+/** \brief Get the current Y coordinate of the pointer. */
+inline float GameActivityPointerAxes_getY(
+    const GameActivityPointerAxes* pointerInfo) {
+    return pointerInfo->axisValues[AMOTION_EVENT_AXIS_Y];
+}
+
+/**
+ * \brief Enable the specified axis, so that its value is reported in the
+ * GameActivityPointerAxes structures stored in a motion event.
+ *
+ * You must enable any axis that you want to read, apart from
+ * `AMOTION_EVENT_AXIS_X` and `AMOTION_EVENT_AXIS_Y` that are enabled by
+ * default.
+ *
+ * If the axis index is out of range, nothing is done.
+ */
+void GameActivityPointerAxes_enableAxis(int32_t axis);
+
+/**
+ * \brief Disable the specified axis. Its value won't be reported in the
+ * GameActivityPointerAxes structures stored in a motion event anymore.
+ *
+ * Apart from X and Y, any axis that you want to read **must** be enabled first,
+ * using `GameActivityPointerAxes_enableAxis`.
+ *
+ * If the axis index is out of range, nothing is done.
+ */
+void GameActivityPointerAxes_disableAxis(int32_t axis);
+
+/**
+ * \brief Get the value of the requested axis.
+ *
+ * Apart from X and Y, any axis that you want to read **must** be enabled first,
+ * using `GameActivityPointerAxes_enableAxis`.
+ *
+ * Find the valid enums for the axis (`AMOTION_EVENT_AXIS_X`,
+ * `AMOTION_EVENT_AXIS_Y`, `AMOTION_EVENT_AXIS_PRESSURE`...)
+ * in https://developer.android.com/ndk/reference/group/input.
+ *
+ * @param pointerInfo The structure containing information about the pointer,
+ * obtained from GameActivityMotionEvent.
+ * @param axis The axis to get the value from
+ * @return The value of the axis, or 0 if the axis is invalid or was not
+ * enabled.
+ */
+float GameActivityPointerAxes_getAxisValue(
+    const GameActivityPointerAxes* pointerInfo, int32_t axis);
+
+inline float GameActivityPointerAxes_getPressure(
+    const GameActivityPointerAxes* pointerInfo) {
+    return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                                AMOTION_EVENT_AXIS_PRESSURE);
+}
+
+inline float GameActivityPointerAxes_getSize(
+    const GameActivityPointerAxes* pointerInfo) {
+    return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                                AMOTION_EVENT_AXIS_SIZE);
+}
+
+inline float GameActivityPointerAxes_getTouchMajor(
+    const GameActivityPointerAxes* pointerInfo) {
+    return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                                AMOTION_EVENT_AXIS_TOUCH_MAJOR);
+}
+
+inline float GameActivityPointerAxes_getTouchMinor(
+    const GameActivityPointerAxes* pointerInfo) {
+    return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                                AMOTION_EVENT_AXIS_TOUCH_MINOR);
+}
+
+inline float GameActivityPointerAxes_getToolMajor(
+    const GameActivityPointerAxes* pointerInfo) {
+    return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                                AMOTION_EVENT_AXIS_TOOL_MAJOR);
+}
+
+inline float GameActivityPointerAxes_getToolMinor(
+    const GameActivityPointerAxes* pointerInfo) {
+    return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                                AMOTION_EVENT_AXIS_TOOL_MINOR);
+}
+
+inline float GameActivityPointerAxes_getOrientation(
+    const GameActivityPointerAxes* pointerInfo) {
+    return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                                AMOTION_EVENT_AXIS_ORIENTATION);
+}
+
+/**
+ * The maximum number of pointers returned inside a motion event.
+ */
+#if (defined GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT_OVERRIDE)
+#define GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT \
+    GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT_OVERRIDE
+#else
+#define GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT 8
+#endif
+
+/**
+ * \brief Describe a motion event that happened on the GameActivity SurfaceView.
+ *
+ * This is 1:1 mapping to the information contained in a Java `MotionEvent`
+ * (see https://developer.android.com/reference/android/view/MotionEvent).
+ */
+typedef struct GameActivityMotionEvent {
+    int32_t deviceId;
+    int32_t source;
+    int32_t action;
+
+    int64_t eventTime;
+    int64_t downTime;
+
+    int32_t flags;
+    int32_t metaState;
+
+    int32_t actionButton;
+    int32_t buttonState;
+    int32_t classification;
+    int32_t edgeFlags;
+
+    uint32_t pointerCount;
+    GameActivityPointerAxes
+        pointers[GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT];
+
+    int historySize;
+    int64_t* historicalEventTimesMillis;
+    int64_t* historicalEventTimesNanos;
+    float* historicalAxisValues;
+
+    float precisionX;
+    float precisionY;
+} GameActivityMotionEvent;
+
+float GameActivityMotionEvent_getHistoricalAxisValue(
+    const GameActivityMotionEvent* event, int axis, int pointerIndex,
+    int historyPos);
+
+inline int GameActivityMotionEvent_getHistorySize(
+    const GameActivityMotionEvent* event) {
+    return event->historySize;
+}
+
+inline float GameActivityMotionEvent_getHistoricalX(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_X, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalY(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_Y, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalPressure(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_PRESSURE, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalSize(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_SIZE, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalTouchMajor(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_TOUCH_MAJOR, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalTouchMinor(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_TOUCH_MINOR, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalToolMajor(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_TOOL_MAJOR, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalToolMinor(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_TOOL_MINOR, pointerIndex, historyPos);
+}
+
+inline float GameActivityMotionEvent_getHistoricalOrientation(
+    const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
+    return GameActivityMotionEvent_getHistoricalAxisValue(
+        event, AMOTION_EVENT_AXIS_ORIENTATION, pointerIndex, historyPos);
+}
+
+/** \brief Handle the freeing of the GameActivityMotionEvent struct. */
+void GameActivityMotionEvent_destroy(GameActivityMotionEvent* c_event);
+
+/**
+ * \brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`.
+ *
+ * This is done automatically by the GameActivity: see `onTouchEvent` to set
+ * a callback to consume the received events.
+ * This function can be used if you re-implement events handling in your own
+ * activity.
+ * Ownership of out_event is maintained by the caller.
+ */
+void GameActivityMotionEvent_fromJava(JNIEnv* env, jobject motionEvent,
+                                      GameActivityMotionEvent* out_event);
+
+/**
+ * \brief Describe a key event that happened on the GameActivity SurfaceView.
+ *
+ * This is 1:1 mapping to the information contained in a Java `KeyEvent`
+ * (see https://developer.android.com/reference/android/view/KeyEvent).
+ * The only exception is the event times, which are reported as
+ * nanoseconds in this struct.
+ */
+typedef struct GameActivityKeyEvent {
+    int32_t deviceId;
+    int32_t source;
+    int32_t action;
+
+    int64_t eventTime;
+    int64_t downTime;
+
+    int32_t flags;
+    int32_t metaState;
+
+    int32_t modifiers;
+    int32_t repeatCount;
+    int32_t keyCode;
+    int32_t scanCode;
+    //int32_t unicodeChar;
+} GameActivityKeyEvent;
+
+/**
+ * \brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.
+ *
+ * This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`
+ * to set a callback to consume the received events.
+ * This function can be used if you re-implement events handling in your own
+ * activity.
+ * Ownership of out_event is maintained by the caller.
+ */
+void GameActivityKeyEvent_fromJava(JNIEnv* env, jobject motionEvent,
+                                   GameActivityKeyEvent* out_event);
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @} */
+
+#endif  // ANDROID_GAME_SDK_GAME_ACTIVITY_EVENTS_H
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityLog.h b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityLog.h
new file mode 100644
index 0000000..ba9a9e9
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityLog.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ANDROID_GAME_SDK_GAME_ACTIVITY_LOG_H_
+#define ANDROID_GAME_SDK_GAME_ACTIVITY_LOG_H_
+
+#define LOG_TAG "GameActivity"
+#include <android/log.h>
+
+#define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__);
+#define ALOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__);
+#define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__);
+#ifdef NDEBUG
+#define ALOGV(...)
+#else
+#define ALOGV(...) \
+    __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__);
+#endif
+
+/* Returns 2nd arg.  Used to substitute default value if caller's vararg list
+ * is empty.
+ */
+#define __android_second(first, second, ...) second
+
+/* If passed multiple args, returns ',' followed by all but 1st arg, otherwise
+ * returns nothing.
+ */
+#define __android_rest(first, ...) , ##__VA_ARGS__
+
+#define android_printAssert(cond, tag, fmt...) \
+    __android_log_assert(cond, tag,            \
+                         __android_second(0, ##fmt, NULL) __android_rest(fmt))
+
+#define CONDITION(cond) (__builtin_expect((cond) != 0, 0))
+
+#ifndef LOG_ALWAYS_FATAL_IF
+#define LOG_ALWAYS_FATAL_IF(cond, ...)                                \
+    ((CONDITION(cond))                                                \
+         ? ((void)android_printAssert(#cond, LOG_TAG, ##__VA_ARGS__)) \
+         : (void)0)
+#endif
+
+#ifndef LOG_ALWAYS_FATAL
+#define LOG_ALWAYS_FATAL(...) \
+    (((void)android_printAssert(NULL, LOG_TAG, ##__VA_ARGS__)))
+#endif
+
+/*
+ * Simplified macro to send a warning system log message using current LOG_TAG.
+ */
+#ifndef SLOGW
+#define SLOGW(...) \
+    ((void)__android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__))
+#endif
+
+#ifndef SLOGW_IF
+#define SLOGW_IF(cond, ...)                                                    \
+    ((__predict_false(cond))                                                   \
+         ? ((void)__android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)) \
+         : (void)0)
+#endif
+
+/*
+ * Versions of LOG_ALWAYS_FATAL_IF and LOG_ALWAYS_FATAL that
+ * are stripped out of release builds.
+ */
+#if LOG_NDEBUG
+
+#ifndef LOG_FATAL_IF
+#define LOG_FATAL_IF(cond, ...) ((void)0)
+#endif
+#ifndef LOG_FATAL
+#define LOG_FATAL(...) ((void)0)
+#endif
+
+#else
+
+#ifndef LOG_FATAL_IF
+#define LOG_FATAL_IF(cond, ...) LOG_ALWAYS_FATAL_IF(cond, ##__VA_ARGS__)
+#endif
+#ifndef LOG_FATAL
+#define LOG_FATAL(...) LOG_ALWAYS_FATAL(__VA_ARGS__)
+#endif
+
+#endif
+
+/*
+ * Assertion that generates a log message when the assertion fails.
+ * Stripped out of release builds.  Uses the current LOG_TAG.
+ */
+#ifndef ALOG_ASSERT
+#define ALOG_ASSERT(cond, ...) LOG_FATAL_IF(!(cond), ##__VA_ARGS__)
+#endif
+
+#define LOG_TRACE(...)
+
+#endif  // ANDROID_GAME_SDK_GAME_ACTIVITY_LOG_H_
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.c b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.c
new file mode 100644
index 0000000..a7bcb85
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.c
@@ -0,0 +1,732 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "android_native_app_glue.h"
+
+#include <android/log.h>
+#include <assert.h>
+#include <errno.h>
+#include <jni.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+#define NATIVE_APP_GLUE_MOTION_EVENTS_DEFAULT_BUF_SIZE 16
+#define NATIVE_APP_GLUE_KEY_EVENTS_DEFAULT_BUF_SIZE 4
+
+#define LOGI(...) \
+    ((void)__android_log_print(ANDROID_LOG_INFO, "threaded_app", __VA_ARGS__))
+#define LOGE(...) \
+    ((void)__android_log_print(ANDROID_LOG_ERROR, "threaded_app", __VA_ARGS__))
+#define LOGW(...) \
+    ((void)__android_log_print(ANDROID_LOG_WARN, "threaded_app", __VA_ARGS__))
+#define LOGW_ONCE(...)                                        \
+    do {                                                       \
+        static bool alogw_once##__FILE__##__LINE__##__ = true; \
+        if (alogw_once##__FILE__##__LINE__##__) {              \
+            alogw_once##__FILE__##__LINE__##__ = false;        \
+            LOGW(__VA_ARGS__);                                \
+        }                                                      \
+    } while (0)
+
+/* For debug builds, always enable the debug traces in this library */
+#ifndef NDEBUG
+#define LOGV(...)                                                   \
+    ((void)__android_log_print(ANDROID_LOG_VERBOSE, "threaded_app", \
+                               __VA_ARGS__))
+#else
+#define LOGV(...) ((void)0)
+#endif
+
+static void free_saved_state(struct android_app* android_app) {
+    pthread_mutex_lock(&android_app->mutex);
+    if (android_app->savedState != NULL) {
+        free(android_app->savedState);
+        android_app->savedState = NULL;
+        android_app->savedStateSize = 0;
+    }
+    pthread_mutex_unlock(&android_app->mutex);
+}
+
+int8_t android_app_read_cmd(struct android_app* android_app) {
+    int8_t cmd;
+    if (read(android_app->msgread, &cmd, sizeof(cmd)) != sizeof(cmd)) {
+        LOGE("No data on command pipe!");
+        return -1;
+    }
+    if (cmd == APP_CMD_SAVE_STATE) free_saved_state(android_app);
+    return cmd;
+}
+
+static void print_cur_config(struct android_app* android_app) {
+    char lang[2], country[2];
+    AConfiguration_getLanguage(android_app->config, lang);
+    AConfiguration_getCountry(android_app->config, country);
+
+    LOGV(
+        "Config: mcc=%d mnc=%d lang=%c%c cnt=%c%c orien=%d touch=%d dens=%d "
+        "keys=%d nav=%d keysHid=%d navHid=%d sdk=%d size=%d long=%d "
+        "modetype=%d modenight=%d",
+        AConfiguration_getMcc(android_app->config),
+        AConfiguration_getMnc(android_app->config), lang[0], lang[1],
+        country[0], country[1],
+        AConfiguration_getOrientation(android_app->config),
+        AConfiguration_getTouchscreen(android_app->config),
+        AConfiguration_getDensity(android_app->config),
+        AConfiguration_getKeyboard(android_app->config),
+        AConfiguration_getNavigation(android_app->config),
+        AConfiguration_getKeysHidden(android_app->config),
+        AConfiguration_getNavHidden(android_app->config),
+        AConfiguration_getSdkVersion(android_app->config),
+        AConfiguration_getScreenSize(android_app->config),
+        AConfiguration_getScreenLong(android_app->config),
+        AConfiguration_getUiModeType(android_app->config),
+        AConfiguration_getUiModeNight(android_app->config));
+}
+
+void android_app_pre_exec_cmd(struct android_app* android_app, int8_t cmd) {
+    switch (cmd) {
+        case UNUSED_APP_CMD_INPUT_CHANGED:
+            LOGV("UNUSED_APP_CMD_INPUT_CHANGED");
+            // Do nothing. This can be used in the future to handle AInputQueue
+            // natively, like done in NativeActivity.
+            break;
+
+        case APP_CMD_INIT_WINDOW:
+            LOGV("APP_CMD_INIT_WINDOW");
+            pthread_mutex_lock(&android_app->mutex);
+            android_app->window = android_app->pendingWindow;
+            pthread_cond_broadcast(&android_app->cond);
+            pthread_mutex_unlock(&android_app->mutex);
+            break;
+
+        case APP_CMD_TERM_WINDOW:
+            LOGV("APP_CMD_TERM_WINDOW");
+            pthread_cond_broadcast(&android_app->cond);
+            break;
+
+        case APP_CMD_RESUME:
+        case APP_CMD_START:
+        case APP_CMD_PAUSE:
+        case APP_CMD_STOP:
+            LOGV("activityState=%d", cmd);
+            pthread_mutex_lock(&android_app->mutex);
+            android_app->activityState = cmd;
+            pthread_cond_broadcast(&android_app->cond);
+            pthread_mutex_unlock(&android_app->mutex);
+            break;
+
+        case APP_CMD_CONFIG_CHANGED:
+            LOGV("APP_CMD_CONFIG_CHANGED");
+            AConfiguration_fromAssetManager(
+                android_app->config, android_app->activity->assetManager);
+            print_cur_config(android_app);
+            break;
+
+        case APP_CMD_DESTROY:
+            LOGV("APP_CMD_DESTROY");
+            android_app->destroyRequested = 1;
+            break;
+    }
+}
+
+void android_app_post_exec_cmd(struct android_app* android_app, int8_t cmd) {
+    switch (cmd) {
+        case APP_CMD_TERM_WINDOW:
+            LOGV("APP_CMD_TERM_WINDOW");
+            pthread_mutex_lock(&android_app->mutex);
+            android_app->window = NULL;
+            pthread_cond_broadcast(&android_app->cond);
+            pthread_mutex_unlock(&android_app->mutex);
+            break;
+
+        case APP_CMD_SAVE_STATE:
+            LOGV("APP_CMD_SAVE_STATE");
+            pthread_mutex_lock(&android_app->mutex);
+            android_app->stateSaved = 1;
+            pthread_cond_broadcast(&android_app->cond);
+            pthread_mutex_unlock(&android_app->mutex);
+            break;
+
+        case APP_CMD_RESUME:
+            free_saved_state(android_app);
+            break;
+    }
+}
+
+void app_dummy() {}
+
+static void android_app_destroy(struct android_app* android_app) {
+    LOGV("android_app_destroy!");
+    free_saved_state(android_app);
+    pthread_mutex_lock(&android_app->mutex);
+
+    AConfiguration_delete(android_app->config);
+    android_app->destroyed = 1;
+    pthread_cond_broadcast(&android_app->cond);
+    pthread_mutex_unlock(&android_app->mutex);
+    // Can't touch android_app object after this.
+}
+
+static void process_cmd(struct android_app* app,
+                        struct android_poll_source* source) {
+    int8_t cmd = android_app_read_cmd(app);
+    android_app_pre_exec_cmd(app, cmd);
+    if (app->onAppCmd != NULL) app->onAppCmd(app, cmd);
+    android_app_post_exec_cmd(app, cmd);
+}
+
+// This is run on a separate thread (i.e: not the main thread).
+static void* android_app_entry(void* param) {
+    struct android_app* android_app = (struct android_app*)param;
+    int input_buf_idx = 0;
+
+    LOGV("android_app_entry called");
+    android_app->config = AConfiguration_new();
+    LOGV("android_app = %p", android_app);
+    LOGV("config = %p", android_app->config);
+    LOGV("activity = %p", android_app->activity);
+    LOGV("assetmanager = %p", android_app->activity->assetManager);
+    AConfiguration_fromAssetManager(android_app->config,
+                                    android_app->activity->assetManager);
+
+    print_cur_config(android_app);
+
+    /* initialize event buffers */
+    for (input_buf_idx = 0; input_buf_idx < NATIVE_APP_GLUE_MAX_INPUT_BUFFERS; input_buf_idx++) {
+        struct android_input_buffer *buf = &android_app->inputBuffers[input_buf_idx];
+
+        buf->motionEventsBufferSize = NATIVE_APP_GLUE_MOTION_EVENTS_DEFAULT_BUF_SIZE;
+        buf->motionEvents = (GameActivityMotionEvent *) malloc(sizeof(GameActivityMotionEvent) *
+                                                               buf->motionEventsBufferSize);
+
+        buf->keyEventsBufferSize = NATIVE_APP_GLUE_KEY_EVENTS_DEFAULT_BUF_SIZE;
+        buf->keyEvents = (GameActivityKeyEvent *) malloc(sizeof(GameActivityKeyEvent) *
+                                                         buf->keyEventsBufferSize);
+    }
+
+    android_app->cmdPollSource.id = LOOPER_ID_MAIN;
+    android_app->cmdPollSource.app = android_app;
+    android_app->cmdPollSource.process = process_cmd;
+
+    ALooper* looper = ALooper_prepare(ALOOPER_PREPARE_ALLOW_NON_CALLBACKS);
+    ALooper_addFd(looper, android_app->msgread, LOOPER_ID_MAIN,
+                  ALOOPER_EVENT_INPUT, NULL, &android_app->cmdPollSource);
+    android_app->looper = looper;
+
+    pthread_mutex_lock(&android_app->mutex);
+    android_app->running = 1;
+    pthread_cond_broadcast(&android_app->cond);
+    pthread_mutex_unlock(&android_app->mutex);
+
+    _rust_glue_entry(android_app);
+
+    android_app_destroy(android_app);
+    return NULL;
+}
+
+// Codes from https://developer.android.com/reference/android/view/KeyEvent
+#define KEY_EVENT_KEYCODE_VOLUME_DOWN 25
+#define KEY_EVENT_KEYCODE_VOLUME_MUTE 164
+#define KEY_EVENT_KEYCODE_VOLUME_UP 24
+#define KEY_EVENT_KEYCODE_CAMERA 27
+#define KEY_EVENT_KEYCODE_ZOOM_IN 168
+#define KEY_EVENT_KEYCODE_ZOOM_OUT 169
+
+// Double-buffer the key event filter to avoid race condition.
+static bool default_key_filter(const GameActivityKeyEvent* event) {
+    // Ignore camera, volume, etc. buttons
+    return !(event->keyCode == KEY_EVENT_KEYCODE_VOLUME_DOWN ||
+             event->keyCode == KEY_EVENT_KEYCODE_VOLUME_MUTE ||
+             event->keyCode == KEY_EVENT_KEYCODE_VOLUME_UP ||
+             event->keyCode == KEY_EVENT_KEYCODE_CAMERA ||
+             event->keyCode == KEY_EVENT_KEYCODE_ZOOM_IN ||
+             event->keyCode == KEY_EVENT_KEYCODE_ZOOM_OUT);
+}
+
+// See
+// https://developer.android.com/reference/android/view/InputDevice#SOURCE_TOUCHSCREEN
+#define SOURCE_TOUCHSCREEN 0x00001002
+
+static bool default_motion_filter(const GameActivityMotionEvent* event) {
+    // Ignore any non-touch events.
+    return event->source == SOURCE_TOUCHSCREEN;
+}
+
+// --------------------------------------------------------------------
+// Native activity interaction (called from main thread)
+// --------------------------------------------------------------------
+
+static struct android_app* android_app_create(GameActivity* activity,
+                                              void* savedState,
+                                              size_t savedStateSize) {
+    //  struct android_app* android_app = calloc(1, sizeof(struct android_app));
+    struct android_app* android_app =
+        (struct android_app*)malloc(sizeof(struct android_app));
+    memset(android_app, 0, sizeof(struct android_app));
+    android_app->activity = activity;
+
+    pthread_mutex_init(&android_app->mutex, NULL);
+    pthread_cond_init(&android_app->cond, NULL);
+
+    if (savedState != NULL) {
+        android_app->savedState = malloc(savedStateSize);
+        android_app->savedStateSize = savedStateSize;
+        memcpy(android_app->savedState, savedState, savedStateSize);
+    }
+
+    int msgpipe[2];
+    if (pipe(msgpipe)) {
+        LOGE("could not create pipe: %s", strerror(errno));
+        return NULL;
+    }
+    android_app->msgread = msgpipe[0];
+    android_app->msgwrite = msgpipe[1];
+
+    android_app->keyEventFilter = default_key_filter;
+    android_app->motionEventFilter = default_motion_filter;
+
+    LOGV("Launching android_app_entry in a thread");
+    pthread_attr_t attr;
+    pthread_attr_init(&attr);
+    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+    pthread_create(&android_app->thread, &attr, android_app_entry, android_app);
+
+    // Wait for thread to start.
+    pthread_mutex_lock(&android_app->mutex);
+    while (!android_app->running) {
+        pthread_cond_wait(&android_app->cond, &android_app->mutex);
+    }
+    pthread_mutex_unlock(&android_app->mutex);
+
+    return android_app;
+}
+
+static void android_app_write_cmd(struct android_app* android_app, int8_t cmd) {
+    if (write(android_app->msgwrite, &cmd, sizeof(cmd)) != sizeof(cmd)) {
+        LOGE("Failure writing android_app cmd: %s", strerror(errno));
+    }
+}
+
+static void android_app_set_window(struct android_app* android_app,
+                                   ANativeWindow* window) {
+    LOGV("android_app_set_window called");
+    pthread_mutex_lock(&android_app->mutex);
+
+    // NB: we have to consider that the native thread could have already
+    // (gracefully) exit (setting android_app->destroyed) and so we need
+    // to be careful to avoid a deadlock waiting for a thread that's
+    // already exit.
+    if (android_app->destroyed) {
+        pthread_mutex_unlock(&android_app->mutex);
+        return;
+    }
+    if (android_app->pendingWindow != NULL) {
+        android_app_write_cmd(android_app, APP_CMD_TERM_WINDOW);
+    }
+    android_app->pendingWindow = window;
+    if (window != NULL) {
+        android_app_write_cmd(android_app, APP_CMD_INIT_WINDOW);
+    }
+    while (android_app->window != android_app->pendingWindow) {
+        pthread_cond_wait(&android_app->cond, &android_app->mutex);
+    }
+    pthread_mutex_unlock(&android_app->mutex);
+}
+
+static void android_app_set_activity_state(struct android_app* android_app,
+                                           int8_t cmd) {
+    pthread_mutex_lock(&android_app->mutex);
+
+    // NB: we have to consider that the native thread could have already
+    // (gracefully) exit (setting android_app->destroyed) and so we need
+    // to be careful to avoid a deadlock waiting for a thread that's
+    // already exit.
+    if (!android_app->destroyed) {
+        android_app_write_cmd(android_app, cmd);
+        while (android_app->activityState != cmd) {
+            pthread_cond_wait(&android_app->cond, &android_app->mutex);
+        }
+    }
+    pthread_mutex_unlock(&android_app->mutex);
+}
+
+static void android_app_free(struct android_app* android_app) {
+    int input_buf_idx = 0;
+
+    pthread_mutex_lock(&android_app->mutex);
+
+    // It's possible that onDestroy is called after we have already 'destroyed'
+    // the app (via `android_app_destroy` due to `android_main` returning.
+    //
+    // In this case `->destroyed` will already be set (so we won't deadlock in
+    // the loop below) but we still need to close the messaging fds and finish
+    // freeing the android_app
+
+    android_app_write_cmd(android_app, APP_CMD_DESTROY);
+    while (!android_app->destroyed) {
+        pthread_cond_wait(&android_app->cond, &android_app->mutex);
+    }
+    pthread_mutex_unlock(&android_app->mutex);
+
+    for (input_buf_idx = 0; input_buf_idx < NATIVE_APP_GLUE_MAX_INPUT_BUFFERS; input_buf_idx++) {
+        struct android_input_buffer *buf = &android_app->inputBuffers[input_buf_idx];
+
+        android_app_clear_motion_events(buf);
+        free(buf->motionEvents);
+        free(buf->keyEvents);
+    }
+
+    close(android_app->msgread);
+    close(android_app->msgwrite);
+    pthread_cond_destroy(&android_app->cond);
+    pthread_mutex_destroy(&android_app->mutex);
+    free(android_app);
+}
+
+static inline struct android_app* ToApp(GameActivity* activity) {
+    return (struct android_app*)activity->instance;
+}
+
+static void onDestroy(GameActivity* activity) {
+    LOGV("Destroy: %p", activity);
+    android_app_free(ToApp(activity));
+}
+
+static void onStart(GameActivity* activity) {
+    LOGV("Start: %p", activity);
+    android_app_set_activity_state(ToApp(activity), APP_CMD_START);
+}
+
+static void onResume(GameActivity* activity) {
+    LOGV("Resume: %p", activity);
+    android_app_set_activity_state(ToApp(activity), APP_CMD_RESUME);
+}
+
+static void onSaveInstanceState(GameActivity* activity,
+                                SaveInstanceStateRecallback recallback,
+                                void* context) {
+    LOGV("SaveInstanceState: %p", activity);
+
+    struct android_app* android_app = ToApp(activity);
+    pthread_mutex_lock(&android_app->mutex);
+
+    // NB: we have to consider that the native thread could have already
+    // (gracefully) exit (setting android_app->destroyed) and so we need
+    // to be careful to avoid a deadlock waiting for a thread that's
+    // already exit.
+    if (android_app->destroyed) {
+        pthread_mutex_unlock(&android_app->mutex);
+        return;
+    }
+
+    android_app->stateSaved = 0;
+    android_app_write_cmd(android_app, APP_CMD_SAVE_STATE);
+    while (!android_app->stateSaved) {
+        pthread_cond_wait(&android_app->cond, &android_app->mutex);
+    }
+
+    if (android_app->savedState != NULL) {
+        // Tell the Java side about our state.
+        recallback((const char*)android_app->savedState,
+                   android_app->savedStateSize, context);
+        // Now we can free it.
+        free(android_app->savedState);
+        android_app->savedState = NULL;
+        android_app->savedStateSize = 0;
+    }
+
+    pthread_mutex_unlock(&android_app->mutex);
+}
+
+static void onPause(GameActivity* activity) {
+    LOGV("Pause: %p", activity);
+    android_app_set_activity_state(ToApp(activity), APP_CMD_PAUSE);
+}
+
+static void onStop(GameActivity* activity) {
+    LOGV("Stop: %p", activity);
+    android_app_set_activity_state(ToApp(activity), APP_CMD_STOP);
+}
+
+static void onConfigurationChanged(GameActivity* activity) {
+    LOGV("ConfigurationChanged: %p", activity);
+    android_app_write_cmd(ToApp(activity), APP_CMD_CONFIG_CHANGED);
+}
+
+static void onTrimMemory(GameActivity* activity, int level) {
+    LOGV("TrimMemory: %p %d", activity, level);
+    android_app_write_cmd(ToApp(activity), APP_CMD_LOW_MEMORY);
+}
+
+static void onWindowFocusChanged(GameActivity* activity, bool focused) {
+    LOGV("WindowFocusChanged: %p -- %d", activity, focused);
+    android_app_write_cmd(ToApp(activity),
+                          focused ? APP_CMD_GAINED_FOCUS : APP_CMD_LOST_FOCUS);
+}
+
+static void onNativeWindowCreated(GameActivity* activity,
+                                  ANativeWindow* window) {
+    LOGV("NativeWindowCreated: %p -- %p", activity, window);
+    android_app_set_window(ToApp(activity), window);
+}
+
+static void onNativeWindowDestroyed(GameActivity* activity,
+                                    ANativeWindow* window) {
+    LOGV("NativeWindowDestroyed: %p -- %p", activity, window);
+    android_app_set_window(ToApp(activity), NULL);
+}
+
+static void onNativeWindowRedrawNeeded(GameActivity* activity,
+                                       ANativeWindow* window) {
+    LOGV("NativeWindowRedrawNeeded: %p -- %p", activity, window);
+    android_app_write_cmd(ToApp(activity), APP_CMD_WINDOW_REDRAW_NEEDED);
+}
+
+static void onNativeWindowResized(GameActivity* activity, ANativeWindow* window,
+                                  int32_t width, int32_t height) {
+    LOGV("NativeWindowResized: %p -- %p ( %d x %d )", activity, window, width,
+         height);
+    android_app_write_cmd(ToApp(activity), APP_CMD_WINDOW_RESIZED);
+}
+
+void android_app_set_motion_event_filter(struct android_app* app,
+                                         android_motion_event_filter filter) {
+    pthread_mutex_lock(&app->mutex);
+    app->motionEventFilter = filter;
+    pthread_mutex_unlock(&app->mutex);
+}
+
+bool android_app_input_available_wake_up(struct android_app* app) {
+    pthread_mutex_lock(&app->mutex);
+    bool available = app->inputAvailableWakeUp;
+    app->inputAvailableWakeUp = false;
+    pthread_mutex_unlock(&app->mutex);
+    return available;
+}
+
+// NB: should be called with the android_app->mutex held already
+static void notifyInput(struct android_app* android_app) {
+    // Don't spam the mainloop with wake ups if we've already sent one
+    if (android_app->inputSwapPending) {
+        return;
+    }
+
+    if (android_app->looper != NULL) {
+        // for the app thread to know why it received the wake() up
+        android_app->inputAvailableWakeUp = true;
+        android_app->inputSwapPending = true;
+        ALooper_wake(android_app->looper);
+    }
+}
+
+static bool onTouchEvent(GameActivity* activity,
+                         const GameActivityMotionEvent* event) {
+    struct android_app* android_app = ToApp(activity);
+    pthread_mutex_lock(&android_app->mutex);
+
+    // NB: we have to consider that the native thread could have already
+    // (gracefully) exit (setting android_app->destroyed) and so we need
+    // to be careful to avoid a deadlock waiting for a thread that's
+    // already exit.
+    if (android_app->destroyed) {
+        pthread_mutex_unlock(&android_app->mutex);
+        return false;
+    }
+
+    if (android_app->motionEventFilter != NULL &&
+        !android_app->motionEventFilter(event)) {
+        pthread_mutex_unlock(&android_app->mutex);
+        return false;
+    }
+
+    struct android_input_buffer* inputBuffer =
+        &android_app->inputBuffers[android_app->currentInputBuffer];
+
+    // Add to the list of active motion events
+    if (inputBuffer->motionEventsCount >= inputBuffer->motionEventsBufferSize) {
+        inputBuffer->motionEventsBufferSize *= 2;
+        inputBuffer->motionEvents = (GameActivityMotionEvent *) realloc(inputBuffer->motionEvents,
+            sizeof(GameActivityMotionEvent) * inputBuffer->motionEventsBufferSize);
+
+        if (inputBuffer->motionEvents == NULL) {
+            LOGE("onTouchEvent: out of memory");
+            abort();
+        }
+    }
+
+    int new_ix = inputBuffer->motionEventsCount;
+    memcpy(&inputBuffer->motionEvents[new_ix], event, sizeof(GameActivityMotionEvent));
+    ++inputBuffer->motionEventsCount;
+    notifyInput(android_app);
+
+    pthread_mutex_unlock(&android_app->mutex);
+    return true;
+}
+
+struct android_input_buffer* android_app_swap_input_buffers(
+    struct android_app* android_app) {
+    pthread_mutex_lock(&android_app->mutex);
+
+    struct android_input_buffer* inputBuffer =
+        &android_app->inputBuffers[android_app->currentInputBuffer];
+
+    if (inputBuffer->motionEventsCount == 0 &&
+        inputBuffer->keyEventsCount == 0) {
+        inputBuffer = NULL;
+    } else {
+        android_app->currentInputBuffer =
+            (android_app->currentInputBuffer + 1) %
+            NATIVE_APP_GLUE_MAX_INPUT_BUFFERS;
+    }
+
+    android_app->inputSwapPending = false;
+    android_app->inputAvailableWakeUp = false;
+
+    pthread_mutex_unlock(&android_app->mutex);
+
+    return inputBuffer;
+}
+
+void android_app_clear_motion_events(struct android_input_buffer* inputBuffer) {
+    // We do not need to lock here if the inputBuffer has already been swapped
+    // as is handled by the game loop thread
+    while (inputBuffer->motionEventsCount > 0) {
+        GameActivityMotionEvent_destroy(
+            &inputBuffer->motionEvents[inputBuffer->motionEventsCount - 1]);
+
+        inputBuffer->motionEventsCount--;
+    }
+    assert(inputBuffer->motionEventsCount == 0);
+}
+
+void android_app_set_key_event_filter(struct android_app* app,
+                                      android_key_event_filter filter) {
+    pthread_mutex_lock(&app->mutex);
+    app->keyEventFilter = filter;
+    pthread_mutex_unlock(&app->mutex);
+}
+
+static bool onKey(GameActivity* activity, const GameActivityKeyEvent* event) {
+    struct android_app* android_app = ToApp(activity);
+    pthread_mutex_lock(&android_app->mutex);
+
+    // NB: we have to consider that the native thread could have already
+    // (gracefully) exit (setting android_app->destroyed) and so we need
+    // to be careful to avoid a deadlock waiting for a thread that's
+    // already exit.
+    if (android_app->destroyed) {
+        pthread_mutex_unlock(&android_app->mutex);
+        return false;
+    }
+
+    if (android_app->keyEventFilter != NULL &&
+        !android_app->keyEventFilter(event)) {
+        pthread_mutex_unlock(&android_app->mutex);
+        return false;
+    }
+
+    struct android_input_buffer* inputBuffer =
+        &android_app->inputBuffers[android_app->currentInputBuffer];
+
+    // Add to the list of active key down events
+    if (inputBuffer->keyEventsCount >= inputBuffer->keyEventsBufferSize) {
+        inputBuffer->keyEventsBufferSize = inputBuffer->keyEventsBufferSize * 2;
+        inputBuffer->keyEvents = (GameActivityKeyEvent *) realloc(inputBuffer->keyEvents,
+            sizeof(GameActivityKeyEvent) * inputBuffer->keyEventsBufferSize);
+
+        if (inputBuffer->keyEvents == NULL) {
+            LOGE("onKey: out of memory");
+            abort();
+        }
+    }
+
+    int new_ix = inputBuffer->keyEventsCount;
+    memcpy(&inputBuffer->keyEvents[new_ix], event, sizeof(GameActivityKeyEvent));
+    ++inputBuffer->keyEventsCount;
+    notifyInput(android_app);
+
+    pthread_mutex_unlock(&android_app->mutex);
+    return true;
+}
+
+void android_app_clear_key_events(struct android_input_buffer* inputBuffer) {
+    inputBuffer->keyEventsCount = 0;
+}
+
+static void onTextInputEvent(GameActivity* activity,
+                             const GameTextInputState* state) {
+    struct android_app* android_app = ToApp(activity);
+    pthread_mutex_lock(&android_app->mutex);
+    if (!android_app->destroyed) {
+        android_app->textInputState = 1;
+        notifyInput(android_app);
+    }
+    pthread_mutex_unlock(&android_app->mutex);
+}
+
+static void onWindowInsetsChanged(GameActivity* activity) {
+    LOGV("WindowInsetsChanged: %p", activity);
+    android_app_write_cmd(ToApp(activity), APP_CMD_WINDOW_INSETS_CHANGED);
+}
+
+static void onContentRectChanged(GameActivity* activity, const ARect *rect) {
+    LOGV("ContentRectChanged: %p -- (%d %d) (%d %d)", activity, rect->left, rect->top,
+         rect->right, rect->bottom);
+
+    struct android_app* android_app = ToApp(activity);
+
+    pthread_mutex_lock(&android_app->mutex);
+    android_app->contentRect = *rect;
+
+    android_app_write_cmd(android_app, APP_CMD_CONTENT_RECT_CHANGED);
+    pthread_mutex_unlock(&android_app->mutex);
+}
+
+// XXX: This symbol is renamed with a _C suffix and then re-exported from
+// Rust because Rust/Cargo don't give us a way to directly export symbols
+// from C/C++ code: https://github.com/rust-lang/rfcs/issues/2771
+//
+JNIEXPORT
+void GameActivity_onCreate_C(GameActivity* activity, void* savedState,
+                           size_t savedStateSize) {
+    LOGV("Creating: %p", activity);
+    activity->callbacks->onDestroy = onDestroy;
+    activity->callbacks->onStart = onStart;
+    activity->callbacks->onResume = onResume;
+    activity->callbacks->onSaveInstanceState = onSaveInstanceState;
+    activity->callbacks->onPause = onPause;
+    activity->callbacks->onStop = onStop;
+    activity->callbacks->onTouchEvent = onTouchEvent;
+    activity->callbacks->onKeyDown = onKey;
+    activity->callbacks->onKeyUp = onKey;
+    activity->callbacks->onTextInputEvent = onTextInputEvent;
+    activity->callbacks->onConfigurationChanged = onConfigurationChanged;
+    activity->callbacks->onTrimMemory = onTrimMemory;
+    activity->callbacks->onWindowFocusChanged = onWindowFocusChanged;
+    activity->callbacks->onNativeWindowCreated = onNativeWindowCreated;
+    activity->callbacks->onNativeWindowDestroyed = onNativeWindowDestroyed;
+    activity->callbacks->onNativeWindowRedrawNeeded =
+        onNativeWindowRedrawNeeded;
+    activity->callbacks->onNativeWindowResized = onNativeWindowResized;
+    activity->callbacks->onWindowInsetsChanged = onWindowInsetsChanged;
+    activity->callbacks->onContentRectChanged = onContentRectChanged;
+    LOGV("Callbacks set: %p", activity->callbacks);
+
+    activity->instance =
+        android_app_create(activity, savedState, savedStateSize);
+}
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h
new file mode 100644
index 0000000..6fa5721
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h
@@ -0,0 +1,507 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+/**
+ * @addtogroup android_native_app_glue Native App Glue library
+ * The glue library to interface your game loop with GameActivity.
+ * @{
+ */
+
+#include <android/configuration.h>
+#include <android/looper.h>
+#include <poll.h>
+#include <pthread.h>
+#include <sched.h>
+
+#include "game-activity/GameActivity.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * The GameActivity interface provided by <game-activity/GameActivity.h>
+ * is based on a set of application-provided callbacks that will be called
+ * by the Activity's main thread when certain events occur.
+ *
+ * This means that each one of this callbacks _should_ _not_ block, or they
+ * risk having the system force-close the application. This programming
+ * model is direct, lightweight, but constraining.
+ *
+ * The 'android_native_app_glue' static library is used to provide a different
+ * execution model where the application can implement its own main event
+ * loop in a different thread instead. Here's how it works:
+ *
+ * 1/ The application must provide a function named "android_main()" that
+ *    will be called when the activity is created, in a new thread that is
+ *    distinct from the activity's main thread.
+ *
+ * 2/ android_main() receives a pointer to a valid "android_app" structure
+ *    that contains references to other important objects, e.g. the
+ *    GameActivity obejct instance the application is running in.
+ *
+ * 3/ the "android_app" object holds an ALooper instance that already
+ *    listens to activity lifecycle events (e.g. "pause", "resume").
+ *    See APP_CMD_XXX declarations below.
+ *
+ *    This corresponds to an ALooper identifier returned by
+ *    ALooper_pollOnce with value LOOPER_ID_MAIN.
+ *
+ *    Your application can use the same ALooper to listen to additional
+ *    file-descriptors.  They can either be callback based, or with return
+ *    identifiers starting with LOOPER_ID_USER.
+ *
+ * 4/ Whenever you receive a LOOPER_ID_MAIN event,
+ *    the returned data will point to an android_poll_source structure.  You
+ *    can call the process() function on it, and fill in android_app->onAppCmd
+ *    to be called for your own processing of the event.
+ *
+ *    Alternatively, you can call the low-level functions to read and process
+ *    the data directly...  look at the process_cmd() and process_input()
+ *    implementations in the glue to see how to do this.
+ *
+ * See the sample named "native-activity" that comes with the NDK with a
+ * full usage example.  Also look at the documentation of GameActivity.
+ */
+
+struct android_app;
+
+/**
+ * Data associated with an ALooper fd that will be returned as the "outData"
+ * when that source has data ready.
+ */
+struct android_poll_source {
+    /**
+     * The identifier of this source.  May be LOOPER_ID_MAIN or
+     * LOOPER_ID_INPUT.
+     */
+    int32_t id;
+
+    /** The android_app this ident is associated with. */
+    struct android_app* app;
+
+    /**
+     * Function to call to perform the standard processing of data from
+     * this source.
+     */
+    void (*process)(struct android_app* app,
+                    struct android_poll_source* source);
+};
+
+struct android_input_buffer {
+    /**
+     * Pointer to a read-only array of GameActivityMotionEvent.
+     * Only the first motionEventsCount events are valid.
+     */
+    GameActivityMotionEvent *motionEvents;
+
+    /**
+     * The number of valid motion events in `motionEvents`.
+     */
+    uint64_t motionEventsCount;
+
+    /**
+     * The size of the `motionEvents` buffer.
+     */
+    uint64_t motionEventsBufferSize;
+
+    /**
+     * Pointer to a read-only array of GameActivityKeyEvent.
+     * Only the first keyEventsCount events are valid.
+     */
+    GameActivityKeyEvent *keyEvents;
+
+    /**
+     * The number of valid "Key" events in `keyEvents`.
+     */
+    uint64_t keyEventsCount;
+
+    /**
+     * The size of the `keyEvents` buffer.
+     */
+    uint64_t keyEventsBufferSize;
+};
+
+/**
+ * Function pointer declaration for the filtering of key events.
+ * A function with this signature should be passed to
+ * android_app_set_key_event_filter and return false for any events that should
+ * not be handled by android_native_app_glue. These events will be handled by
+ * the system instead.
+ */
+typedef bool (*android_key_event_filter)(const GameActivityKeyEvent*);
+
+/**
+ * Function pointer definition for the filtering of motion events.
+ * A function with this signature should be passed to
+ * android_app_set_motion_event_filter and return false for any events that
+ * should not be handled by android_native_app_glue. These events will be
+ * handled by the system instead.
+ */
+typedef bool (*android_motion_event_filter)(const GameActivityMotionEvent*);
+
+/**
+ * This is the interface for the standard glue code of a threaded
+ * application.  In this model, the application's code is running
+ * in its own thread separate from the main thread of the process.
+ * It is not required that this thread be associated with the Java
+ * VM, although it will need to be in order to make JNI calls any
+ * Java objects.
+ */
+struct android_app {
+    /**
+     * An optional pointer to application-defined state.
+     */
+    void* userData;
+
+    /**
+     * A required callback for processing main app commands (`APP_CMD_*`).
+     * This is called each frame if there are app commands that need processing.
+     */
+    void (*onAppCmd)(struct android_app* app, int32_t cmd);
+
+    /** The GameActivity object instance that this app is running in. */
+    GameActivity* activity;
+
+    /** The current configuration the app is running in. */
+    AConfiguration* config;
+
+    /**
+     * The last activity saved state, as provided at creation time.
+     * It is NULL if there was no state.  You can use this as you need; the
+     * memory will remain around until you call android_app_exec_cmd() for
+     * APP_CMD_RESUME, at which point it will be freed and savedState set to
+     * NULL. These variables should only be changed when processing a
+     * APP_CMD_SAVE_STATE, at which point they will be initialized to NULL and
+     * you can malloc your state and place the information here.  In that case
+     * the memory will be freed for you later.
+     */
+    void* savedState;
+
+    /**
+     * The size of the activity saved state. It is 0 if `savedState` is NULL.
+     */
+    size_t savedStateSize;
+
+    /** The ALooper associated with the app's thread. */
+    ALooper* looper;
+
+    /** When non-NULL, this is the window surface that the app can draw in. */
+    ANativeWindow* window;
+
+    /**
+     * Current content rectangle of the window; this is the area where the
+     * window's content should be placed to be seen by the user.
+     */
+    ARect contentRect;
+
+    /**
+     * Current state of the app's activity.  May be either APP_CMD_START,
+     * APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP.
+     */
+    int activityState;
+
+    /**
+     * This is non-zero when the application's GameActivity is being
+     * destroyed and waiting for the app thread to complete.
+     */
+    int destroyRequested;
+
+#define NATIVE_APP_GLUE_MAX_INPUT_BUFFERS 2
+
+    /**
+     * This is used for buffering input from GameActivity. Once ready, the
+     * application thread switches the buffers and processes what was
+     * accumulated.
+     */
+    struct android_input_buffer inputBuffers[NATIVE_APP_GLUE_MAX_INPUT_BUFFERS];
+
+    int currentInputBuffer;
+
+    /**
+     * 0 if no text input event is outstanding, 1 if it is.
+     * Use `GameActivity_getTextInputState` to get information
+     * about the text entered by the user.
+     */
+    int textInputState;
+
+    // Below are "private" implementation of the glue code.
+    /** @cond INTERNAL */
+
+    pthread_mutex_t mutex;
+    pthread_cond_t cond;
+
+    int msgread;
+    int msgwrite;
+
+    pthread_t thread;
+
+    struct android_poll_source cmdPollSource;
+
+    int running;
+    int stateSaved;
+    int destroyed;
+    int redrawNeeded;
+    ANativeWindow* pendingWindow;
+    ARect pendingContentRect;
+
+    android_key_event_filter keyEventFilter;
+    android_motion_event_filter motionEventFilter;
+
+    // When new input is received we set both of these flags and use the looper to
+    // wake up the application mainloop.
+    //
+    // To avoid spamming the mainloop with wake ups from lots of input though we
+    // don't sent a wake up if the inputSwapPending flag is already set. (i.e.
+    // we already expect input to be processed in a finite amount of time due to
+    // our previous wake up)
+    //
+    // When a wake up is received then we will check this flag (clearing it
+    // at the same time). If it was set then an InputAvailable event is sent to
+    // the application - which should lead to all input being processed within
+    // a finite amount of time.
+    //
+    // The next time android_app_swap_input_buffers is called, both flags will be
+    // cleared.
+    //
+    // NB: both of these should only be read with the app mutex held
+    bool inputAvailableWakeUp;
+    bool inputSwapPending;
+
+    /** @endcond */
+};
+
+/**
+ * Looper ID of commands coming from the app's main thread, an AInputQueue or
+ * user-defined sources.
+ */
+enum NativeAppGlueLooperId {
+    /**
+     * Looper data ID of commands coming from the app's main thread, which
+     * is returned as an identifier from ALooper_pollOnce().  The data for this
+     * identifier is a pointer to an android_poll_source structure.
+     * These can be retrieved and processed with android_app_read_cmd()
+     * and android_app_exec_cmd().
+     */
+    LOOPER_ID_MAIN = 1,
+
+    /**
+     * Unused. Reserved for future use when usage of AInputQueue will be
+     * supported.
+     */
+    LOOPER_ID_INPUT = 2,
+
+    /**
+     * Start of user-defined ALooper identifiers.
+     */
+    LOOPER_ID_USER = 3,
+};
+
+/**
+ * Commands passed from the application's main Java thread to the game's thread.
+ */
+enum NativeAppGlueAppCmd {
+    /**
+     * Unused. Reserved for future use when usage of AInputQueue will be
+     * supported.
+     */
+    UNUSED_APP_CMD_INPUT_CHANGED,
+
+    /**
+     * Command from main thread: a new ANativeWindow is ready for use.  Upon
+     * receiving this command, android_app->window will contain the new window
+     * surface.
+     */
+    APP_CMD_INIT_WINDOW,
+
+    /**
+     * Command from main thread: the existing ANativeWindow needs to be
+     * terminated.  Upon receiving this command, android_app->window still
+     * contains the existing window; after calling android_app_exec_cmd
+     * it will be set to NULL.
+     */
+    APP_CMD_TERM_WINDOW,
+
+    /**
+     * Command from main thread: the current ANativeWindow has been resized.
+     * Please redraw with its new size.
+     */
+    APP_CMD_WINDOW_RESIZED,
+
+    /**
+     * Command from main thread: the system needs that the current ANativeWindow
+     * be redrawn.  You should redraw the window before handing this to
+     * android_app_exec_cmd() in order to avoid transient drawing glitches.
+     */
+    APP_CMD_WINDOW_REDRAW_NEEDED,
+
+    /**
+     * Command from main thread: the content area of the window has changed,
+     * such as from the soft input window being shown or hidden.  You can
+     * find the new content rect in android_app::contentRect.
+     */
+    APP_CMD_CONTENT_RECT_CHANGED,
+
+    /**
+     * Command from main thread: the app's activity window has gained
+     * input focus.
+     */
+    APP_CMD_GAINED_FOCUS,
+
+    /**
+     * Command from main thread: the app's activity window has lost
+     * input focus.
+     */
+    APP_CMD_LOST_FOCUS,
+
+    /**
+     * Command from main thread: the current device configuration has changed.
+     */
+    APP_CMD_CONFIG_CHANGED,
+
+    /**
+     * Command from main thread: the system is running low on memory.
+     * Try to reduce your memory use.
+     */
+    APP_CMD_LOW_MEMORY,
+
+    /**
+     * Command from main thread: the app's activity has been started.
+     */
+    APP_CMD_START,
+
+    /**
+     * Command from main thread: the app's activity has been resumed.
+     */
+    APP_CMD_RESUME,
+
+    /**
+     * Command from main thread: the app should generate a new saved state
+     * for itself, to restore from later if needed.  If you have saved state,
+     * allocate it with malloc and place it in android_app.savedState with
+     * the size in android_app.savedStateSize.  The will be freed for you
+     * later.
+     */
+    APP_CMD_SAVE_STATE,
+
+    /**
+     * Command from main thread: the app's activity has been paused.
+     */
+    APP_CMD_PAUSE,
+
+    /**
+     * Command from main thread: the app's activity has been stopped.
+     */
+    APP_CMD_STOP,
+
+    /**
+     * Command from main thread: the app's activity is being destroyed,
+     * and waiting for the app thread to clean up and exit before proceeding.
+     */
+    APP_CMD_DESTROY,
+
+    /**
+     * Command from main thread: the app's insets have changed.
+     */
+    APP_CMD_WINDOW_INSETS_CHANGED,
+
+};
+
+/**
+ * Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next
+ * app command message.
+ */
+int8_t android_app_read_cmd(struct android_app* android_app);
+
+/**
+ * Call with the command returned by android_app_read_cmd() to do the
+ * initial pre-processing of the given command.  You can perform your own
+ * actions for the command after calling this function.
+ */
+void android_app_pre_exec_cmd(struct android_app* android_app, int8_t cmd);
+
+/**
+ * Call with the command returned by android_app_read_cmd() to do the
+ * final post-processing of the given command.  You must have done your own
+ * actions for the command before calling this function.
+ */
+void android_app_post_exec_cmd(struct android_app* android_app, int8_t cmd);
+
+/**
+ * Call this before processing input events to get the events buffer.
+ * The function returns NULL if there are no events to process.
+ */
+struct android_input_buffer* android_app_swap_input_buffers(
+    struct android_app* android_app);
+
+/**
+ * Clear the array of motion events that were waiting to be handled, and release
+ * each of them.
+ *
+ * This method should be called after you have processed the motion events in
+ * your game loop. You should handle events at each iteration of your game loop.
+ */
+void android_app_clear_motion_events(struct android_input_buffer* inputBuffer);
+
+/**
+ * Clear the array of key events that were waiting to be handled, and release
+ * each of them.
+ *
+ * This method should be called after you have processed the key up events in
+ * your game loop. You should handle events at each iteration of your game loop.
+ */
+void android_app_clear_key_events(struct android_input_buffer* inputBuffer);
+
+/**
+ * This is a springboard into the Rust glue layer that wraps calling the
+ * main entry for the app itself.
+ */
+extern void _rust_glue_entry(struct android_app* app);
+
+/**
+ * Set the filter to use when processing key events.
+ * Any events for which the filter returns false will be ignored by
+ * android_native_app_glue. If filter is set to NULL, no filtering is done.
+ *
+ * The default key filter will filter out volume and camera button presses.
+ */
+void android_app_set_key_event_filter(struct android_app* app,
+                                      android_key_event_filter filter);
+
+/**
+ * Set the filter to use when processing touch and motion events.
+ * Any events for which the filter returns false will be ignored by
+ * android_native_app_glue. If filter is set to NULL, no filtering is done.
+ *
+ * Note that the default motion event filter will only allow touchscreen events
+ * through, in order to mimic NativeActivity's behaviour, so for controller
+ * events to be passed to the app, set the filter to NULL.
+ */
+void android_app_set_motion_event_filter(struct android_app* app,
+                                         android_motion_event_filter filter);
+
+/**
+ * Determines if a looper wake up was due to new input becoming available
+ */
+bool android_app_input_available_wake_up(struct android_app* app);
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @} */
diff --git a/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gamecommon.h b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gamecommon.h
new file mode 100644
index 0000000..38bffff
--- /dev/null
+++ b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gamecommon.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @defgroup game_common Game Common
+ * Common structures and functions used within AGDK
+ * @{
+ */
+
+#pragma once
+
+/**
+ * The type of a component for which to retrieve insets. See
+ * https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type
+ */
+typedef enum GameCommonInsetsType {
+    GAMECOMMON_INSETS_TYPE_CAPTION_BAR = 0,
+    GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT,
+    GAMECOMMON_INSETS_TYPE_IME,
+    GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES,
+    GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS,
+    GAMECOMMON_INSETS_TYPE_STATUS_BARS,
+    GAMECOMMON_INSETS_TYPE_SYSTEM_BARS,
+    GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES,
+    GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT,
+    GAMECOMMON_INSETS_TYPE_WATERFALL,
+    GAMECOMMON_INSETS_TYPE_COUNT
+} GameCommonInsetsType;
diff --git a/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.cpp b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.cpp
new file mode 100644
index 0000000..b8244fb
--- /dev/null
+++ b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.cpp
@@ -0,0 +1,377 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "game-text-input/gametextinput.h"
+
+#include <android/log.h>
+#include <jni.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <algorithm>
+#include <memory>
+#include <vector>
+
+#define LOG_TAG "GameTextInput"
+
+static constexpr int32_t DEFAULT_MAX_STRING_SIZE = 1 << 16;
+
+// Cache of field ids in the Java GameTextInputState class
+struct StateClassInfo {
+    jfieldID text;
+    jfieldID selectionStart;
+    jfieldID selectionEnd;
+    jfieldID composingRegionStart;
+    jfieldID composingRegionEnd;
+};
+
+// Main GameTextInput object.
+struct GameTextInput {
+   public:
+    GameTextInput(JNIEnv *env, uint32_t max_string_size);
+    ~GameTextInput();
+    void setState(const GameTextInputState &state);
+    const GameTextInputState &getState() const { return currentState_; }
+    void setInputConnection(jobject inputConnection);
+    void processEvent(jobject textInputEvent);
+    void showIme(uint32_t flags);
+    void hideIme(uint32_t flags);
+    void restartInput();
+    void setEventCallback(GameTextInputEventCallback callback, void *context);
+    jobject stateToJava(const GameTextInputState &state) const;
+    void stateFromJava(jobject textInputEvent,
+                       GameTextInputGetStateCallback callback,
+                       void *context) const;
+    void setImeInsetsCallback(GameTextInputImeInsetsCallback callback,
+                              void *context);
+    void processImeInsets(const ARect *insets);
+    const ARect &getImeInsets() const { return currentInsets_; }
+
+   private:
+    // Copy string and set other fields
+    void setStateInner(const GameTextInputState &state);
+    static void processCallback(void *context, const GameTextInputState *state);
+    JNIEnv *env_ = nullptr;
+    // Cached at initialization from
+    // com/google/androidgamesdk/gametextinput/State.
+    jclass stateJavaClass_ = nullptr;
+    // The latest text input update.
+    GameTextInputState currentState_ = {};
+    // An instance of gametextinput.InputConnection.
+    jclass inputConnectionClass_ = nullptr;
+    jobject inputConnection_ = nullptr;
+    jmethodID inputConnectionSetStateMethod_;
+    jmethodID setSoftKeyboardActiveMethod_;
+    jmethodID restartInputMethod_;
+    void (*eventCallback_)(void *context,
+                           const struct GameTextInputState *state) = nullptr;
+    void *eventCallbackContext_ = nullptr;
+    void (*insetsCallback_)(void *context,
+                            const struct ARect *insets) = nullptr;
+    ARect currentInsets_ = {};
+    void *insetsCallbackContext_ = nullptr;
+    StateClassInfo stateClassInfo_ = {};
+    // Constant-sized buffer used to store state text.
+    std::vector<char> stateStringBuffer_;
+};
+
+std::unique_ptr<GameTextInput> s_gameTextInput;
+
+extern "C" {
+
+///////////////////////////////////////////////////////////
+/// GameTextInputState C Functions
+///////////////////////////////////////////////////////////
+
+// Convert to a Java structure.
+jobject currentState_toJava(const GameTextInput *gameTextInput,
+                            const GameTextInputState *state) {
+    if (state == nullptr) return NULL;
+    return gameTextInput->stateToJava(*state);
+}
+
+// Convert from Java structure.
+void currentState_fromJava(const GameTextInput *gameTextInput,
+                           jobject textInputEvent,
+                           GameTextInputGetStateCallback callback,
+                           void *context) {
+    gameTextInput->stateFromJava(textInputEvent, callback, context);
+}
+
+///////////////////////////////////////////////////////////
+/// GameTextInput C Functions
+///////////////////////////////////////////////////////////
+
+struct GameTextInput *GameTextInput_init(JNIEnv *env,
+                                         uint32_t max_string_size) {
+    if (s_gameTextInput.get() != nullptr) {
+        __android_log_print(ANDROID_LOG_WARN, LOG_TAG,
+                            "Warning: called GameTextInput_init twice without "
+                            "calling GameTextInput_destroy");
+        return s_gameTextInput.get();
+    }
+    // Don't use make_unique, for C++11 compatibility
+    s_gameTextInput =
+        std::unique_ptr<GameTextInput>(new GameTextInput(env, max_string_size));
+    return s_gameTextInput.get();
+}
+
+void GameTextInput_destroy(GameTextInput *input) {
+    if (input == nullptr || s_gameTextInput.get() == nullptr) return;
+    s_gameTextInput.reset();
+}
+
+void GameTextInput_setState(GameTextInput *input,
+                            const GameTextInputState *state) {
+    if (state == nullptr) return;
+    input->setState(*state);
+}
+
+void GameTextInput_getState(GameTextInput *input,
+                            GameTextInputGetStateCallback callback,
+                            void *context) {
+    callback(context, &input->getState());
+}
+
+void GameTextInput_setInputConnection(GameTextInput *input,
+                                      jobject inputConnection) {
+    input->setInputConnection(inputConnection);
+}
+
+void GameTextInput_processEvent(GameTextInput *input, jobject textInputEvent) {
+    input->processEvent(textInputEvent);
+}
+
+void GameTextInput_processImeInsets(GameTextInput *input, const ARect *insets) {
+    input->processImeInsets(insets);
+}
+
+void GameTextInput_showIme(struct GameTextInput *input, uint32_t flags) {
+    input->showIme(flags);
+}
+
+void GameTextInput_hideIme(struct GameTextInput *input, uint32_t flags) {
+    input->hideIme(flags);
+}
+
+void GameTextInput_restartInput(struct GameTextInput *input) {
+    input->restartInput();
+}
+
+void GameTextInput_setEventCallback(struct GameTextInput *input,
+                                    GameTextInputEventCallback callback,
+                                    void *context) {
+    input->setEventCallback(callback, context);
+}
+
+void GameTextInput_setImeInsetsCallback(struct GameTextInput *input,
+                                        GameTextInputImeInsetsCallback callback,
+                                        void *context) {
+    input->setImeInsetsCallback(callback, context);
+}
+
+void GameTextInput_getImeInsets(const GameTextInput *input, ARect *insets) {
+    *insets = input->getImeInsets();
+}
+
+}  // extern "C"
+
+///////////////////////////////////////////////////////////
+/// GameTextInput C++ class Implementation
+///////////////////////////////////////////////////////////
+
+GameTextInput::GameTextInput(JNIEnv *env, uint32_t max_string_size)
+    : env_(env),
+      stateStringBuffer_(max_string_size == 0 ? DEFAULT_MAX_STRING_SIZE
+                                              : max_string_size) {
+    stateJavaClass_ = (jclass)env_->NewGlobalRef(
+        env_->FindClass("com/google/androidgamesdk/gametextinput/State"));
+    inputConnectionClass_ = (jclass)env_->NewGlobalRef(env_->FindClass(
+        "com/google/androidgamesdk/gametextinput/InputConnection"));
+    inputConnectionSetStateMethod_ =
+        env_->GetMethodID(inputConnectionClass_, "setState",
+                          "(Lcom/google/androidgamesdk/gametextinput/State;)V");
+    setSoftKeyboardActiveMethod_ = env_->GetMethodID(
+        inputConnectionClass_, "setSoftKeyboardActive", "(ZI)V");
+    restartInputMethod_ =
+        env_->GetMethodID(inputConnectionClass_, "restartInput", "()V");
+
+    stateClassInfo_.text =
+        env_->GetFieldID(stateJavaClass_, "text", "Ljava/lang/String;");
+    stateClassInfo_.selectionStart =
+        env_->GetFieldID(stateJavaClass_, "selectionStart", "I");
+    stateClassInfo_.selectionEnd =
+        env_->GetFieldID(stateJavaClass_, "selectionEnd", "I");
+    stateClassInfo_.composingRegionStart =
+        env_->GetFieldID(stateJavaClass_, "composingRegionStart", "I");
+    stateClassInfo_.composingRegionEnd =
+        env_->GetFieldID(stateJavaClass_, "composingRegionEnd", "I");
+}
+
+GameTextInput::~GameTextInput() {
+    if (stateJavaClass_ != NULL) {
+        env_->DeleteGlobalRef(stateJavaClass_);
+        stateJavaClass_ = NULL;
+    }
+    if (inputConnectionClass_ != NULL) {
+        env_->DeleteGlobalRef(inputConnectionClass_);
+        inputConnectionClass_ = NULL;
+    }
+    if (inputConnection_ != NULL) {
+        env_->DeleteGlobalRef(inputConnection_);
+        inputConnection_ = NULL;
+    }
+}
+
+void GameTextInput::setState(const GameTextInputState &state) {
+    if (inputConnection_ == nullptr) return;
+    jobject jstate = stateToJava(state);
+    env_->CallVoidMethod(inputConnection_, inputConnectionSetStateMethod_,
+                         jstate);
+    env_->DeleteLocalRef(jstate);
+    setStateInner(state);
+}
+
+void GameTextInput::setStateInner(const GameTextInputState &state) {
+    // Check if we're setting using our own string (other parts may be
+    // different)
+    if (state.text_UTF8 == currentState_.text_UTF8) {
+        currentState_ = state;
+        return;
+    }
+    // Otherwise, copy across the string.
+    auto bytes_needed =
+        std::min(static_cast<uint32_t>(state.text_length + 1),
+                 static_cast<uint32_t>(stateStringBuffer_.size()));
+    currentState_.text_UTF8 = stateStringBuffer_.data();
+    std::copy(state.text_UTF8, state.text_UTF8 + bytes_needed - 1,
+              stateStringBuffer_.data());
+    currentState_.text_length = state.text_length;
+    currentState_.selection = state.selection;
+    currentState_.composingRegion = state.composingRegion;
+    stateStringBuffer_[bytes_needed - 1] = 0;
+}
+
+void GameTextInput::setInputConnection(jobject inputConnection) {
+    if (inputConnection_ != NULL) {
+        env_->DeleteGlobalRef(inputConnection_);
+    }
+    inputConnection_ = env_->NewGlobalRef(inputConnection);
+}
+
+/*static*/ void GameTextInput::processCallback(
+    void *context, const GameTextInputState *state) {
+    auto thiz = static_cast<GameTextInput *>(context);
+    if (state != nullptr) thiz->setStateInner(*state);
+}
+
+void GameTextInput::processEvent(jobject textInputEvent) {
+    stateFromJava(textInputEvent, processCallback, this);
+    if (eventCallback_) {
+        eventCallback_(eventCallbackContext_, &currentState_);
+    }
+}
+
+void GameTextInput::showIme(uint32_t flags) {
+    if (inputConnection_ == nullptr) return;
+    env_->CallVoidMethod(inputConnection_, setSoftKeyboardActiveMethod_, true,
+                         flags);
+}
+
+void GameTextInput::setEventCallback(GameTextInputEventCallback callback,
+                                     void *context) {
+    eventCallback_ = callback;
+    eventCallbackContext_ = context;
+}
+
+void GameTextInput::setImeInsetsCallback(
+    GameTextInputImeInsetsCallback callback, void *context) {
+    insetsCallback_ = callback;
+    insetsCallbackContext_ = context;
+}
+
+void GameTextInput::processImeInsets(const ARect *insets) {
+    currentInsets_ = *insets;
+    if (insetsCallback_) {
+        insetsCallback_(insetsCallbackContext_, &currentInsets_);
+    }
+}
+
+void GameTextInput::hideIme(uint32_t flags) {
+    if (inputConnection_ == nullptr) return;
+    env_->CallVoidMethod(inputConnection_, setSoftKeyboardActiveMethod_, false,
+                         flags);
+}
+
+void GameTextInput::restartInput() {
+    if (inputConnection_ == nullptr) return;
+    env_->CallVoidMethod(inputConnection_, restartInputMethod_, false);
+}
+
+jobject GameTextInput::stateToJava(const GameTextInputState &state) const {
+    static jmethodID constructor = nullptr;
+    if (constructor == nullptr) {
+        constructor = env_->GetMethodID(stateJavaClass_, "<init>",
+                                        "(Ljava/lang/String;IIII)V");
+        if (constructor == nullptr) {
+            __android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
+                                "Can't find gametextinput.State constructor");
+            return nullptr;
+        }
+    }
+    const char *text = state.text_UTF8;
+    if (text == nullptr) {
+        static char empty_string[] = "";
+        text = empty_string;
+    }
+    // Note that this expects 'modified' UTF-8 which is not the same as UTF-8
+    // https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8
+    jstring jtext = env_->NewStringUTF(text);
+    jobject jobj =
+        env_->NewObject(stateJavaClass_, constructor, jtext,
+                        state.selection.start, state.selection.end,
+                        state.composingRegion.start, state.composingRegion.end);
+    env_->DeleteLocalRef(jtext);
+    return jobj;
+}
+
+void GameTextInput::stateFromJava(jobject textInputEvent,
+                                  GameTextInputGetStateCallback callback,
+                                  void *context) const {
+    jstring text =
+        (jstring)env_->GetObjectField(textInputEvent, stateClassInfo_.text);
+    // Note this is 'modified' UTF-8, not true UTF-8. It has no NULLs in it,
+    // except at the end. It's actually not specified whether the value returned
+    // by GetStringUTFChars includes a null at the end, but it *seems to* on
+    // Android.
+    const char *text_chars = env_->GetStringUTFChars(text, NULL);
+    int text_len = env_->GetStringUTFLength(
+        text);  // Length in bytes, *not* including the null.
+    int selectionStart =
+        env_->GetIntField(textInputEvent, stateClassInfo_.selectionStart);
+    int selectionEnd =
+        env_->GetIntField(textInputEvent, stateClassInfo_.selectionEnd);
+    int composingRegionStart =
+        env_->GetIntField(textInputEvent, stateClassInfo_.composingRegionStart);
+    int composingRegionEnd =
+        env_->GetIntField(textInputEvent, stateClassInfo_.composingRegionEnd);
+    GameTextInputState state{text_chars,
+                             text_len,
+                             {selectionStart, selectionEnd},
+                             {composingRegionStart, composingRegionEnd}};
+    callback(context, &state);
+    env_->ReleaseStringUTFChars(text, text_chars);
+    env_->DeleteLocalRef(text);
+}
diff --git a/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h
new file mode 100644
index 0000000..8c33da5
--- /dev/null
+++ b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h
@@ -0,0 +1,305 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @defgroup game_text_input Game Text Input
+ * The interface to use GameTextInput.
+ * @{
+ */
+
+#pragma once
+
+#include <android/rect.h>
+#include <jni.h>
+#include <stdint.h>
+
+#include "common/gamesdk_common.h"
+#include "gamecommon.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define GAMETEXTINPUT_MAJOR_VERSION 2
+#define GAMETEXTINPUT_MINOR_VERSION 0
+#define GAMETEXTINPUT_BUGFIX_VERSION 0
+#define GAMETEXTINPUT_PACKED_VERSION                            \
+    ANDROID_GAMESDK_PACKED_VERSION(GAMETEXTINPUT_MAJOR_VERSION, \
+                                   GAMETEXTINPUT_MINOR_VERSION, \
+                                   GAMETEXTINPUT_BUGFIX_VERSION)
+
+/**
+ * This struct holds a span within a region of text from start (inclusive) to
+ * end (exclusive). An empty span or cursor position is specified with
+ * start==end. An undefined span is specified with start = end = SPAN_UNDEFINED.
+ */
+typedef struct GameTextInputSpan {
+    /** The start of the region (inclusive). */
+    int32_t start;
+    /** The end of the region (exclusive). */
+    int32_t end;
+} GameTextInputSpan;
+
+/**
+ * Values with special meaning in a GameTextInputSpan.
+ */
+enum GameTextInputSpanFlag { SPAN_UNDEFINED = -1 };
+
+/**
+ * This struct holds the state of an editable section of text.
+ * The text can have a selection and a composing region defined on it.
+ * A composing region is used by IMEs that allow input using multiple steps to
+ * compose a glyph or word. Use functions GameTextInput_getState and
+ * GameTextInput_setState to read and modify the state that an IME is editing.
+ */
+typedef struct GameTextInputState {
+    /**
+     * Text owned by the state, as a modified UTF-8 string. Null-terminated.
+     * https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8
+     */
+    const char *text_UTF8;
+    /**
+     * Length in bytes of text_UTF8, *not* including the null at end.
+     */
+    int32_t text_length;
+    /**
+     * A selection defined on the text.
+     */
+    GameTextInputSpan selection;
+    /**
+     * A composing region defined on the text.
+     */
+    GameTextInputSpan composingRegion;
+} GameTextInputState;
+
+/**
+ * A callback called by GameTextInput_getState.
+ * @param context User-defined context.
+ * @param state State, owned by the library, that will be valid for the duration
+ * of the callback.
+ */
+typedef void (*GameTextInputGetStateCallback)(
+    void *context, const struct GameTextInputState *state);
+
+/**
+ * Opaque handle to the GameTextInput API.
+ */
+typedef struct GameTextInput GameTextInput;
+
+/**
+ * Initialize the GameTextInput library.
+ * If called twice without GameTextInput_destroy being called, the same pointer
+ * will be returned and a warning will be issued.
+ * @param env A JNI env valid on the calling thread.
+ * @param max_string_size The maximum length of a string that can be edited. If
+ * zero, the maximum defaults to 65536 bytes. A buffer of this size is allocated
+ * at initialization.
+ * @return A handle to the library.
+ */
+GameTextInput *GameTextInput_init(JNIEnv *env, uint32_t max_string_size);
+
+/**
+ * When using GameTextInput, you need to create a gametextinput.InputConnection
+ * on the Java side and pass it using this function to the library, unless using
+ * GameActivity in which case this will be done for you. See the GameActivity
+ * source code or GameTextInput samples for examples of usage.
+ * @param input A valid GameTextInput library handle.
+ * @param inputConnection A gametextinput.InputConnection object.
+ */
+void GameTextInput_setInputConnection(GameTextInput *input,
+                                      jobject inputConnection);
+
+/**
+ * Unless using GameActivity, it is required to call this function from your
+ * Java gametextinput.Listener.stateChanged method to convert eventState and
+ * trigger any event callbacks. When using GameActivity, this does not need to
+ * be called as event processing is handled by the Activity.
+ * @param input A valid GameTextInput library handle.
+ * @param eventState A Java gametextinput.State object.
+ */
+void GameTextInput_processEvent(GameTextInput *input, jobject eventState);
+
+/**
+ * Free any resources owned by the GameTextInput library.
+ * Any subsequent calls to the library will fail until GameTextInput_init is
+ * called again.
+ * @param input A valid GameTextInput library handle.
+ */
+void GameTextInput_destroy(GameTextInput *input);
+
+/**
+ * Flags to be passed to GameTextInput_showIme.
+ */
+enum ShowImeFlags {
+    SHOW_IME_UNDEFINED = 0,  // Default value.
+    SHOW_IMPLICIT =
+        1,  // Indicates that the user has forced the input method open so it
+            // should not be closed until they explicitly do so.
+    SHOW_FORCED = 2  // Indicates that this is an implicit request to show the
+                     // input window, not as the result of a direct request by
+                     // the user. The window may not be shown in this case.
+};
+
+/**
+ * Show the IME. Calls InputMethodManager.showSoftInput().
+ * @param input A valid GameTextInput library handle.
+ * @param flags Defined in ShowImeFlags above. For more information see:
+ * https://developer.android.com/reference/android/view/inputmethod/InputMethodManager
+ */
+void GameTextInput_showIme(GameTextInput *input, uint32_t flags);
+
+/**
+ * Flags to be passed to GameTextInput_hideIme.
+ */
+enum HideImeFlags {
+    HIDE_IME_UNDEFINED = 0,  // Default value.
+    HIDE_IMPLICIT_ONLY =
+        1,  // Indicates that the soft input window should only be hidden if it
+            // was not explicitly shown by the user.
+    HIDE_NOT_ALWAYS =
+        2,  // Indicates that the soft input window should normally be hidden,
+            // unless it was originally shown with SHOW_FORCED.
+};
+
+/**
+ * Show the IME. Calls InputMethodManager.hideSoftInputFromWindow().
+ * @param input A valid GameTextInput library handle.
+ * @param flags Defined in HideImeFlags above. For more information see:
+ * https://developer.android.com/reference/android/view/inputmethod/InputMethodManager
+ */
+void GameTextInput_hideIme(GameTextInput *input, uint32_t flags);
+
+/**
+ * Restarts the input method. Calls InputMethodManager.restartInput().
+ * @param input A valid GameTextInput library handle.
+ */
+void GameTextInput_restartInput(GameTextInput *input);
+
+/**
+ * Call a callback with the current GameTextInput state, which may have been
+ * modified by changes in the IME and calls to GameTextInput_setState. We use a
+ * callback rather than returning the state in order to simplify ownership of
+ * text_UTF8 strings. These strings are only valid during the calling of the
+ * callback.
+ * @param input A valid GameTextInput library handle.
+ * @param callback A function that will be called with valid state.
+ * @param context Context used by the callback.
+ */
+void GameTextInput_getState(GameTextInput *input,
+                            GameTextInputGetStateCallback callback,
+                            void *context);
+
+/**
+ * Set the current GameTextInput state. This state is reflected to any active
+ * IME.
+ * @param input A valid GameTextInput library handle.
+ * @param state The state to set. Ownership is maintained by the caller and must
+ * remain valid for the duration of the call.
+ */
+void GameTextInput_setState(GameTextInput *input,
+                            const GameTextInputState *state);
+
+/**
+ * Type of the callback needed by GameTextInput_setEventCallback that will be
+ * called every time the IME state changes.
+ * @param context User-defined context set in GameTextInput_setEventCallback.
+ * @param current_state Current IME state, owned by the library and valid during
+ * the callback.
+ */
+typedef void (*GameTextInputEventCallback)(
+    void *context, const GameTextInputState *current_state);
+
+/**
+ * Optionally set a callback to be called whenever the IME state changes.
+ * Not necessary if you are using GameActivity, which handles these callbacks
+ * for you.
+ * @param input A valid GameTextInput library handle.
+ * @param callback Called by the library when the IME state changes.
+ * @param context Context passed as first argument to the callback.
+ */
+void GameTextInput_setEventCallback(GameTextInput *input,
+                                    GameTextInputEventCallback callback,
+                                    void *context);
+
+/**
+ * Type of the callback needed by GameTextInput_setImeInsetsCallback that will
+ * be called every time the IME window insets change.
+ * @param context User-defined context set in
+ * GameTextInput_setImeWIndowInsetsCallback.
+ * @param current_insets Current IME insets, owned by the library and valid
+ * during the callback.
+ */
+typedef void (*GameTextInputImeInsetsCallback)(void *context,
+                                               const ARect *current_insets);
+
+/**
+ * Optionally set a callback to be called whenever the IME insets change.
+ * Not necessary if you are using GameActivity, which handles these callbacks
+ * for you.
+ * @param input A valid GameTextInput library handle.
+ * @param callback Called by the library when the IME insets change.
+ * @param context Context passed as first argument to the callback.
+ */
+void GameTextInput_setImeInsetsCallback(GameTextInput *input,
+                                        GameTextInputImeInsetsCallback callback,
+                                        void *context);
+
+/**
+ * Get the current window insets for the IME.
+ * @param input A valid GameTextInput library handle.
+ * @param insets Filled with the current insets by this function.
+ */
+void GameTextInput_getImeInsets(const GameTextInput *input, ARect *insets);
+
+/**
+ * Unless using GameActivity, it is required to call this function from your
+ * Java gametextinput.Listener.onImeInsetsChanged method to
+ * trigger any event callbacks. When using GameActivity, this does not need to
+ * be called as insets processing is handled by the Activity.
+ * @param input A valid GameTextInput library handle.
+ * @param eventState A Java gametextinput.State object.
+ */
+void GameTextInput_processImeInsets(GameTextInput *input, const ARect *insets);
+
+/**
+ * Convert a GameTextInputState struct to a Java gametextinput.State object.
+ * Don't forget to delete the returned Java local ref when you're done.
+ * @param input A valid GameTextInput library handle.
+ * @param state Input state to convert.
+ * @return A Java object of class gametextinput.State. The caller is required to
+ * delete this local reference.
+ */
+jobject GameTextInputState_toJava(const GameTextInput *input,
+                                  const GameTextInputState *state);
+
+/**
+ * Convert from a Java gametextinput.State object into a C GameTextInputState
+ * struct.
+ * @param input A valid GameTextInput library handle.
+ * @param state A Java gametextinput.State object.
+ * @param callback A function called with the C struct, valid for the duration
+ * of the call.
+ * @param context Context passed to the callback.
+ */
+void GameTextInputState_fromJava(const GameTextInput *input, jobject state,
+                                 GameTextInputGetStateCallback callback,
+                                 void *context);
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @} */
diff --git a/android-activity/android-games-sdk/include/common/gamesdk_common.h b/android-activity/android-games-sdk/include/common/gamesdk_common.h
new file mode 100644
index 0000000..d29ac01
--- /dev/null
+++ b/android-activity/android-games-sdk/include/common/gamesdk_common.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * This is the main interface to the Android Performance Tuner library, also
+ * known as Tuning Fork.
+ *
+ * It is part of the Android Games SDK and produces best results when integrated
+ * with the Swappy Frame Pacing Library.
+ *
+ * See the documentation at
+ * https://developer.android.com/games/sdk/performance-tuner/custom-engine for
+ * more information on using this library in a native Android game.
+ *
+ */
+
+#pragma once
+
+// There are separate versions for each GameSDK component that use this format:
+#define ANDROID_GAMESDK_PACKED_VERSION(MAJOR, MINOR, BUGFIX) \
+    ((MAJOR << 16) | (MINOR << 8) | (BUGFIX))
+// Accessors
+#define ANDROID_GAMESDK_MAJOR_VERSION(PACKED) ((PACKED) >> 16)
+#define ANDROID_GAMESDK_MINOR_VERSION(PACKED) (((PACKED) >> 8) & 0xff)
+#define ANDROID_GAMESDK_BUGFIX_VERSION(PACKED) ((PACKED) & 0xff)
+
+#define AGDK_STRING_VERSION(MAJOR, MINOR, BUGFIX, GIT) \
+#MAJOR "." #MINOR "." #BUGFIX "." #GIT
diff --git a/android-activity/build.rs b/android-activity/build.rs
index 7fc92e7..42288f9 100644
--- a/android-activity/build.rs
+++ b/android-activity/build.rs
@@ -1,6 +1,9 @@
 #![allow(dead_code)]
 
 fn build_glue_for_game_activity() {
+    let activity_basepath = "android-games-sdk/game-activity/prefab-src/modules/game-activity/include";
+    let textinput_basepath = "android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include";
+
     for f in [
         "GameActivity.h",
         "GameActivity.cpp",
@@ -8,34 +11,40 @@ fn build_glue_for_game_activity() {
         "GameActivityEvents.cpp",
         "GameActivityLog.h",
     ] {
-        println!("cargo:rerun-if-changed=game-activity-csrc/game-activity/{f}");
+        println!("cargo:rerun-if-changed={activity_basepath}/game-activity/{f}");
     }
     cc::Build::new()
         .cpp(true)
-        .include("game-activity-csrc")
-        .file("game-activity-csrc/game-activity/GameActivity.cpp")
-        .file("game-activity-csrc/game-activity/GameActivityEvents.cpp")
+        .include("android-games-sdk/include")
+        .include(activity_basepath)
+        .include(textinput_basepath)
+        .file(format!("{activity_basepath}/game-activity/GameActivity.cpp"))
+        .file(format!("{activity_basepath}/game-activity/GameActivityEvents.cpp"))
         .extra_warnings(false)
         .cpp_link_stdlib("c++_static")
         .compile("libgame_activity.a");
 
     for f in ["gamecommon.h", "gametextinput.h", "gametextinput.cpp"] {
-        println!("cargo:rerun-if-changed=game-activity-csrc/game-text-input/{f}");
+        println!("cargo:rerun-if-changed={textinput_basepath}/game-text-input/{f}");
     }
     cc::Build::new()
         .cpp(true)
-        .include("game-activity-csrc")
-        .file("game-activity-csrc/game-text-input/gametextinput.cpp")
+        .include("android-games-sdk/include")
+        .include(textinput_basepath)
+        .file(format!("{textinput_basepath}/game-text-input/gametextinput.cpp"))
         .cpp_link_stdlib("c++_static")
         .compile("libgame_text_input.a");
 
     for f in ["android_native_app_glue.h", "android_native_app_glue.c"] {
-        println!("cargo:rerun-if-changed=game-activity-csrc/native_app_glue/{f}");
+        println!("cargo:rerun-if-changed={activity_basepath}/game-activity/native_app_glue/{f}");
     }
+    
     cc::Build::new()
-        .include("game-activity-csrc")
-        .include("game-activity-csrc/game-activity/native_app_glue")
-        .file("game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c")
+        .include("android-games-sdk/include")
+        .include(activity_basepath)
+        .include(textinput_basepath)
+        .include(format!("{activity_basepath}/game-activity/native_app_glue"))
+        .file(format!("{activity_basepath}/game-activity/native_app_glue/android_native_app_glue.c"))
         .extra_warnings(false)
         .cpp_link_stdlib("c++_static")
         .compile("libnative_app_glue.a");

From 85eb7274f4fc37b34705735d7e39af83f8e429f0 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Thu, 13 Mar 2025 17:28:19 -0700
Subject: [PATCH 77/93] android-game-sdk-rs: bump v2.0.2 -> v4.0.0

Signed-off-by: William Casarin <jb55@jb55.com>
---
 android-activity/android-games-sdk/README.md  |    1 +
 android-activity/android-games-sdk/copy-files |   32 +-
 .../android-games-sdk/file_list.txt           |   14 +-
 .../include/game-activity/GameActivity.cpp    | 1147 --------------
 .../include/game-activity/GameActivity.h      |  907 ++++++-----
 .../game-activity/GameActivityEvents.cpp      |  414 -----
 .../game-activity/GameActivityEvents.h        |  172 +-
 .../include/game-activity/GameActivityLog.h   |   26 +-
 .../native_app_glue/android_native_app_glue.c |  732 ---------
 .../native_app_glue/android_native_app_glue.h |  617 ++++----
 .../src/game-activity/GameActivity.cpp        | 1399 +++++++++++++++++
 .../src/game-activity/GameActivityEvents.cpp  |  335 ++++
 .../GameActivityEvents_internal.h             |   77 +
 .../native_app_glue/android_native_app_glue.c |  765 +++++++++
 .../include/game-text-input/gamecommon.h      |   41 -
 .../include/game-text-input/gametextinput.cpp |  377 -----
 .../include/game-text-input/gametextinput.h   |  714 ++++++++-
 .../src/game-text-input/gametextinput.cpp     |  386 +++++
 .../include/common/gamesdk_common.h           |    7 +-
 .../src/common/system_utils.cpp               |   72 +
 .../src/common/system_utils.h                 |   32 +
 android-activity/build.rs                     |   80 +-
 22 files changed, 4732 insertions(+), 3615 deletions(-)
 delete mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.cpp
 delete mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.cpp
 delete mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.c
 create mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/GameActivity.cpp
 create mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/GameActivityEvents.cpp
 create mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/GameActivityEvents_internal.h
 create mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/native_app_glue/android_native_app_glue.c
 delete mode 100644 android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gamecommon.h
 delete mode 100644 android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.cpp
 create mode 100644 android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/src/game-text-input/gametextinput.cpp
 create mode 100644 android-activity/android-games-sdk/src/common/system_utils.cpp
 create mode 100644 android-activity/android-games-sdk/src/common/system_utils.h

diff --git a/android-activity/android-games-sdk/README.md b/android-activity/android-games-sdk/README.md
index bfe6452..ad79875 100644
--- a/android-activity/android-games-sdk/README.md
+++ b/android-activity/android-games-sdk/README.md
@@ -10,6 +10,7 @@ This is a basic checklist for things that need to be done before updating to a n
 
 - [ ] Ensure all patches applied to the local repo have been backported (see section below on backporting patches)
 - [ ] Rebase patches on top of a new *release* version of agdk. If you're not sure which version you should be rebasing on, open an issue.
+- [ ] If there have been substantial path changes, remove the existing files first so that its a clean graft
 - [ ] Copy any new files over from the new version using the [copy_files](./copy_files) script (see section below on copying files)
 - [ ] Update [build.rs](../build.rs) with any new includes and src files
 - [ ] Regenerate ffi bindings using [generate_bindings.sh](./generate_bindings.sh)
diff --git a/android-activity/android-games-sdk/copy-files b/android-activity/android-games-sdk/copy-files
index 5e21578..71dd503 100755
--- a/android-activity/android-games-sdk/copy-files
+++ b/android-activity/android-games-sdk/copy-files
@@ -35,23 +35,27 @@ mkdir -p "$DEST_DIR"
 while IFS= read -r file || [ -n "$file" ]; do
     # Skip empty lines and comments
     if [ -z "$file" ] || [[ "$file" =~ ^# ]]; then
-	continue
+        continue
     fi
 
+    fpath="$(find "$SOURCE_DIR" -name "$file" -type f)"
+
     # Find matching files
-    find "$SOURCE_DIR" -name "$file" -type f | while read -r file; do
-	# Get the relative path
-	rel_path="${file#$SOURCE_DIR/}"
-	dest_file="$DEST_DIR/$rel_path"
-	dest_dir=$(dirname "$dest_file")
-
-	# Create destination directory structure
-	mkdir -p "$dest_dir"
-
-	# Copy the file
-	cp "$file" "$dest_file"
-	echo "Copied: $rel_path"
-    done
+    if [ -f "$fpath" ]; then
+        # Get the relative path
+        rel_path="${fpath#$SOURCE_DIR/}"
+        dest_file="$DEST_DIR/$rel_path"
+        dest_dir=$(dirname "$dest_file")
+
+        # Create destination directory structure
+        mkdir -p "$dest_dir"
+
+        # Copy the file
+        cp "$fpath" "$dest_file"
+        echo "Copied: $rel_path"
+    else
+        echo "ERROR: '$file' not found"
+    fi
 done < "$FILE_LIST"
 
 echo "Copy operation completed."
diff --git a/android-activity/android-games-sdk/file_list.txt b/android-activity/android-games-sdk/file_list.txt
index 503ef41..506525f 100644
--- a/android-activity/android-games-sdk/file_list.txt
+++ b/android-activity/android-games-sdk/file_list.txt
@@ -1,11 +1,13 @@
-GameActivity.h
+android_native_app_glue.c
+android_native_app_glue.h
 GameActivity.cpp
-GameActivityEvents.h
 GameActivityEvents.cpp
+GameActivityEvents.h
+GameActivityEvents_internal.h
+GameActivity.h
 GameActivityLog.h
+gamesdk_common.h
 gametextinput.cpp
 gametextinput.h
-gamecommon.h
-gamesdk_common.h
-android_native_app_glue.h
-android_native_app_glue.c
+system_utils.cpp
+system_utils.h
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.cpp b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.cpp
deleted file mode 100644
index 4dbc9e8..0000000
--- a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.cpp
+++ /dev/null
@@ -1,1147 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "GameActivity.h"
-
-#include <android/api-level.h>
-#include <android/asset_manager.h>
-#include <android/asset_manager_jni.h>
-#include <android/log.h>
-#include <android/looper.h>
-#include <android/native_window.h>
-#include <android/native_window_jni.h>
-#include <dlfcn.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <jni.h>
-#include <poll.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/system_properties.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <memory>
-#include <mutex>
-#include <string>
-
-#include "GameActivityLog.h"
-
-namespace {
-
-struct OwnedGameTextInputState {
-    OwnedGameTextInputState &operator=(const GameTextInputState &rhs) {
-        inner = rhs;
-        owned_string = std::string(rhs.text_UTF8, rhs.text_length);
-        inner.text_UTF8 = owned_string.data();
-        return *this;
-    }
-    GameTextInputState inner;
-    std::string owned_string;
-};
-
-}  // anonymous namespace
-
-#ifndef NELEM
-#define NELEM(x) ((int)(sizeof(x) / sizeof((x)[0])))
-#endif
-
-/*
- * JNI methods of the GameActivity Java class.
- */
-static struct {
-    jmethodID finish;
-    jmethodID setWindowFlags;
-    jmethodID getWindowInsets;
-    jmethodID getWaterfallInsets;
-    jmethodID setImeEditorInfoFields;
-} gGameActivityClassInfo;
-
-/*
- * JNI fields of the androidx.core.graphics.Insets Java class.
- */
-static struct {
-    jfieldID left;
-    jfieldID right;
-    jfieldID top;
-    jfieldID bottom;
-} gInsetsClassInfo;
-
-/*
- * JNI fields of the Configuration Java class.
- */
-static struct ConfigurationClassInfo {
-    jfieldID colorMode;
-    jfieldID densityDpi;
-    jfieldID fontScale;
-    jfieldID fontWeightAdjustment;
-    jfieldID hardKeyboardHidden;
-    jfieldID keyboard;
-    jfieldID keyboardHidden;
-    jfieldID mcc;
-    jfieldID mnc;
-    jfieldID navigation;
-    jfieldID navigationHidden;
-    jfieldID orientation;
-    jfieldID screenHeightDp;
-    jfieldID screenLayout;
-    jfieldID screenWidthDp;
-    jfieldID smallestScreenWidthDp;
-    jfieldID touchscreen;
-    jfieldID uiMode;
-} gConfigurationClassInfo;
-
-/*
- * JNI methods of the WindowInsetsCompat.Type Java class.
- */
-static struct {
-    jmethodID methods[GAMECOMMON_INSETS_TYPE_COUNT];
-    jclass clazz;
-} gWindowInsetsCompatTypeClassInfo;
-
-/*
- * Contains a command to be executed by the GameActivity
- * on the application main thread.
- */
-struct ActivityWork {
-    int32_t cmd;
-    int64_t arg1;
-    int64_t arg2;
-    int64_t arg3;
-};
-
-/*
- * The type of commands that can be passed to the GameActivity and that
- * are executed on the application main thread.
- */
-enum {
-    CMD_FINISH = 1,
-    CMD_SET_WINDOW_FORMAT,
-    CMD_SET_WINDOW_FLAGS,
-    CMD_SHOW_SOFT_INPUT,
-    CMD_HIDE_SOFT_INPUT,
-    CMD_SET_SOFT_INPUT_STATE,
-    CMD_SET_IME_EDITOR_INFO
-};
-
-/*
- * Last known Configuration values. They may be accessed from the different
- * thread, this is why they are made atomic.
- */
-static struct Configuration {
-    std::atomic_int colorMode;
-    std::atomic_int densityDpi;
-    std::atomic<float> fontScale;
-    std::atomic_int fontWeightAdjustment;
-    std::atomic_int hardKeyboardHidden;
-    std::atomic_int keyboard;
-    std::atomic_int keyboardHidden;
-    std::atomic_int mcc;
-    std::atomic_int mnc;
-    std::atomic_int navigation;
-    std::atomic_int navigationHidden;
-    std::atomic_int orientation;
-    std::atomic_int screenHeightDp;
-    std::atomic_int screenLayout;
-    std::atomic_int screenWidthDp;
-    std::atomic_int smallestScreenWidthDp;
-    std::atomic_int touchscreen;
-    std::atomic_int uiMode;
-} gConfiguration;
-
-/*
- * Write a command to be executed by the GameActivity on the application main
- * thread.
- */
-static void write_work(int fd, int32_t cmd, int64_t arg1 = 0, int64_t arg2 = 0,
-                       int64_t arg3 = 0) {
-    ActivityWork work;
-    work.cmd = cmd;
-    work.arg1 = arg1;
-    work.arg2 = arg2;
-    work.arg3 = arg3;
-
-    LOG_TRACE("write_work: cmd=%d", cmd);
-restart:
-    int res = write(fd, &work, sizeof(work));
-    if (res < 0 && errno == EINTR) {
-        goto restart;
-    }
-
-    if (res == sizeof(work)) return;
-
-    if (res < 0) {
-        ALOGW("Failed writing to work fd: %s", strerror(errno));
-    } else {
-        ALOGW("Truncated writing to work fd: %d", res);
-    }
-}
-
-/*
- * Read commands to be executed by the GameActivity on the application main
- * thread.
- */
-static bool read_work(int fd, ActivityWork *outWork) {
-    int res = read(fd, outWork, sizeof(ActivityWork));
-    // no need to worry about EINTR, poll loop will just come back again.
-    if (res == sizeof(ActivityWork)) return true;
-
-    if (res < 0) {
-        ALOGW("Failed reading work fd: %s", strerror(errno));
-    } else {
-        ALOGW("Truncated reading work fd: %d", res);
-    }
-    return false;
-}
-
-/*
- * Native state for interacting with the GameActivity class.
- */
-struct NativeCode : public GameActivity {
-    NativeCode() {
-        memset((GameActivity *)this, 0, sizeof(GameActivity));
-        memset(&callbacks, 0, sizeof(callbacks));
-        memset(&insetsState, 0, sizeof(insetsState));
-        nativeWindow = NULL;
-        mainWorkRead = mainWorkWrite = -1;
-        gameTextInput = NULL;
-    }
-
-    ~NativeCode() {
-        if (callbacks.onDestroy != NULL) {
-            callbacks.onDestroy(this);
-        }
-        if (env != NULL) {
-            if (javaGameActivity != NULL) {
-                env->DeleteGlobalRef(javaGameActivity);
-            }
-            if (javaAssetManager != NULL) {
-                env->DeleteGlobalRef(javaAssetManager);
-            }
-        }
-        GameTextInput_destroy(gameTextInput);
-        if (looper != NULL && mainWorkRead >= 0) {
-            ALooper_removeFd(looper, mainWorkRead);
-        }
-        ALooper_release(looper);
-        looper = NULL;
-
-        setSurface(NULL);
-        if (mainWorkRead >= 0) close(mainWorkRead);
-        if (mainWorkWrite >= 0) close(mainWorkWrite);
-    }
-
-    void setSurface(jobject _surface) {
-        if (nativeWindow != NULL) {
-            ANativeWindow_release(nativeWindow);
-        }
-        if (_surface != NULL) {
-            nativeWindow = ANativeWindow_fromSurface(env, _surface);
-        } else {
-            nativeWindow = NULL;
-        }
-    }
-
-    GameActivityCallbacks callbacks;
-
-    std::string internalDataPathObj;
-    std::string externalDataPathObj;
-    std::string obbPathObj;
-
-    ANativeWindow *nativeWindow;
-    int32_t lastWindowWidth;
-    int32_t lastWindowHeight;
-
-    // These are used to wake up the main thread to process work.
-    int mainWorkRead;
-    int mainWorkWrite;
-    ALooper *looper;
-
-    // Need to hold on to a reference here in case the upper layers destroy our
-    // AssetManager.
-    jobject javaAssetManager;
-
-    GameTextInput *gameTextInput;
-    // Set by users in GameActivity_setTextInputState, then passed to
-    // GameTextInput.
-    OwnedGameTextInputState gameTextInputState;
-    std::mutex gameTextInputStateMutex;
-
-    ARect insetsState[GAMECOMMON_INSETS_TYPE_COUNT];
-};
-
-static void readConfigurationValues(NativeCode *code, jobject javaConfig);
-
-extern "C" void GameActivity_finish(GameActivity *activity) {
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    write_work(code->mainWorkWrite, CMD_FINISH, 0);
-}
-
-extern "C" void GameActivity_setWindowFlags(GameActivity *activity,
-                                            uint32_t values, uint32_t mask) {
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    write_work(code->mainWorkWrite, CMD_SET_WINDOW_FLAGS, values, mask);
-}
-
-extern "C" void GameActivity_showSoftInput(GameActivity *activity,
-                                           uint32_t flags) {
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    write_work(code->mainWorkWrite, CMD_SHOW_SOFT_INPUT, flags);
-}
-
-extern "C" void GameActivity_setTextInputState(
-    GameActivity *activity, const GameTextInputState *state) {
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    std::lock_guard<std::mutex> lock(code->gameTextInputStateMutex);
-    code->gameTextInputState = *state;
-    write_work(code->mainWorkWrite, CMD_SET_SOFT_INPUT_STATE);
-}
-
-extern "C" void GameActivity_getTextInputState(
-    GameActivity *activity, GameTextInputGetStateCallback callback,
-    void *context) {
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    return GameTextInput_getState(code->gameTextInput, callback, context);
-}
-
-extern "C" void GameActivity_hideSoftInput(GameActivity *activity,
-                                           uint32_t flags) {
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    write_work(code->mainWorkWrite, CMD_HIDE_SOFT_INPUT, flags);
-}
-
-extern "C" void GameActivity_getWindowInsets(GameActivity *activity,
-                                             GameCommonInsetsType type,
-                                             ARect *insets) {
-    if (type < 0 || type >= GAMECOMMON_INSETS_TYPE_COUNT) return;
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    *insets = code->insetsState[type];
-}
-
-extern "C" GameTextInput *GameActivity_getTextInput(
-    const GameActivity *activity) {
-    const NativeCode *code = static_cast<const NativeCode *>(activity);
-    return code->gameTextInput;
-}
-
-/*
- * Log the JNI exception, if any.
- */
-static void checkAndClearException(JNIEnv *env, const char *methodName) {
-    if (env->ExceptionCheck()) {
-        ALOGE("Exception while running %s", methodName);
-        env->ExceptionDescribe();
-        env->ExceptionClear();
-    }
-}
-
-/*
- * Callback for handling native events on the application's main thread.
- */
-static int mainWorkCallback(int fd, int events, void *data) {
-    ALOGD("************** mainWorkCallback *********");
-    NativeCode *code = (NativeCode *)data;
-    if ((events & POLLIN) == 0) {
-        return 1;
-    }
-
-    ActivityWork work;
-    if (!read_work(code->mainWorkRead, &work)) {
-        return 1;
-    }
-    LOG_TRACE("mainWorkCallback: cmd=%d", work.cmd);
-    switch (work.cmd) {
-        case CMD_FINISH: {
-            code->env->CallVoidMethod(code->javaGameActivity,
-                                      gGameActivityClassInfo.finish);
-            checkAndClearException(code->env, "finish");
-        } break;
-        case CMD_SET_WINDOW_FLAGS: {
-            code->env->CallVoidMethod(code->javaGameActivity,
-                                      gGameActivityClassInfo.setWindowFlags,
-                                      work.arg1, work.arg2);
-            checkAndClearException(code->env, "setWindowFlags");
-        } break;
-        case CMD_SHOW_SOFT_INPUT: {
-            GameTextInput_showIme(code->gameTextInput, work.arg1);
-        } break;
-        case CMD_SET_SOFT_INPUT_STATE: {
-            std::lock_guard<std::mutex> lock(code->gameTextInputStateMutex);
-            GameTextInput_setState(code->gameTextInput,
-                                   &code->gameTextInputState.inner);
-            checkAndClearException(code->env, "setTextInputState");
-        } break;
-        case CMD_HIDE_SOFT_INPUT: {
-            GameTextInput_hideIme(code->gameTextInput, work.arg1);
-        } break;
-        case CMD_SET_IME_EDITOR_INFO: {
-            code->env->CallVoidMethod(
-                code->javaGameActivity,
-                gGameActivityClassInfo.setImeEditorInfoFields, work.arg1,
-                work.arg2, work.arg3);
-            checkAndClearException(code->env, "setImeEditorInfo");
-        } break;
-        default:
-            ALOGW("Unknown work command: %d", work.cmd);
-            break;
-    }
-
-    return 1;
-}
-
-// ------------------------------------------------------------------------
-static thread_local std::string g_error_msg;
-
-static jlong initializeNativeCode_native(
-    JNIEnv *env, jobject javaGameActivity, jstring internalDataDir,
-    jstring obbDir, jstring externalDataDir, jobject jAssetMgr,
-    jbyteArray savedState, jobject javaConfig) {
-    LOG_TRACE("initializeNativeCode_native");
-    NativeCode *code = NULL;
-
-    code = new NativeCode();
-
-    code->looper = ALooper_forThread();
-    if (code->looper == nullptr) {
-        g_error_msg = "Unable to retrieve native ALooper";
-        ALOGW("%s", g_error_msg.c_str());
-        delete code;
-        return 0;
-    }
-    ALooper_acquire(code->looper);
-
-    int msgpipe[2];
-    if (pipe(msgpipe)) {
-        g_error_msg = "could not create pipe: ";
-        g_error_msg += strerror(errno);
-
-        ALOGW("%s", g_error_msg.c_str());
-        delete code;
-        return 0;
-    }
-    code->mainWorkRead = msgpipe[0];
-    code->mainWorkWrite = msgpipe[1];
-    int result = fcntl(code->mainWorkRead, F_SETFL, O_NONBLOCK);
-    SLOGW_IF(result != 0,
-             "Could not make main work read pipe "
-             "non-blocking: %s",
-             strerror(errno));
-    result = fcntl(code->mainWorkWrite, F_SETFL, O_NONBLOCK);
-    SLOGW_IF(result != 0,
-             "Could not make main work write pipe "
-             "non-blocking: %s",
-             strerror(errno));
-    ALooper_addFd(code->looper, code->mainWorkRead, 0, ALOOPER_EVENT_INPUT,
-                  mainWorkCallback, code);
-
-    code->GameActivity::callbacks = &code->callbacks;
-    if (env->GetJavaVM(&code->vm) < 0) {
-        ALOGW("GameActivity GetJavaVM failed");
-        delete code;
-        return 0;
-    }
-    code->env = env;
-    code->javaGameActivity = env->NewGlobalRef(javaGameActivity);
-
-    const char *dirStr =
-        internalDataDir ? env->GetStringUTFChars(internalDataDir, NULL) : "";
-    code->internalDataPathObj = dirStr;
-    code->internalDataPath = code->internalDataPathObj.c_str();
-    if (internalDataDir) env->ReleaseStringUTFChars(internalDataDir, dirStr);
-
-    dirStr =
-        externalDataDir ? env->GetStringUTFChars(externalDataDir, NULL) : "";
-    code->externalDataPathObj = dirStr;
-    code->externalDataPath = code->externalDataPathObj.c_str();
-    if (externalDataDir) env->ReleaseStringUTFChars(externalDataDir, dirStr);
-
-    code->javaAssetManager = env->NewGlobalRef(jAssetMgr);
-    code->assetManager = AAssetManager_fromJava(env, jAssetMgr);
-
-    dirStr = obbDir ? env->GetStringUTFChars(obbDir, NULL) : "";
-    code->obbPathObj = dirStr;
-    code->obbPath = code->obbPathObj.c_str();
-    if (obbDir) env->ReleaseStringUTFChars(obbDir, dirStr);
-
-    jbyte *rawSavedState = NULL;
-    jsize rawSavedSize = 0;
-    if (savedState != NULL) {
-        rawSavedState = env->GetByteArrayElements(savedState, NULL);
-        rawSavedSize = env->GetArrayLength(savedState);
-    }
-
-    readConfigurationValues(code, javaConfig);
-
-    GameActivity_onCreate_C(code, rawSavedState, rawSavedSize);
-
-    code->gameTextInput = GameTextInput_init(env, 0);
-    GameTextInput_setEventCallback(code->gameTextInput,
-                                   reinterpret_cast<GameTextInputEventCallback>(
-                                       code->callbacks.onTextInputEvent),
-                                   code);
-
-    if (rawSavedState != NULL) {
-        env->ReleaseByteArrayElements(savedState, rawSavedState, 0);
-    }
-
-    return reinterpret_cast<jlong>(code);
-}
-
-static jstring getDlError_native(JNIEnv *env, jobject javaGameActivity) {
-    jstring result = env->NewStringUTF(g_error_msg.c_str());
-    g_error_msg.clear();
-    return result;
-}
-
-static void terminateNativeCode_native(JNIEnv *env, jobject javaGameActivity,
-                                    jlong handle) {
-    LOG_TRACE("terminateNativeCode_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        delete code;
-    }
-}
-
-static void onStart_native(JNIEnv *env, jobject javaGameActivity,
-                           jlong handle) {
-    ALOGV("onStart_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->callbacks.onStart != NULL) {
-            code->callbacks.onStart(code);
-        }
-    }
-}
-
-static void onResume_native(JNIEnv *env, jobject javaGameActivity,
-                            jlong handle) {
-    LOG_TRACE("onResume_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->callbacks.onResume != NULL) {
-            code->callbacks.onResume(code);
-        }
-    }
-}
-
-struct SaveInstanceLocals {
-    JNIEnv *env;
-    jbyteArray array;
-};
-
-static jbyteArray onSaveInstanceState_native(JNIEnv *env,
-                                             jobject javaGameActivity,
-                                             jlong handle) {
-    LOG_TRACE("onSaveInstanceState_native");
-
-    SaveInstanceLocals locals{
-        env, NULL};  // Passed through the user's state prep function.
-
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->callbacks.onSaveInstanceState != NULL) {
-            code->callbacks.onSaveInstanceState(
-                code,
-                [](const char *bytes, int len, void *context) {
-                    auto locals = static_cast<SaveInstanceLocals *>(context);
-                    if (len > 0) {
-                        locals->array = locals->env->NewByteArray(len);
-                        if (locals->array != NULL) {
-                            locals->env->SetByteArrayRegion(
-                                locals->array, 0, len, (const jbyte *)bytes);
-                        }
-                    }
-                },
-                &locals);
-        }
-    }
-    return locals.array;
-}
-
-static void onPause_native(JNIEnv *env, jobject javaGameActivity,
-                           jlong handle) {
-    LOG_TRACE("onPause_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->callbacks.onPause != NULL) {
-            code->callbacks.onPause(code);
-        }
-    }
-}
-
-static void onStop_native(JNIEnv *env, jobject javaGameActivity, jlong handle) {
-    LOG_TRACE("onStop_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->callbacks.onStop != NULL) {
-            code->callbacks.onStop(code);
-        }
-    }
-}
-
-static void readConfigurationValues(NativeCode *code, jobject javaConfig) {
-    if (gConfigurationClassInfo.colorMode != NULL) {
-        gConfiguration.colorMode = code->env->GetIntField(
-            javaConfig, gConfigurationClassInfo.colorMode);
-    }
-
-    gConfiguration.densityDpi =
-        code->env->GetIntField(javaConfig, gConfigurationClassInfo.densityDpi);
-    gConfiguration.fontScale =
-        code->env->GetFloatField(javaConfig, gConfigurationClassInfo.fontScale);
-
-    if (gConfigurationClassInfo.fontWeightAdjustment != NULL) {
-        gConfiguration.fontWeightAdjustment = code->env->GetIntField(
-            javaConfig, gConfigurationClassInfo.fontWeightAdjustment);
-    }
-
-    gConfiguration.hardKeyboardHidden = code->env->GetIntField(
-        javaConfig, gConfigurationClassInfo.hardKeyboardHidden);
-    gConfiguration.mcc =
-        code->env->GetIntField(javaConfig, gConfigurationClassInfo.mcc);
-    gConfiguration.mnc =
-        code->env->GetIntField(javaConfig, gConfigurationClassInfo.mnc);
-    gConfiguration.navigation =
-        code->env->GetIntField(javaConfig, gConfigurationClassInfo.navigation);
-    gConfiguration.navigationHidden = code->env->GetIntField(
-        javaConfig, gConfigurationClassInfo.navigationHidden);
-    gConfiguration.orientation =
-        code->env->GetIntField(javaConfig, gConfigurationClassInfo.orientation);
-    gConfiguration.screenHeightDp = code->env->GetIntField(
-        javaConfig, gConfigurationClassInfo.screenHeightDp);
-    gConfiguration.screenLayout = code->env->GetIntField(
-        javaConfig, gConfigurationClassInfo.screenLayout);
-    gConfiguration.screenWidthDp = code->env->GetIntField(
-        javaConfig, gConfigurationClassInfo.screenWidthDp);
-    gConfiguration.smallestScreenWidthDp = code->env->GetIntField(
-        javaConfig, gConfigurationClassInfo.smallestScreenWidthDp);
-    gConfiguration.touchscreen =
-        code->env->GetIntField(javaConfig, gConfigurationClassInfo.touchscreen);
-    gConfiguration.uiMode =
-        code->env->GetIntField(javaConfig, gConfigurationClassInfo.uiMode);
-
-    checkAndClearException(code->env, "Configuration.get");
-}
-
-static void onConfigurationChanged_native(JNIEnv *env, jobject javaGameActivity,
-                                          jlong handle, jobject javaNewConfig) {
-    LOG_TRACE("onConfigurationChanged_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        readConfigurationValues(code, javaNewConfig);
-
-        if (code->callbacks.onConfigurationChanged != NULL) {
-            code->callbacks.onConfigurationChanged(code);
-        }
-    }
-}
-
-static void onTrimMemory_native(JNIEnv *env, jobject javaGameActivity,
-                                jlong handle, jint level) {
-    LOG_TRACE("onTrimMemory_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->callbacks.onTrimMemory != NULL) {
-            code->callbacks.onTrimMemory(code, level);
-        }
-    }
-}
-
-static void onWindowFocusChanged_native(JNIEnv *env, jobject javaGameActivity,
-                                        jlong handle, jboolean focused) {
-    LOG_TRACE("onWindowFocusChanged_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->callbacks.onWindowFocusChanged != NULL) {
-            code->callbacks.onWindowFocusChanged(code, focused ? 1 : 0);
-        }
-    }
-}
-
-static void onSurfaceCreated_native(JNIEnv *env, jobject javaGameActivity,
-                                    jlong handle, jobject surface) {
-    ALOGV("onSurfaceCreated_native");
-    LOG_TRACE("onSurfaceCreated_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        code->setSurface(surface);
-
-        if (code->nativeWindow != NULL &&
-            code->callbacks.onNativeWindowCreated != NULL) {
-            code->callbacks.onNativeWindowCreated(code, code->nativeWindow);
-        }
-    }
-}
-
-static void onSurfaceChanged_native(JNIEnv *env, jobject javaGameActivity,
-                                    jlong handle, jobject surface, jint format,
-                                    jint width, jint height) {
-    LOG_TRACE("onSurfaceChanged_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        ANativeWindow *oldNativeWindow = code->nativeWindow;
-        // Fix for window being destroyed behind the scenes on older Android
-        // versions.
-        if (oldNativeWindow != NULL) {
-            ANativeWindow_acquire(oldNativeWindow);
-        }
-        code->setSurface(surface);
-        if (oldNativeWindow != code->nativeWindow) {
-            if (oldNativeWindow != NULL &&
-                code->callbacks.onNativeWindowDestroyed != NULL) {
-                code->callbacks.onNativeWindowDestroyed(code, oldNativeWindow);
-            }
-            if (code->nativeWindow != NULL) {
-                if (code->callbacks.onNativeWindowCreated != NULL) {
-                    code->callbacks.onNativeWindowCreated(code,
-                                                          code->nativeWindow);
-                }
-
-                code->lastWindowWidth =
-                    ANativeWindow_getWidth(code->nativeWindow);
-                code->lastWindowHeight =
-                    ANativeWindow_getHeight(code->nativeWindow);
-            }
-        } else {
-            // Maybe it was resized?
-            int32_t newWidth = ANativeWindow_getWidth(code->nativeWindow);
-            int32_t newHeight = ANativeWindow_getHeight(code->nativeWindow);
-
-            if (newWidth != code->lastWindowWidth ||
-                newHeight != code->lastWindowHeight) {
-                code->lastWindowWidth = newWidth;
-                code->lastWindowHeight = newHeight;
-
-                if (code->callbacks.onNativeWindowResized != NULL) {
-                    code->callbacks.onNativeWindowResized(
-                        code, code->nativeWindow, newWidth, newHeight);
-                }
-            }
-        }
-        // Release the window we acquired earlier.
-        if (oldNativeWindow != NULL) {
-            ANativeWindow_release(oldNativeWindow);
-        }
-    }
-}
-
-static void onSurfaceRedrawNeeded_native(JNIEnv *env, jobject javaGameActivity,
-                                         jlong handle) {
-    LOG_TRACE("onSurfaceRedrawNeeded_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->nativeWindow != NULL &&
-            code->callbacks.onNativeWindowRedrawNeeded != NULL) {
-            code->callbacks.onNativeWindowRedrawNeeded(code,
-                                                       code->nativeWindow);
-        }
-    }
-}
-
-static void onSurfaceDestroyed_native(JNIEnv *env, jobject javaGameActivity,
-                                      jlong handle) {
-    LOG_TRACE("onSurfaceDestroyed_native");
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-        if (code->nativeWindow != NULL &&
-            code->callbacks.onNativeWindowDestroyed != NULL) {
-            code->callbacks.onNativeWindowDestroyed(code, code->nativeWindow);
-        }
-        code->setSurface(NULL);
-    }
-}
-
-extern "C" void GameActivity_setImeEditorInfo(GameActivity *activity,
-                                              int inputType, int actionId,
-                                              int imeOptions) {
-    NativeCode *code = static_cast<NativeCode *>(activity);
-    write_work(code->mainWorkWrite, CMD_SET_IME_EDITOR_INFO, inputType,
-               actionId, imeOptions);
-}
-
-extern "C" int GameActivity_getColorMode(GameActivity *) {
-    return gConfiguration.colorMode;
-}
-
-extern "C" int GameActivity_getDensityDpi(GameActivity *) {
-    return gConfiguration.densityDpi;
-}
-
-extern "C" float GameActivity_getFontScale(GameActivity *) {
-    return gConfiguration.fontScale;
-}
-
-extern "C" int GameActivity_getFontWeightAdjustment(GameActivity *) {
-    return gConfiguration.fontWeightAdjustment;
-}
-
-extern "C" int GameActivity_getHardKeyboardHidden(GameActivity *) {
-    return gConfiguration.hardKeyboardHidden;
-}
-
-extern "C" int GameActivity_getKeyboard(GameActivity *) {
-    return gConfiguration.keyboard;
-}
-
-extern "C" int GameActivity_getKeyboardHidden(GameActivity *) {
-    return gConfiguration.keyboardHidden;
-}
-
-extern "C" int GameActivity_getMcc(GameActivity *) {
-    return gConfiguration.mcc;
-}
-
-extern "C" int GameActivity_getMnc(GameActivity *) {
-    return gConfiguration.mnc;
-}
-
-extern "C" int GameActivity_getNavigation(GameActivity *) {
-    return gConfiguration.navigation;
-}
-
-extern "C" int GameActivity_getNavigationHidden(GameActivity *) {
-    return gConfiguration.navigationHidden;
-}
-
-extern "C" int GameActivity_getOrientation(GameActivity *) {
-    return gConfiguration.orientation;
-}
-
-extern "C" int GameActivity_getScreenHeightDp(GameActivity *) {
-    return gConfiguration.screenHeightDp;
-}
-
-extern "C" int GameActivity_getScreenLayout(GameActivity *) {
-    return gConfiguration.screenLayout;
-}
-
-extern "C" int GameActivity_getScreenWidthDp(GameActivity *) {
-    return gConfiguration.screenWidthDp;
-}
-
-extern "C" int GameActivity_getSmallestScreenWidthDp(GameActivity *) {
-    return gConfiguration.smallestScreenWidthDp;
-}
-
-extern "C" int GameActivity_getTouchscreen(GameActivity *) {
-    return gConfiguration.touchscreen;
-}
-
-extern "C" int GameActivity_getUIMode(GameActivity *) {
-    return gConfiguration.uiMode;
-}
-
-static bool onTouchEvent_native(JNIEnv *env, jobject javaGameActivity,
-                                jlong handle, jobject motionEvent) {
-    if (handle == 0) return false;
-    NativeCode *code = (NativeCode *)handle;
-    if (code->callbacks.onTouchEvent == nullptr) return false;
-
-    static GameActivityMotionEvent c_event;
-    GameActivityMotionEvent_fromJava(env, motionEvent, &c_event);
-    return code->callbacks.onTouchEvent(code, &c_event);
-
-}
-
-static bool onKeyUp_native(JNIEnv *env, jobject javaGameActivity, jlong handle,
-                           jobject keyEvent) {
-    if (handle == 0) return false;
-    NativeCode *code = (NativeCode *)handle;
-    if (code->callbacks.onKeyUp == nullptr) return false;
-
-    static GameActivityKeyEvent c_event;
-    GameActivityKeyEvent_fromJava(env, keyEvent, &c_event);
-    return code->callbacks.onKeyUp(code, &c_event);
-}
-
-static bool onKeyDown_native(JNIEnv *env, jobject javaGameActivity,
-                             jlong handle, jobject keyEvent) {
-    if (handle == 0) return false;
-    NativeCode *code = (NativeCode *)handle;
-    if (code->callbacks.onKeyDown == nullptr) return false;
-
-    static GameActivityKeyEvent c_event;
-    GameActivityKeyEvent_fromJava(env, keyEvent, &c_event);
-    return code->callbacks.onKeyDown(code, &c_event);
-}
-
-static void onTextInput_native(JNIEnv *env, jobject activity, jlong handle,
-                               jobject textInputEvent) {
-    if (handle == 0) return;
-    NativeCode *code = (NativeCode *)handle;
-    GameTextInput_processEvent(code->gameTextInput, textInputEvent);
-}
-
-static void onWindowInsetsChanged_native(JNIEnv *env, jobject activity,
-                                         jlong handle) {
-    if (handle == 0) return;
-    NativeCode *code = (NativeCode *)handle;
-    if (code->callbacks.onWindowInsetsChanged == nullptr) return;
-    for (int type = 0; type < GAMECOMMON_INSETS_TYPE_COUNT; ++type) {
-        jobject jinsets;
-        // Note that waterfall insets are handled differently on the Java side.
-        if (type == GAMECOMMON_INSETS_TYPE_WATERFALL) {
-            jinsets = env->CallObjectMethod(
-                code->javaGameActivity,
-                gGameActivityClassInfo.getWaterfallInsets);
-        } else {
-            jint jtype = env->CallStaticIntMethod(
-                gWindowInsetsCompatTypeClassInfo.clazz,
-                gWindowInsetsCompatTypeClassInfo.methods[type]);
-            jinsets = env->CallObjectMethod(
-                code->javaGameActivity, gGameActivityClassInfo.getWindowInsets,
-                jtype);
-        }
-        ARect &insets = code->insetsState[type];
-        if (jinsets == nullptr) {
-            insets.left = 0;
-            insets.right = 0;
-            insets.top = 0;
-            insets.bottom = 0;
-        } else {
-            insets.left = env->GetIntField(jinsets, gInsetsClassInfo.left);
-            insets.right = env->GetIntField(jinsets, gInsetsClassInfo.right);
-            insets.top = env->GetIntField(jinsets, gInsetsClassInfo.top);
-            insets.bottom = env->GetIntField(jinsets, gInsetsClassInfo.bottom);
-        }
-    }
-    GameTextInput_processImeInsets(
-        code->gameTextInput, &code->insetsState[GAMECOMMON_INSETS_TYPE_IME]);
-    code->callbacks.onWindowInsetsChanged(code);
-}
-
-static void setInputConnection_native(JNIEnv *env, jobject activity,
-                                      jlong handle, jobject inputConnection) {
-    NativeCode *code = (NativeCode *)handle;
-    GameTextInput_setInputConnection(code->gameTextInput, inputConnection);
-}
-
-static void onContentRectChangedNative_native(JNIEnv *env, jobject activity,
-                                              jlong handle, jint x, jint y,
-                                              jint w, jint h) {
-    if (handle != 0) {
-        NativeCode *code = (NativeCode *)handle;
-
-        if (code->callbacks.onContentRectChanged != nullptr) {
-            ARect rect;
-            rect.left = x;
-            rect.top = y;
-            rect.right = x+w;
-            rect.bottom = y+h;
-            code->callbacks.onContentRectChanged(code, &rect);
-        }
-    }
-}
-
-static const JNINativeMethod g_methods[] = {
-    {"initializeNativeCode",
-     "(Ljava/lang/String;Ljava/lang/String;"
-     "Ljava/lang/String;Landroid/content/res/AssetManager;"
-     "[BLandroid/content/res/Configuration;)J",
-     (void *)initializeNativeCode_native},
-    {"getDlError", "()Ljava/lang/String;", (void *)getDlError_native},
-    {"terminateNativeCode", "(J)V", (void *)terminateNativeCode_native},
-    {"onStartNative", "(J)V", (void *)onStart_native},
-    {"onResumeNative", "(J)V", (void *)onResume_native},
-    {"onSaveInstanceStateNative", "(J)[B", (void *)onSaveInstanceState_native},
-    {"onPauseNative", "(J)V", (void *)onPause_native},
-    {"onStopNative", "(J)V", (void *)onStop_native},
-    {"onConfigurationChangedNative", "(JLandroid/content/res/Configuration;)V",
-     (void *)onConfigurationChanged_native},
-    {"onTrimMemoryNative", "(JI)V", (void *)onTrimMemory_native},
-    {"onWindowFocusChangedNative", "(JZ)V",
-     (void *)onWindowFocusChanged_native},
-    {"onSurfaceCreatedNative", "(JLandroid/view/Surface;)V",
-     (void *)onSurfaceCreated_native},
-    {"onSurfaceChangedNative", "(JLandroid/view/Surface;III)V",
-     (void *)onSurfaceChanged_native},
-    {"onSurfaceRedrawNeededNative", "(JLandroid/view/Surface;)V",
-     (void *)onSurfaceRedrawNeeded_native},
-    {"onSurfaceDestroyedNative", "(J)V", (void *)onSurfaceDestroyed_native},
-    {"onTouchEventNative", "(JLandroid/view/MotionEvent;)Z",
-     (void *)onTouchEvent_native},
-    {"onKeyDownNative", "(JLandroid/view/KeyEvent;)Z",
-     (void *)onKeyDown_native},
-    {"onKeyUpNative", "(JLandroid/view/KeyEvent;)Z", (void *)onKeyUp_native},
-    {"onTextInputEventNative",
-     "(JLcom/google/androidgamesdk/gametextinput/State;)V",
-     (void *)onTextInput_native},
-    {"onWindowInsetsChangedNative", "(J)V",
-     (void *)onWindowInsetsChanged_native},
-    {"setInputConnectionNative",
-     "(JLcom/google/androidgamesdk/gametextinput/InputConnection;)V",
-     (void *)setInputConnection_native},
-    {"onContentRectChangedNative", "(JIIII)V",
-     (void *)onContentRectChangedNative_native},
-};
-
-static const char *const kGameActivityPathName =
-    "com/google/androidgamesdk/GameActivity";
-
-static const char *const kInsetsPathName = "androidx/core/graphics/Insets";
-static const char *const kConfigurationPathName =
-    "android/content/res/Configuration";
-static const char *const kWindowInsetsCompatTypePathName =
-    "androidx/core/view/WindowInsetsCompat$Type";
-
-#define FIND_CLASS(var, className)   \
-    var = env->FindClass(className); \
-    LOG_FATAL_IF(!var, "Unable to find class %s", className);
-
-#define GET_METHOD_ID(var, clazz, methodName, fieldDescriptor)  \
-    var = env->GetMethodID(clazz, methodName, fieldDescriptor); \
-    LOG_FATAL_IF(!var, "Unable to find method %s", methodName);
-
-#define GET_STATIC_METHOD_ID(var, clazz, methodName, fieldDescriptor) \
-    var = env->GetStaticMethodID(clazz, methodName, fieldDescriptor); \
-    LOG_FATAL_IF(!var, "Unable to find static method %s", methodName);
-
-#define GET_FIELD_ID(var, clazz, fieldName, fieldDescriptor)  \
-    var = env->GetFieldID(clazz, fieldName, fieldDescriptor); \
-    LOG_FATAL_IF(!var, "Unable to find field %s", fieldName);
-
-static int jniRegisterNativeMethods(JNIEnv *env, const char *className,
-                                    const JNINativeMethod *methods,
-                                    int numMethods) {
-    ALOGV("Registering %s's %d native methods...", className, numMethods);
-    jclass clazz = env->FindClass(className);
-    LOG_FATAL_IF(clazz == nullptr,
-                 "Native registration unable to find class '%s'; aborting...",
-                 className);
-    int result = env->RegisterNatives(clazz, methods, numMethods);
-    env->DeleteLocalRef(clazz);
-    if (result == 0) {
-        return 0;
-    }
-
-    // Failure to register natives is fatal. Try to report the corresponding
-    // exception, otherwise abort with generic failure message.
-    jthrowable thrown = env->ExceptionOccurred();
-    if (thrown != NULL) {
-        env->ExceptionDescribe();
-        env->DeleteLocalRef(thrown);
-    }
-    LOG_FATAL("RegisterNatives failed for '%s'; aborting...", className);
-}
-
-extern "C" int GameActivity_register(JNIEnv *env) {
-    ALOGD("GameActivity_register");
-    jclass activity_class;
-    FIND_CLASS(activity_class, kGameActivityPathName);
-    GET_METHOD_ID(gGameActivityClassInfo.finish, activity_class, "finish",
-                  "()V");
-    GET_METHOD_ID(gGameActivityClassInfo.setWindowFlags, activity_class,
-                  "setWindowFlags", "(II)V");
-    GET_METHOD_ID(gGameActivityClassInfo.getWindowInsets, activity_class,
-                  "getWindowInsets", "(I)Landroidx/core/graphics/Insets;");
-    GET_METHOD_ID(gGameActivityClassInfo.getWaterfallInsets, activity_class,
-                  "getWaterfallInsets", "()Landroidx/core/graphics/Insets;");
-    GET_METHOD_ID(gGameActivityClassInfo.setImeEditorInfoFields, activity_class,
-                  "setImeEditorInfoFields", "(III)V");
-
-    jclass insets_class;
-    FIND_CLASS(insets_class, kInsetsPathName);
-    GET_FIELD_ID(gInsetsClassInfo.left, insets_class, "left", "I");
-    GET_FIELD_ID(gInsetsClassInfo.right, insets_class, "right", "I");
-    GET_FIELD_ID(gInsetsClassInfo.top, insets_class, "top", "I");
-    GET_FIELD_ID(gInsetsClassInfo.bottom, insets_class, "bottom", "I");
-
-    jclass configuration_class;
-    FIND_CLASS(configuration_class, kConfigurationPathName);
-
-    if (android_get_device_api_level() >= 26) {
-        GET_FIELD_ID(gConfigurationClassInfo.colorMode, configuration_class,
-                     "colorMode", "I");
-    }
-
-    GET_FIELD_ID(gConfigurationClassInfo.densityDpi, configuration_class,
-                 "densityDpi", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.fontScale, configuration_class,
-                 "fontScale", "F");
-
-    if (android_get_device_api_level() >= 31) {
-        GET_FIELD_ID(gConfigurationClassInfo.fontWeightAdjustment,
-                     configuration_class, "fontWeightAdjustment", "I");
-    }
-
-    GET_FIELD_ID(gConfigurationClassInfo.hardKeyboardHidden,
-                 configuration_class, "hardKeyboardHidden", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.keyboard, configuration_class,
-                 "keyboard", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.keyboardHidden, configuration_class,
-                 "keyboardHidden", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.mcc, configuration_class, "mcc", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.mnc, configuration_class, "mnc", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.navigation, configuration_class,
-                 "navigation", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.navigationHidden, configuration_class,
-                 "navigationHidden", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.orientation, configuration_class,
-                 "orientation", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.screenHeightDp, configuration_class,
-                 "screenHeightDp", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.screenLayout, configuration_class,
-                 "screenLayout", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.screenWidthDp, configuration_class,
-                 "screenWidthDp", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.smallestScreenWidthDp,
-                 configuration_class, "smallestScreenWidthDp", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.touchscreen, configuration_class,
-                 "touchscreen", "I");
-    GET_FIELD_ID(gConfigurationClassInfo.uiMode, configuration_class, "uiMode",
-                 "I");
-
-    jclass windowInsetsCompatType_class;
-    FIND_CLASS(windowInsetsCompatType_class, kWindowInsetsCompatTypePathName);
-    gWindowInsetsCompatTypeClassInfo.clazz =
-        (jclass)env->NewGlobalRef(windowInsetsCompatType_class);
-    // These names must match, in order, the GameCommonInsetsType enum fields
-    // Note that waterfall is handled differently by the insets API, so we
-    // exclude it here.
-    const char *methodNames[GAMECOMMON_INSETS_TYPE_WATERFALL] = {
-        "captionBar",
-        "displayCutout",
-        "ime",
-        "mandatorySystemGestures",
-        "navigationBars",
-        "statusBars",
-        "systemBars",
-        "systemGestures",
-        "tappableElement"};
-    for (int i = 0; i < GAMECOMMON_INSETS_TYPE_WATERFALL; ++i) {
-        GET_STATIC_METHOD_ID(gWindowInsetsCompatTypeClassInfo.methods[i],
-                             windowInsetsCompatType_class, methodNames[i],
-                             "()I");
-    }
-    return jniRegisterNativeMethods(env, kGameActivityPathName, g_methods,
-                                    NELEM(g_methods));
-}
-
-// XXX: This symbol is renamed with a _C suffix and then re-exported from
-// Rust because Rust/Cargo don't give us a way to directly export symbols
-// from C/C++ code: https://github.com/rust-lang/rfcs/issues/2771
-//
-extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_androidgamesdk_GameActivity_initializeNativeCode_C(
-    JNIEnv *env, jobject javaGameActivity, jstring internalDataDir,
-    jstring obbDir, jstring externalDataDir, jobject jAssetMgr,
-    jbyteArray savedState, jobject javaConfig) {
-    GameActivity_register(env);
-    jlong nativeCode = initializeNativeCode_native(
-        env, javaGameActivity, internalDataDir, obbDir, externalDataDir,
-        jAssetMgr, savedState, javaConfig);
-    return nativeCode;
-}
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.h b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.h
index b945069..b6ff8b4 100644
--- a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.h
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.h
@@ -31,26 +31,43 @@
 #include <android/input.h>
 #include <android/native_window.h>
 #include <android/rect.h>
+#include <common/gamesdk_common.h>
+#include <game-activity/GameActivityEvents.h>
+#include <game-text-input/gametextinput.h>
 #include <jni.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/types.h>
 
-#include "common/gamesdk_common.h"
-#include "game-activity/GameActivityEvents.h"
-#include "game-text-input/gametextinput.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define GAMEACTIVITY_MAJOR_VERSION 2
+#define GAMEACTIVITY_MAJOR_VERSION 4
 #define GAMEACTIVITY_MINOR_VERSION 0
-#define GAMEACTIVITY_BUGFIX_VERSION 2
-#define GAMEACTIVITY_PACKED_VERSION                            \
-    ANDROID_GAMESDK_PACKED_VERSION(GAMEACTIVITY_MAJOR_VERSION, \
-                                   GAMEACTIVITY_MINOR_VERSION, \
-                                   GAMEACTIVITY_BUGFIX_VERSION)
+#define GAMEACTIVITY_BUGFIX_VERSION 0
+#define GAMEACTIVITY_PACKED_VERSION                          \
+  ANDROID_GAMESDK_PACKED_VERSION(GAMEACTIVITY_MAJOR_VERSION, \
+                                 GAMEACTIVITY_MINOR_VERSION, \
+                                 GAMEACTIVITY_BUGFIX_VERSION)
+
+/**
+ * The type of a component for which to retrieve insets. See
+ * https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type
+ */
+typedef enum GameCommonInsetsType : uint8_t {
+  GAMECOMMON_INSETS_TYPE_CAPTION_BAR = 0,
+  GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT,
+  GAMECOMMON_INSETS_TYPE_IME,
+  GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES,
+  GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS,
+  GAMECOMMON_INSETS_TYPE_STATUS_BARS,
+  GAMECOMMON_INSETS_TYPE_SYSTEM_BARS,
+  GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES,
+  GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT,
+  GAMECOMMON_INSETS_TYPE_WATERFALL,
+  GAMECOMMON_INSETS_TYPE_COUNT
+} GameCommonInsetsType;
 
 /**
  * {@link GameActivityCallbacks}
@@ -63,66 +80,66 @@ struct GameActivityCallbacks;
  * code as it is being launched.
  */
 typedef struct GameActivity {
-    /**
-     * Pointer to the callback function table of the native application.
-     * You can set the functions here to your own callbacks.  The callbacks
-     * pointer itself here should not be changed; it is allocated and managed
-     * for you by the framework.
-     */
-    struct GameActivityCallbacks* callbacks;
-
-    /**
-     * The global handle on the process's Java VM.
-     */
-    JavaVM* vm;
-
-    /**
-     * JNI context for the main thread of the app.  Note that this field
-     * can ONLY be used from the main thread of the process; that is, the
-     * thread that calls into the GameActivityCallbacks.
-     */
-    JNIEnv* env;
-
-    /**
-     * The GameActivity object handle.
-     */
-    jobject javaGameActivity;
-
-    /**
-     * Path to this application's internal data directory.
-     */
-    const char* internalDataPath;
-
-    /**
-     * Path to this application's external (removable/mountable) data directory.
-     */
-    const char* externalDataPath;
-
-    /**
-     * The platform's SDK version code.
-     */
-    int32_t sdkVersion;
-
-    /**
-     * This is the native instance of the application.  It is not used by
-     * the framework, but can be set by the application to its own instance
-     * state.
-     */
-    void* instance;
-
-    /**
-     * Pointer to the Asset Manager instance for the application.  The
-     * application uses this to access binary assets bundled inside its own .apk
-     * file.
-     */
-    AAssetManager* assetManager;
-
-    /**
-     * Available starting with Honeycomb: path to the directory containing
-     * the application's OBB files (if any).  If the app doesn't have any
-     * OBB files, this directory may not exist.
-     */
-    const char* obbPath;
+  /**
+   * Pointer to the callback function table of the native application.
+   * You can set the functions here to your own callbacks.  The callbacks
+   * pointer itself here should not be changed; it is allocated and managed
+   * for you by the framework.
+   */
+  struct GameActivityCallbacks* callbacks;
+
+  /**
+   * The global handle on the process's Java VM.
+   */
+  JavaVM* vm;
+
+  /**
+   * JNI context for the main thread of the app.  Note that this field
+   * can ONLY be used from the main thread of the process; that is, the
+   * thread that calls into the GameActivityCallbacks.
+   */
+  JNIEnv* env;
+
+  /**
+   * The GameActivity object handle.
+   */
+  jobject javaGameActivity;
+
+  /**
+   * Path to this application's internal data directory.
+   */
+  const char* internalDataPath;
+
+  /**
+   * Path to this application's external (removable/mountable) data directory.
+   */
+  const char* externalDataPath;
+
+  /**
+   * The platform's SDK version code.
+   */
+  int32_t sdkVersion;
+
+  /**
+   * This is the native instance of the application.  It is not used by
+   * the framework, but can be set by the application to its own instance
+   * state.
+   */
+  void* instance;
+
+  /**
+   * Pointer to the Asset Manager instance for the application.  The
+   * application uses this to access binary assets bundled inside its own .apk
+   * file.
+   */
+  AAssetManager* assetManager;
+
+  /**
+   * Available starting with Honeycomb: path to the directory containing
+   * the application's OBB files (if any).  If the app doesn't have any
+   * OBB files, this directory may not exist.
+   */
+  const char* obbPath;
 } GameActivity;
 
 /**
@@ -139,144 +156,153 @@ typedef void (*SaveInstanceStateRecallback)(const char* bytes, int len,
  * to have it called.
  */
 typedef struct GameActivityCallbacks {
-    /**
-     * GameActivity has started.  See Java documentation for Activity.onStart()
-     * for more information.
-     */
-    void (*onStart)(GameActivity* activity);
-
-    /**
-     * GameActivity has resumed.  See Java documentation for Activity.onResume()
-     * for more information.
-     */
-    void (*onResume)(GameActivity* activity);
-
-    /**
-     * The framework is asking GameActivity to save its current instance state.
-     * See the Java documentation for Activity.onSaveInstanceState() for more
-     * information. The user should call the recallback with their data, its
-     * length and the provided context; they retain ownership of the data. Note
-     * that the saved state will be persisted, so it can not contain any active
-     * entities (pointers to memory, file descriptors, etc).
-     */
-    void (*onSaveInstanceState)(GameActivity* activity,
-                                SaveInstanceStateRecallback recallback,
-                                void* context);
-
-    /**
-     * GameActivity has paused.  See Java documentation for Activity.onPause()
-     * for more information.
-     */
-    void (*onPause)(GameActivity* activity);
-
-    /**
-     * GameActivity has stopped.  See Java documentation for Activity.onStop()
-     * for more information.
-     */
-    void (*onStop)(GameActivity* activity);
-
-    /**
-     * GameActivity is being destroyed.  See Java documentation for
-     * Activity.onDestroy() for more information.
-     */
-    void (*onDestroy)(GameActivity* activity);
-
-    /**
-     * Focus has changed in this GameActivity's window.  This is often used,
-     * for example, to pause a game when it loses input focus.
-     */
-    void (*onWindowFocusChanged)(GameActivity* activity, bool hasFocus);
-
-    /**
-     * The drawing window for this native activity has been created.  You
-     * can use the given native window object to start drawing.
-     */
-    void (*onNativeWindowCreated)(GameActivity* activity,
+  /**
+   * GameActivity has started.  See Java documentation for Activity.onStart()
+   * for more information.
+   */
+  void (*onStart)(GameActivity* activity);
+
+  /**
+   * GameActivity has resumed.  See Java documentation for Activity.onResume()
+   * for more information.
+   */
+  void (*onResume)(GameActivity* activity);
+
+  /**
+   * The framework is asking GameActivity to save its current instance state.
+   * See the Java documentation for Activity.onSaveInstanceState() for more
+   * information. The user should call the recallback with their data, its
+   * length and the provided context; they retain ownership of the data. Note
+   * that the saved state will be persisted, so it can not contain any active
+   * entities (pointers to memory, file descriptors, etc).
+   */
+  void (*onSaveInstanceState)(GameActivity* activity,
+                              SaveInstanceStateRecallback recallback,
+                              void* context);
+
+  /**
+   * GameActivity has paused.  See Java documentation for Activity.onPause()
+   * for more information.
+   */
+  void (*onPause)(GameActivity* activity);
+
+  /**
+   * GameActivity has stopped.  See Java documentation for Activity.onStop()
+   * for more information.
+   */
+  void (*onStop)(GameActivity* activity);
+
+  /**
+   * GameActivity is being destroyed.  See Java documentation for
+   * Activity.onDestroy() for more information.
+   */
+  void (*onDestroy)(GameActivity* activity);
+
+  /**
+   * Focus has changed in this GameActivity's window.  This is often used,
+   * for example, to pause a game when it loses input focus.
+   */
+  void (*onWindowFocusChanged)(GameActivity* activity, bool hasFocus);
+
+  /**
+   * The drawing window for this native activity has been created.  You
+   * can use the given native window object to start drawing.
+   */
+  void (*onNativeWindowCreated)(GameActivity* activity, ANativeWindow* window);
+
+  /**
+   * The drawing window for this native activity has been resized.  You should
+   * retrieve the new size from the window and ensure that your rendering in
+   * it now matches.
+   */
+  void (*onNativeWindowResized)(GameActivity* activity, ANativeWindow* window,
+                                int32_t newWidth, int32_t newHeight);
+
+  /**
+   * The drawing window for this native activity needs to be redrawn.  To
+   * avoid transient artifacts during screen changes (such resizing after
+   * rotation), applications should not return from this function until they
+   * have finished drawing their window in its current state.
+   */
+  void (*onNativeWindowRedrawNeeded)(GameActivity* activity,
+                                     ANativeWindow* window);
+
+  /**
+   * The drawing window for this native activity is going to be destroyed.
+   * You MUST ensure that you do not touch the window object after returning
+   * from this function: in the common case of drawing to the window from
+   * another thread, that means the implementation of this callback must
+   * properly synchronize with the other thread to stop its drawing before
+   * returning from here.
+   */
+  void (*onNativeWindowDestroyed)(GameActivity* activity,
                                   ANativeWindow* window);
 
-    /**
-     * The drawing window for this native activity has been resized.  You should
-     * retrieve the new size from the window and ensure that your rendering in
-     * it now matches.
-     */
-    void (*onNativeWindowResized)(GameActivity* activity, ANativeWindow* window,
-                                  int32_t newWidth, int32_t newHeight);
-
-    /**
-     * The drawing window for this native activity needs to be redrawn.  To
-     * avoid transient artifacts during screen changes (such resizing after
-     * rotation), applications should not return from this function until they
-     * have finished drawing their window in its current state.
-     */
-    void (*onNativeWindowRedrawNeeded)(GameActivity* activity,
-                                       ANativeWindow* window);
-
-    /**
-     * The drawing window for this native activity is going to be destroyed.
-     * You MUST ensure that you do not touch the window object after returning
-     * from this function: in the common case of drawing to the window from
-     * another thread, that means the implementation of this callback must
-     * properly synchronize with the other thread to stop its drawing before
-     * returning from here.
-     */
-    void (*onNativeWindowDestroyed)(GameActivity* activity,
-                                    ANativeWindow* window);
-
-    /**
-     * The current device AConfiguration has changed.  The new configuration can
-     * be retrieved from assetManager.
-     */
-    void (*onConfigurationChanged)(GameActivity* activity);
-
-    /**
-     * The system is running low on memory.  Use this callback to release
-     * resources you do not need, to help the system avoid killing more
-     * important processes.
-     */
-    void (*onTrimMemory)(GameActivity* activity, int level);
-
-    /**
-     * Callback called for every MotionEvent done on the GameActivity
-     * SurfaceView. Ownership of `event` is maintained by the library and it is
-     * only valid during the callback.
-     */
-    bool (*onTouchEvent)(GameActivity* activity,
-                         const GameActivityMotionEvent* event);
-
-    /**
-     * Callback called for every key down event on the GameActivity SurfaceView.
-     * Ownership of `event` is maintained by the library and it is only valid
-     * during the callback.
-     */
-    bool (*onKeyDown)(GameActivity* activity,
-                      const GameActivityKeyEvent* event);
-
-    /**
-     * Callback called for every key up event on the GameActivity SurfaceView.
-     * Ownership of `event` is maintained by the library and it is only valid
-     * during the callback.
-     */
-    bool (*onKeyUp)(GameActivity* activity, const GameActivityKeyEvent* event);
-
-    /**
-     * Callback called for every soft-keyboard text input event.
-     * Ownership of `state` is maintained by the library and it is only valid
-     * during the callback.
-     */
-    void (*onTextInputEvent)(GameActivity* activity,
-                             const GameTextInputState* state);
-
-    /**
-     * Callback called when WindowInsets of the main app window have changed.
-     * Call GameActivity_getWindowInsets to retrieve the insets themselves.
-     */
-    void (*onWindowInsetsChanged)(GameActivity* activity);
-
-    /**
-     * Callback called when the rectangle in the window where the content
-     * should be placed has changed.
-     */
-    void (*onContentRectChanged)(GameActivity *activity, const ARect *rect);
+  /**
+   * The current device AConfiguration has changed. The new configuration can
+   * be retrieved from assetManager.
+   */
+  void (*onConfigurationChanged)(GameActivity* activity);
+
+  /**
+   * The system is running low on memory.  Use this callback to release
+   * resources you do not need, to help the system avoid killing more
+   * important processes.
+   */
+  void (*onTrimMemory)(GameActivity* activity, int level);
+
+  /**
+   * Callback called for every MotionEvent done on the GameActivity
+   * SurfaceView. Ownership of `event` is maintained by the library and it is
+   * only valid during the callback.
+   */
+  bool (*onTouchEvent)(GameActivity* activity,
+                       const GameActivityMotionEvent* event);
+
+  /**
+   * Callback called for every key down event on the GameActivity SurfaceView.
+   * Ownership of `event` is maintained by the library and it is only valid
+   * during the callback.
+   */
+  bool (*onKeyDown)(GameActivity* activity, const GameActivityKeyEvent* event);
+
+  /**
+   * Callback called for every key up event on the GameActivity SurfaceView.
+   * Ownership of `event` is maintained by the library and it is only valid
+   * during the callback.
+   */
+  bool (*onKeyUp)(GameActivity* activity, const GameActivityKeyEvent* event);
+
+  /**
+   * Callback called for every soft-keyboard text input event.
+   * Ownership of `state` is maintained by the library and it is only valid
+   * during the callback.
+   */
+  void (*onTextInputEvent)(GameActivity* activity,
+                           const GameTextInputState* state);
+
+  /**
+   * Callback called when WindowInsets of the main app window have changed.
+   * Call GameActivity_getWindowInsets to retrieve the insets themselves.
+   */
+  void (*onWindowInsetsChanged)(GameActivity* activity);
+
+  /**
+   * Callback called when the rectangle in the window where the content
+   * should be placed has changed.
+   */
+  void (*onContentRectChanged)(GameActivity* activity, const ARect* rect);
+
+  /**
+   * Callback called when the software keyboard is shown or hidden.
+   */
+  void (*onSoftwareKeyboardVisibilityChanged)(GameActivity* activity,
+                                              bool visible);
+
+  /**
+   * Callback called when the software keyboard is shown or hidden.
+   */
+  bool (*onEditorAction)(GameActivity* activity, int action);
 } GameActivityCallbacks;
 
 /**
@@ -310,187 +336,187 @@ void GameActivity_finish(GameActivity* activity);
  * Flags for GameActivity_setWindowFlags,
  * as per the Java API at android.view.WindowManager.LayoutParams.
  */
-enum GameActivitySetWindowFlags {
-    /**
-     * As long as this window is visible to the user, allow the lock
-     * screen to activate while the screen is on.  This can be used
-     * independently, or in combination with {@link
-     * GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} and/or {@link
-     * GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}
-     */
-    GAMEACTIVITY_FLAG_ALLOW_LOCK_WHILE_SCREEN_ON = 0x00000001,
-    /** Everything behind this window will be dimmed. */
-    GAMEACTIVITY_FLAG_DIM_BEHIND = 0x00000002,
-    /**
-     * Blur everything behind this window.
-     * @deprecated Blurring is no longer supported.
-     */
-    GAMEACTIVITY_FLAG_BLUR_BEHIND = 0x00000004,
-    /**
-     * This window won't ever get key input focus, so the
-     * user can not send key or other button events to it.  Those will
-     * instead go to whatever focusable window is behind it.  This flag
-     * will also enable {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL} whether or not
-     * that is explicitly set.
-     *
-     * Setting this flag also implies that the window will not need to
-     * interact with
-     * a soft input method, so it will be Z-ordered and positioned
-     * independently of any active input method (typically this means it
-     * gets Z-ordered on top of the input method, so it can use the full
-     * screen for its content and cover the input method if needed.  You
-     * can use {@link GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM} to modify this
-     * behavior.
-     */
-    GAMEACTIVITY_FLAG_NOT_FOCUSABLE = 0x00000008,
-    /** This window can never receive touch events. */
-    GAMEACTIVITY_FLAG_NOT_TOUCHABLE = 0x00000010,
-    /**
-     * Even when this window is focusable (its
-     * {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set), allow any pointer
-     * events outside of the window to be sent to the windows behind it.
-     * Otherwise it will consume all pointer events itself, regardless of
-     * whether they are inside of the window.
-     */
-    GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL = 0x00000020,
-    /**
-     * When set, if the device is asleep when the touch
-     * screen is pressed, you will receive this first touch event.  Usually
-     * the first touch event is consumed by the system since the user can
-     * not see what they are pressing on.
-     *
-     * @deprecated This flag has no effect.
-     */
-    GAMEACTIVITY_FLAG_TOUCHABLE_WHEN_WAKING = 0x00000040,
-    /**
-     * As long as this window is visible to the user, keep
-     * the device's screen turned on and bright.
-     */
-    GAMEACTIVITY_FLAG_KEEP_SCREEN_ON = 0x00000080,
-    /**
-     * Place the window within the entire screen, ignoring
-     * decorations around the border (such as the status bar).  The
-     * window must correctly position its contents to take the screen
-     * decoration into account.
-     */
-    GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN = 0x00000100,
-    /** Allows the window to extend outside of the screen. */
-    GAMEACTIVITY_FLAG_LAYOUT_NO_LIMITS = 0x00000200,
-    /**
-     * Hide all screen decorations (such as the status
-     * bar) while this window is displayed.  This allows the window to
-     * use the entire display space for itself -- the status bar will
-     * be hidden when an app window with this flag set is on the top
-     * layer. A fullscreen window will ignore a value of {@link
-     * GAMEACTIVITY_SOFT_INPUT_ADJUST_RESIZE}; the window will stay
-     * fullscreen and will not resize.
-     */
-    GAMEACTIVITY_FLAG_FULLSCREEN = 0x00000400,
-    /**
-     * Override {@link GAMEACTIVITY_FLAG_FULLSCREEN} and force the
-     * screen decorations (such as the status bar) to be shown.
-     */
-    GAMEACTIVITY_FLAG_FORCE_NOT_FULLSCREEN = 0x00000800,
-    /**
-     * Turn on dithering when compositing this window to
-     * the screen.
-     * @deprecated This flag is no longer used.
-     */
-    GAMEACTIVITY_FLAG_DITHER = 0x00001000,
-    /**
-     * Treat the content of the window as secure, preventing
-     * it from appearing in screenshots or from being viewed on non-secure
-     * displays.
-     */
-    GAMEACTIVITY_FLAG_SECURE = 0x00002000,
-    /**
-     * A special mode where the layout parameters are used
-     * to perform scaling of the surface when it is composited to the
-     * screen.
-     */
-    GAMEACTIVITY_FLAG_SCALED = 0x00004000,
-    /**
-     * Intended for windows that will often be used when the user is
-     * holding the screen against their face, it will aggressively
-     * filter the event stream to prevent unintended presses in this
-     * situation that may not be desired for a particular window, when
-     * such an event stream is detected, the application will receive
-     * a {@link AMOTION_EVENT_ACTION_CANCEL} to indicate this so
-     * applications can handle this accordingly by taking no action on
-     * the event until the finger is released.
-     */
-    GAMEACTIVITY_FLAG_IGNORE_CHEEK_PRESSES = 0x00008000,
-    /**
-     * A special option only for use in combination with
-     * {@link GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN}.  When requesting layout in
-     * the screen your window may appear on top of or behind screen decorations
-     * such as the status bar.  By also including this flag, the window
-     * manager will report the inset rectangle needed to ensure your
-     * content is not covered by screen decorations.
-     */
-    GAMEACTIVITY_FLAG_LAYOUT_INSET_DECOR = 0x00010000,
-    /**
-     * Invert the state of {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} with
-     * respect to how this window interacts with the current method.
-     * That is, if FLAG_NOT_FOCUSABLE is set and this flag is set,
-     * then the window will behave as if it needs to interact with the
-     * input method and thus be placed behind/away from it; if {@link
-     * GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set and this flag is set,
-     * then the window will behave as if it doesn't need to interact
-     * with the input method and can be placed to use more space and
-     * cover the input method.
-     */
-    GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM = 0x00020000,
-    /**
-     * If you have set {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL}, you
-     * can set this flag to receive a single special MotionEvent with
-     * the action
-     * {@link AMOTION_EVENT_ACTION_OUTSIDE} for
-     * touches that occur outside of your window.  Note that you will not
-     * receive the full down/move/up gesture, only the location of the
-     * first down as an {@link AMOTION_EVENT_ACTION_OUTSIDE}.
-     */
-    GAMEACTIVITY_FLAG_WATCH_OUTSIDE_TOUCH = 0x00040000,
-    /**
-     * Special flag to let windows be shown when the screen
-     * is locked. This will let application windows take precedence over
-     * key guard or any other lock screens. Can be used with
-     * {@link GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} to turn screen on and display
-     * windows directly before showing the key guard window.  Can be used with
-     * {@link GAMEACTIVITY_FLAG_DISMISS_KEYGUARD} to automatically fully
-     * dismisss non-secure keyguards.  This flag only applies to the top-most
-     * full-screen window.
-     */
-    GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED = 0x00080000,
-    /**
-     * Ask that the system wallpaper be shown behind
-     * your window.  The window surface must be translucent to be able
-     * to actually see the wallpaper behind it; this flag just ensures
-     * that the wallpaper surface will be there if this window actually
-     * has translucent regions.
-     */
-    GAMEACTIVITY_FLAG_SHOW_WALLPAPER = 0x00100000,
-    /**
-     * When set as a window is being added or made
-     * visible, once the window has been shown then the system will
-     * poke the power manager's user activity (as if the user had woken
-     * up the device) to turn the screen on.
-     */
-    GAMEACTIVITY_FLAG_TURN_SCREEN_ON = 0x00200000,
-    /**
-     * When set the window will cause the keyguard to
-     * be dismissed, only if it is not a secure lock keyguard.  Because such
-     * a keyguard is not needed for security, it will never re-appear if
-     * the user navigates to another window (in contrast to
-     * {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}, which will only temporarily
-     * hide both secure and non-secure keyguards but ensure they reappear
-     * when the user moves to another UI that doesn't hide them).
-     * If the keyguard is currently active and is secure (requires an
-     * unlock pattern) than the user will still need to confirm it before
-     * seeing this window, unless {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED} has
-     * also been set.
-     */
-    GAMEACTIVITY_FLAG_DISMISS_KEYGUARD = 0x00400000,
+enum GameActivitySetWindowFlags : uint32_t {
+  /**
+   * As long as this window is visible to the user, allow the lock
+   * screen to activate while the screen is on.  This can be used
+   * independently, or in combination with {@link
+   * GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} and/or {@link
+   * GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}
+   */
+  GAMEACTIVITY_FLAG_ALLOW_LOCK_WHILE_SCREEN_ON = 0x00000001,
+  /** Everything behind this window will be dimmed. */
+  GAMEACTIVITY_FLAG_DIM_BEHIND = 0x00000002,
+  /**
+   * Blur everything behind this window.
+   * @deprecated Blurring is no longer supported.
+   */
+  GAMEACTIVITY_FLAG_BLUR_BEHIND = 0x00000004,
+  /**
+   * This window won't ever get key input focus, so the
+   * user can not send key or other button events to it.  Those will
+   * instead go to whatever focusable window is behind it.  This flag
+   * will also enable {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL} whether or not
+   * that is explicitly set.
+   *
+   * Setting this flag also implies that the window will not need to
+   * interact with
+   * a soft input method, so it will be Z-ordered and positioned
+   * independently of any active input method (typically this means it
+   * gets Z-ordered on top of the input method, so it can use the full
+   * screen for its content and cover the input method if needed.  You
+   * can use {@link GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM} to modify this
+   * behavior.
+   */
+  GAMEACTIVITY_FLAG_NOT_FOCUSABLE = 0x00000008,
+  /** This window can never receive touch events. */
+  GAMEACTIVITY_FLAG_NOT_TOUCHABLE = 0x00000010,
+  /**
+   * Even when this window is focusable (its
+   * {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set), allow any pointer
+   * events outside of the window to be sent to the windows behind it.
+   * Otherwise it will consume all pointer events itself, regardless of
+   * whether they are inside of the window.
+   */
+  GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL = 0x00000020,
+  /**
+   * When set, if the device is asleep when the touch
+   * screen is pressed, you will receive this first touch event.  Usually
+   * the first touch event is consumed by the system since the user can
+   * not see what they are pressing on.
+   *
+   * @deprecated This flag has no effect.
+   */
+  GAMEACTIVITY_FLAG_TOUCHABLE_WHEN_WAKING = 0x00000040,
+  /**
+   * As long as this window is visible to the user, keep
+   * the device's screen turned on and bright.
+   */
+  GAMEACTIVITY_FLAG_KEEP_SCREEN_ON = 0x00000080,
+  /**
+   * Place the window within the entire screen, ignoring
+   * decorations around the border (such as the status bar).  The
+   * window must correctly position its contents to take the screen
+   * decoration into account.
+   */
+  GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN = 0x00000100,
+  /** Allows the window to extend outside of the screen. */
+  GAMEACTIVITY_FLAG_LAYOUT_NO_LIMITS = 0x00000200,
+  /**
+   * Hide all screen decorations (such as the status
+   * bar) while this window is displayed.  This allows the window to
+   * use the entire display space for itself -- the status bar will
+   * be hidden when an app window with this flag set is on the top
+   * layer. A fullscreen window will ignore a value of {@link
+   * GAMEACTIVITY_SOFT_INPUT_ADJUST_RESIZE}; the window will stay
+   * fullscreen and will not resize.
+   */
+  GAMEACTIVITY_FLAG_FULLSCREEN = 0x00000400,
+  /**
+   * Override {@link GAMEACTIVITY_FLAG_FULLSCREEN} and force the
+   * screen decorations (such as the status bar) to be shown.
+   */
+  GAMEACTIVITY_FLAG_FORCE_NOT_FULLSCREEN = 0x00000800,
+  /**
+   * Turn on dithering when compositing this window to
+   * the screen.
+   * @deprecated This flag is no longer used.
+   */
+  GAMEACTIVITY_FLAG_DITHER = 0x00001000,
+  /**
+   * Treat the content of the window as secure, preventing
+   * it from appearing in screenshots or from being viewed on non-secure
+   * displays.
+   */
+  GAMEACTIVITY_FLAG_SECURE = 0x00002000,
+  /**
+   * A special mode where the layout parameters are used
+   * to perform scaling of the surface when it is composited to the
+   * screen.
+   */
+  GAMEACTIVITY_FLAG_SCALED = 0x00004000,
+  /**
+   * Intended for windows that will often be used when the user is
+   * holding the screen against their face, it will aggressively
+   * filter the event stream to prevent unintended presses in this
+   * situation that may not be desired for a particular window, when
+   * such an event stream is detected, the application will receive
+   * a {@link AMOTION_EVENT_ACTION_CANCEL} to indicate this so
+   * applications can handle this accordingly by taking no action on
+   * the event until the finger is released.
+   */
+  GAMEACTIVITY_FLAG_IGNORE_CHEEK_PRESSES = 0x00008000,
+  /**
+   * A special option only for use in combination with
+   * {@link GAMEACTIVITY_FLAG_LAYOUT_IN_SCREEN}.  When requesting layout in
+   * the screen your window may appear on top of or behind screen decorations
+   * such as the status bar.  By also including this flag, the window
+   * manager will report the inset rectangle needed to ensure your
+   * content is not covered by screen decorations.
+   */
+  GAMEACTIVITY_FLAG_LAYOUT_INSET_DECOR = 0x00010000,
+  /**
+   * Invert the state of {@link GAMEACTIVITY_FLAG_NOT_FOCUSABLE} with
+   * respect to how this window interacts with the current method.
+   * That is, if FLAG_NOT_FOCUSABLE is set and this flag is set,
+   * then the window will behave as if it needs to interact with the
+   * input method and thus be placed behind/away from it; if {@link
+   * GAMEACTIVITY_FLAG_NOT_FOCUSABLE} is not set and this flag is set,
+   * then the window will behave as if it doesn't need to interact
+   * with the input method and can be placed to use more space and
+   * cover the input method.
+   */
+  GAMEACTIVITY_FLAG_ALT_FOCUSABLE_IM = 0x00020000,
+  /**
+   * If you have set {@link GAMEACTIVITY_FLAG_NOT_TOUCH_MODAL}, you
+   * can set this flag to receive a single special MotionEvent with
+   * the action
+   * {@link AMOTION_EVENT_ACTION_OUTSIDE} for
+   * touches that occur outside of your window.  Note that you will not
+   * receive the full down/move/up gesture, only the location of the
+   * first down as an {@link AMOTION_EVENT_ACTION_OUTSIDE}.
+   */
+  GAMEACTIVITY_FLAG_WATCH_OUTSIDE_TOUCH = 0x00040000,
+  /**
+   * Special flag to let windows be shown when the screen
+   * is locked. This will let application windows take precedence over
+   * key guard or any other lock screens. Can be used with
+   * {@link GAMEACTIVITY_FLAG_KEEP_SCREEN_ON} to turn screen on and display
+   * windows directly before showing the key guard window.  Can be used with
+   * {@link GAMEACTIVITY_FLAG_DISMISS_KEYGUARD} to automatically fully
+   * dismisss non-secure keyguards.  This flag only applies to the top-most
+   * full-screen window.
+   */
+  GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED = 0x00080000,
+  /**
+   * Ask that the system wallpaper be shown behind
+   * your window.  The window surface must be translucent to be able
+   * to actually see the wallpaper behind it; this flag just ensures
+   * that the wallpaper surface will be there if this window actually
+   * has translucent regions.
+   */
+  GAMEACTIVITY_FLAG_SHOW_WALLPAPER = 0x00100000,
+  /**
+   * When set as a window is being added or made
+   * visible, once the window has been shown then the system will
+   * poke the power manager's user activity (as if the user had woken
+   * up the device) to turn the screen on.
+   */
+  GAMEACTIVITY_FLAG_TURN_SCREEN_ON = 0x00200000,
+  /**
+   * When set the window will cause the keyguard to
+   * be dismissed, only if it is not a secure lock keyguard.  Because such
+   * a keyguard is not needed for security, it will never re-appear if
+   * the user navigates to another window (in contrast to
+   * {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED}, which will only temporarily
+   * hide both secure and non-secure keyguards but ensure they reappear
+   * when the user moves to another UI that doesn't hide them).
+   * If the keyguard is currently active and is secure (requires an
+   * unlock pattern) than the user will still need to confirm it before
+   * seeing this window, unless {@link GAMEACTIVITY_FLAG_SHOW_WHEN_LOCKED} has
+   * also been set.
+   */
+  GAMEACTIVITY_FLAG_DISMISS_KEYGUARD = 0x00400000,
 };
 
 /**
@@ -510,19 +536,19 @@ void GameActivity_setWindowFlags(GameActivity* activity, uint32_t addFlags,
  * Flags for GameActivity_showSoftInput; see the Java InputMethodManager
  * API for documentation.
  */
-enum GameActivityShowSoftInputFlags {
-    /**
-     * Implicit request to show the input window, not as the result
-     * of a direct request by the user.
-     */
-    GAMEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT = 0x0001,
-
-    /**
-     * The user has forced the input method open (such as by
-     * long-pressing menu) so it should not be closed until they
-     * explicitly do so.
-     */
-    GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED = 0x0002,
+enum GameActivityShowSoftInputFlags : uint8_t {
+  /**
+   * Implicit request to show the input window, not as the result
+   * of a direct request by the user.
+   */
+  GAMEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT = 0x0001,
+
+  /**
+   * The user has forced the input method open (such as by
+   * long-pressing menu) so it should not be closed until they
+   * explicitly do so.
+   */
+  GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED = 0x0002,
 };
 
 /**
@@ -533,6 +559,13 @@ enum GameActivityShowSoftInputFlags {
  */
 void GameActivity_showSoftInput(GameActivity* activity, uint32_t flags);
 
+/**
+ * Restarts the input method. Calls InputMethodManager.restartInput().
+ * Note that this method can be called from *any* thread; it will send a message
+ * to the main thread of the process where the Java call will take place.
+ */
+void GameActivity_restartInput(GameActivity* activity);
+
 /**
  * Set the text entry state (see documentation of the GameTextInputState struct
  * in the Game Text Input library reference).
@@ -560,17 +593,17 @@ GameTextInput* GameActivity_getTextInput(const GameActivity* activity);
  * Flags for GameActivity_hideSoftInput; see the Java InputMethodManager
  * API for documentation.
  */
-enum GameActivityHideSoftInputFlags {
-    /**
-     * The soft input window should only be hidden if it was not
-     * explicitly shown by the user.
-     */
-    GAMEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_ONLY = 0x0001,
-    /**
-     * The soft input window should normally be hidden, unless it was
-     * originally shown with {@link GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED}.
-     */
-    GAMEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS = 0x0002,
+enum GameActivityHideSoftInputFlags : uint16_t {
+  /**
+   * The soft input window should only be hidden if it was not
+   * explicitly shown by the user.
+   */
+  GAMEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_ONLY = 0x0001,
+  /**
+   * The soft input window should normally be hidden, unless it was
+   * originally shown with {@link GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED}.
+   */
+  GAMEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS = 0x0002,
 };
 
 /**
@@ -590,18 +623,23 @@ void GameActivity_hideSoftInput(GameActivity* activity, uint32_t flags);
 void GameActivity_getWindowInsets(GameActivity* activity,
                                   GameCommonInsetsType type, ARect* insets);
 
+/**
+ * Tells whether the software keyboard is visible or not.
+ */
+bool GameActivity_isSoftwareKeyboardVisible(GameActivity* activity);
+
 /**
  * Set options on how the IME behaves when it is requested for text input.
  * See
  * https://developer.android.com/reference/android/view/inputmethod/EditorInfo
  * for the meaning of inputType, actionId and imeOptions.
  *
- * Note that this function will attach the current thread to the JVM if it is
- * not already attached, so the caller must detach the thread from the JVM
- * before the thread is destroyed using DetachCurrentThread.
+ * <b>Note:</b> currently only TYPE_NULL AND TYPE_CLASS_NUMBER are supported.
  */
-void GameActivity_setImeEditorInfo(GameActivity* activity, int inputType,
-                                   int actionId, int imeOptions);
+void GameActivity_setImeEditorInfo(GameActivity* activity,
+                                   enum GameTextInputType inputType,
+                                   enum GameTextInputActionType actionId,
+                                   enum GameTextInputImeOptions imeOptions);
 
 /**
  * These are getters for Configuration class members. They may be called from
@@ -615,6 +653,7 @@ int GameActivity_getFontWeightAdjustment(GameActivity* activity);
 int GameActivity_getHardKeyboardHidden(GameActivity* activity);
 int GameActivity_getKeyboard(GameActivity* activity);
 int GameActivity_getKeyboardHidden(GameActivity* activity);
+int GameActivity_getLocalesCount(GameActivity* activity);
 int GameActivity_getMcc(GameActivity* activity);
 int GameActivity_getMnc(GameActivity* activity);
 int GameActivity_getNavigation(GameActivity* activity);
@@ -627,6 +666,42 @@ int GameActivity_getSmallestScreenWidthDp(GameActivity* activity);
 int GameActivity_getTouchscreen(GameActivity* activity);
 int GameActivity_getUIMode(GameActivity* activity);
 
+/**
+ * The functions below return Java locale information.
+ *
+ * In simple cases there will be just one locale, but it's possible tha
+ * there are more than one locale objects. Users are encouraged to write code
+ * that handles all locales and not just the first one.
+ *
+ * The functions in the block below return string values in the provided buffer.
+ * Return value is zero if there were no errors, otherwise it's non-zero.
+ * If the return value is zero, `dst` will contain a null-terminated string:
+ * strlen(dst) <= dst_size - 1.
+ * If the return value is non-zero, the content of dst is undefined.
+ *
+ * Parameters:
+ *
+ * dst, dst_size: define a receiver buffer. Locale string can be something
+ * short like "EN/EN", but it may be longer. You should be safe with a buffer
+ * size of 256 bytes.
+ *
+ * If the buffer is too small, ENOBUFS is returned. Try allocating a larger
+ * buffer in this case.
+ *
+ * localeIdx must be between 0 and the value of GameActivity_getLocalesCount().
+ * If localeIdx is out of range, EINVAL is returned.
+ *
+ * Refer to Java documentation of locales for more information.
+ */
+int GameActivity_getLocaleLanguage(char* dst, size_t dst_size,
+                                   GameActivity* activity, size_t localeIdx);
+int GameActivity_getLocaleScript(char* dst, size_t dst_size,
+                                 GameActivity* activity, size_t localeIdx);
+int GameActivity_getLocaleCountry(char* dst, size_t dst_size,
+                                  GameActivity* activity, size_t localeIdx);
+int GameActivity_getLocaleVariant(char* dst, size_t dst_size,
+                                  GameActivity* activity, size_t localeIdx);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.cpp b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.cpp
deleted file mode 100644
index 028b55e..0000000
--- a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.cpp
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "GameActivityEvents.h"
-
-#include <sys/system_properties.h>
-
-#include <string>
-
-#include "GameActivityLog.h"
-
-// TODO(b/187147166): these functions were extracted from the Game SDK
-// (gamesdk/src/common/system_utils.h). system_utils.h/cpp should be used
-// instead.
-namespace {
-
-std::string getSystemPropViaGet(const char *key,
-                                const char *default_value = "") {
-    char buffer[PROP_VALUE_MAX + 1] = "";  // +1 for terminator
-    int bufferLen = __system_property_get(key, buffer);
-    if (bufferLen > 0)
-        return buffer;
-    else
-        return "";
-}
-
-std::string GetSystemProp(const char *key, const char *default_value = "") {
-    return getSystemPropViaGet(key, default_value);
-}
-
-int GetSystemPropAsInt(const char *key, int default_value = 0) {
-    std::string prop = GetSystemProp(key);
-    return prop == "" ? default_value : strtoll(prop.c_str(), nullptr, 10);
-}
-
-}  // anonymous namespace
-
-#ifndef NELEM
-#define NELEM(x) ((int)(sizeof(x) / sizeof((x)[0])))
-#endif
-
-static bool enabledAxes[GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT] = {
-    /* AMOTION_EVENT_AXIS_X */ true,
-    /* AMOTION_EVENT_AXIS_Y */ true,
-    // Disable all other axes by default (they can be enabled using
-    // `GameActivityPointerAxes_enableAxis`).
-    false};
-
-extern "C" void GameActivityPointerAxes_enableAxis(int32_t axis) {
-    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
-        return;
-    }
-
-    enabledAxes[axis] = true;
-}
-
-float GameActivityPointerAxes_getAxisValue(
-    const GameActivityPointerAxes *pointerInfo, int32_t axis) {
-    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
-        return 0;
-    }
-
-    if (!enabledAxes[axis]) {
-        ALOGW("Axis %d must be enabled before it can be accessed.", axis);
-        return 0;
-    }
-
-    return pointerInfo->axisValues[axis];
-}
-
-extern "C" void GameActivityPointerAxes_disableAxis(int32_t axis) {
-    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
-        return;
-    }
-
-    enabledAxes[axis] = false;
-}
-
-float GameActivityMotionEvent_getHistoricalAxisValue(
-    const GameActivityMotionEvent *event, int axis, int pointerIndex,
-    int historyPos) {
-    if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
-        ALOGE("Invalid axis %d", axis);
-        return -1;
-    }
-    if (pointerIndex < 0 || pointerIndex >= event->pointerCount) {
-        ALOGE("Invalid pointer index %d", pointerIndex);
-        return -1;
-    }
-    if (historyPos < 0 || historyPos >= event->historySize) {
-        ALOGE("Invalid history index %d", historyPos);
-        return -1;
-    }
-    if (!enabledAxes[axis]) {
-        ALOGW("Axis %d must be enabled before it can be accessed.", axis);
-        return 0;
-    }
-
-    int pointerOffset = pointerIndex * GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
-    int historyValuesOffset = historyPos * event->pointerCount *
-                              GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
-    return event
-        ->historicalAxisValues[historyValuesOffset + pointerOffset + axis];
-}
-
-static struct {
-    jmethodID getDeviceId;
-    jmethodID getSource;
-    jmethodID getAction;
-
-    jmethodID getEventTime;
-    jmethodID getDownTime;
-
-    jmethodID getFlags;
-    jmethodID getMetaState;
-
-    jmethodID getActionButton;
-    jmethodID getButtonState;
-    jmethodID getClassification;
-    jmethodID getEdgeFlags;
-
-    jmethodID getHistorySize;
-    jmethodID getHistoricalEventTime;
-
-    jmethodID getPointerCount;
-    jmethodID getPointerId;
-
-    jmethodID getToolType;
-
-    jmethodID getRawX;
-    jmethodID getRawY;
-    jmethodID getXPrecision;
-    jmethodID getYPrecision;
-    jmethodID getAxisValue;
-
-    jmethodID getHistoricalAxisValue;
-} gMotionEventClassInfo;
-
-extern "C" void GameActivityMotionEvent_destroy(
-    GameActivityMotionEvent *c_event) {
-    delete c_event->historicalAxisValues;
-    delete c_event->historicalEventTimesMillis;
-    delete c_event->historicalEventTimesNanos;
-}
-
-extern "C" void GameActivityMotionEvent_fromJava(
-    JNIEnv *env, jobject motionEvent, GameActivityMotionEvent *out_event) {
-    static bool gMotionEventClassInfoInitialized = false;
-    if (!gMotionEventClassInfoInitialized) {
-        int sdkVersion = GetSystemPropAsInt("ro.build.version.sdk");
-        gMotionEventClassInfo = {0};
-        jclass motionEventClass = env->FindClass("android/view/MotionEvent");
-        gMotionEventClassInfo.getDeviceId =
-            env->GetMethodID(motionEventClass, "getDeviceId", "()I");
-        gMotionEventClassInfo.getSource =
-            env->GetMethodID(motionEventClass, "getSource", "()I");
-        gMotionEventClassInfo.getAction =
-            env->GetMethodID(motionEventClass, "getAction", "()I");
-        gMotionEventClassInfo.getEventTime =
-            env->GetMethodID(motionEventClass, "getEventTime", "()J");
-        gMotionEventClassInfo.getDownTime =
-            env->GetMethodID(motionEventClass, "getDownTime", "()J");
-        gMotionEventClassInfo.getFlags =
-            env->GetMethodID(motionEventClass, "getFlags", "()I");
-        gMotionEventClassInfo.getMetaState =
-            env->GetMethodID(motionEventClass, "getMetaState", "()I");
-        if (sdkVersion >= 23) {
-            gMotionEventClassInfo.getActionButton =
-                env->GetMethodID(motionEventClass, "getActionButton", "()I");
-        }
-        if (sdkVersion >= 14) {
-            gMotionEventClassInfo.getButtonState =
-                env->GetMethodID(motionEventClass, "getButtonState", "()I");
-        }
-        if (sdkVersion >= 29) {
-            gMotionEventClassInfo.getClassification =
-                env->GetMethodID(motionEventClass, "getClassification", "()I");
-        }
-        gMotionEventClassInfo.getEdgeFlags =
-            env->GetMethodID(motionEventClass, "getEdgeFlags", "()I");
-
-        gMotionEventClassInfo.getHistorySize =
-            env->GetMethodID(motionEventClass, "getHistorySize", "()I");
-        gMotionEventClassInfo.getHistoricalEventTime = env->GetMethodID(
-            motionEventClass, "getHistoricalEventTime", "(I)J");
-
-        gMotionEventClassInfo.getPointerCount =
-            env->GetMethodID(motionEventClass, "getPointerCount", "()I");
-        gMotionEventClassInfo.getPointerId =
-            env->GetMethodID(motionEventClass, "getPointerId", "(I)I");
-        gMotionEventClassInfo.getToolType =
-            env->GetMethodID(motionEventClass, "getToolType", "(I)I");
-        if (sdkVersion >= 29) {
-            gMotionEventClassInfo.getRawX =
-                env->GetMethodID(motionEventClass, "getRawX", "(I)F");
-            gMotionEventClassInfo.getRawY =
-                env->GetMethodID(motionEventClass, "getRawY", "(I)F");
-        }
-        gMotionEventClassInfo.getXPrecision =
-            env->GetMethodID(motionEventClass, "getXPrecision", "()F");
-        gMotionEventClassInfo.getYPrecision =
-            env->GetMethodID(motionEventClass, "getYPrecision", "()F");
-        gMotionEventClassInfo.getAxisValue =
-            env->GetMethodID(motionEventClass, "getAxisValue", "(II)F");
-
-        gMotionEventClassInfo.getHistoricalAxisValue = env->GetMethodID(
-            motionEventClass, "getHistoricalAxisValue", "(III)F");
-        gMotionEventClassInfoInitialized = true;
-    }
-
-    int pointerCount =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getPointerCount);
-    pointerCount =
-        std::min(pointerCount, GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT);
-    out_event->pointerCount = pointerCount;
-    for (int i = 0; i < pointerCount; ++i) {
-        out_event->pointers[i] = {
-            /*id=*/env->CallIntMethod(motionEvent,
-                                      gMotionEventClassInfo.getPointerId, i),
-            /*toolType=*/
-            env->CallIntMethod(motionEvent, gMotionEventClassInfo.getToolType,
-                               i),
-            /*axisValues=*/{0},
-            /*rawX=*/gMotionEventClassInfo.getRawX
-                ? env->CallFloatMethod(motionEvent,
-                                       gMotionEventClassInfo.getRawX, i)
-                : 0,
-            /*rawY=*/gMotionEventClassInfo.getRawY
-                ? env->CallFloatMethod(motionEvent,
-                                       gMotionEventClassInfo.getRawY, i)
-                : 0,
-        };
-
-        for (int axisIndex = 0;
-             axisIndex < GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT; ++axisIndex) {
-            if (enabledAxes[axisIndex]) {
-                out_event->pointers[i].axisValues[axisIndex] =
-                    env->CallFloatMethod(motionEvent,
-                                         gMotionEventClassInfo.getAxisValue,
-                                         axisIndex, i);
-            }
-        }
-    }
-
-    int historySize =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getHistorySize);
-    out_event->historySize = historySize;
-    out_event->historicalAxisValues =
-        new float[historySize * pointerCount *
-                  GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT];
-    out_event->historicalEventTimesMillis = new int64_t[historySize];
-    out_event->historicalEventTimesNanos = new int64_t[historySize];
-
-    for (int historyIndex = 0; historyIndex < historySize; historyIndex++) {
-        out_event->historicalEventTimesMillis[historyIndex] =
-            env->CallLongMethod(motionEvent,
-                                gMotionEventClassInfo.getHistoricalEventTime,
-                                historyIndex);
-        out_event->historicalEventTimesNanos[historyIndex] =
-            out_event->historicalEventTimesMillis[historyIndex] * 1000000;
-        for (int i = 0; i < pointerCount; ++i) {
-            int pointerOffset = i * GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
-            int historyAxisOffset = historyIndex * pointerCount *
-                                    GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
-            float *axisValues =
-                &out_event
-                     ->historicalAxisValues[historyAxisOffset + pointerOffset];
-            for (int axisIndex = 0;
-                 axisIndex < GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
-                 ++axisIndex) {
-                if (enabledAxes[axisIndex]) {
-                    axisValues[axisIndex] = env->CallFloatMethod(
-                        motionEvent,
-                        gMotionEventClassInfo.getHistoricalAxisValue, axisIndex,
-                        i, historyIndex);
-                }
-            }
-        }
-    }
-
-    out_event->deviceId =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getDeviceId);
-    out_event->source =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getSource);
-    out_event->action =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getAction);
-    out_event->eventTime =
-        env->CallLongMethod(motionEvent, gMotionEventClassInfo.getEventTime) *
-        1000000;
-    out_event->downTime =
-        env->CallLongMethod(motionEvent, gMotionEventClassInfo.getDownTime) *
-        1000000;
-    out_event->flags =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getFlags);
-    out_event->metaState =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getMetaState);
-    out_event->actionButton =
-        gMotionEventClassInfo.getActionButton
-            ? env->CallIntMethod(motionEvent,
-                                 gMotionEventClassInfo.getActionButton)
-            : 0;
-    out_event->buttonState =
-        gMotionEventClassInfo.getButtonState
-            ? env->CallIntMethod(motionEvent,
-                                 gMotionEventClassInfo.getButtonState)
-            : 0;
-    out_event->classification =
-        gMotionEventClassInfo.getClassification
-            ? env->CallIntMethod(motionEvent,
-                                 gMotionEventClassInfo.getClassification)
-            : 0;
-    out_event->edgeFlags =
-        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getEdgeFlags);
-    out_event->precisionX =
-        env->CallFloatMethod(motionEvent, gMotionEventClassInfo.getXPrecision);
-    out_event->precisionY =
-        env->CallFloatMethod(motionEvent, gMotionEventClassInfo.getYPrecision);
-}
-
-static struct {
-    jmethodID getDeviceId;
-    jmethodID getSource;
-    jmethodID getAction;
-
-    jmethodID getEventTime;
-    jmethodID getDownTime;
-
-    jmethodID getFlags;
-    jmethodID getMetaState;
-
-    jmethodID getModifiers;
-    jmethodID getRepeatCount;
-    jmethodID getKeyCode;
-    jmethodID getScanCode;
-    //jmethodID getUnicodeChar;
-} gKeyEventClassInfo;
-
-extern "C" void GameActivityKeyEvent_fromJava(JNIEnv *env, jobject keyEvent,
-                                              GameActivityKeyEvent *out_event) {
-    static bool gKeyEventClassInfoInitialized = false;
-    if (!gKeyEventClassInfoInitialized) {
-        int sdkVersion = GetSystemPropAsInt("ro.build.version.sdk");
-        gKeyEventClassInfo = {0};
-        jclass keyEventClass = env->FindClass("android/view/KeyEvent");
-        gKeyEventClassInfo.getDeviceId =
-            env->GetMethodID(keyEventClass, "getDeviceId", "()I");
-        gKeyEventClassInfo.getSource =
-            env->GetMethodID(keyEventClass, "getSource", "()I");
-        gKeyEventClassInfo.getAction =
-            env->GetMethodID(keyEventClass, "getAction", "()I");
-        gKeyEventClassInfo.getEventTime =
-            env->GetMethodID(keyEventClass, "getEventTime", "()J");
-        gKeyEventClassInfo.getDownTime =
-            env->GetMethodID(keyEventClass, "getDownTime", "()J");
-        gKeyEventClassInfo.getFlags =
-            env->GetMethodID(keyEventClass, "getFlags", "()I");
-        gKeyEventClassInfo.getMetaState =
-            env->GetMethodID(keyEventClass, "getMetaState", "()I");
-        if (sdkVersion >= 13) {
-            gKeyEventClassInfo.getModifiers =
-                env->GetMethodID(keyEventClass, "getModifiers", "()I");
-        }
-        gKeyEventClassInfo.getRepeatCount =
-            env->GetMethodID(keyEventClass, "getRepeatCount", "()I");
-        gKeyEventClassInfo.getKeyCode =
-            env->GetMethodID(keyEventClass, "getKeyCode", "()I");
-        gKeyEventClassInfo.getScanCode =
-            env->GetMethodID(keyEventClass, "getScanCode", "()I");
-        //gKeyEventClassInfo.getUnicodeChar =
-        //    env->GetMethodID(keyEventClass, "getUnicodeChar", "()I");
-
-        gKeyEventClassInfoInitialized = true;
-    }
-
-    *out_event = {
-        /*deviceId=*/env->CallIntMethod(keyEvent,
-                                        gKeyEventClassInfo.getDeviceId),
-        /*source=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getSource),
-        /*action=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getAction),
-        // TODO: introduce a millisecondsToNanoseconds helper:
-        /*eventTime=*/
-        env->CallLongMethod(keyEvent, gKeyEventClassInfo.getEventTime) *
-            1000000,
-        /*downTime=*/
-        env->CallLongMethod(keyEvent, gKeyEventClassInfo.getDownTime) * 1000000,
-        /*flags=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getFlags),
-        /*metaState=*/
-        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getMetaState),
-        /*modifiers=*/gKeyEventClassInfo.getModifiers
-            ? env->CallIntMethod(keyEvent, gKeyEventClassInfo.getModifiers)
-            : 0,
-        /*repeatCount=*/
-        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getRepeatCount),
-        /*keyCode=*/
-        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getKeyCode),
-        /*scanCode=*/
-        env->CallIntMethod(keyEvent, gKeyEventClassInfo.getScanCode)
-        /*unicodeChar=*/
-        //env->CallIntMethod(keyEvent, gKeyEventClassInfo.getUnicodeChar)
-    };
-}
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.h b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.h
index 015ffbe..2a7982a 100644
--- a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.h
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityEvents.h
@@ -57,29 +57,29 @@ extern "C" {
  * \see GameActivityMotionEvent
  */
 typedef struct GameActivityPointerAxes {
-    int32_t id;
-    int32_t toolType;
-    float axisValues[GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT];
-    float rawX;
-    float rawY;
+  int32_t id;
+  int32_t toolType;
+  float axisValues[GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT];
+  float rawX;
+  float rawY;
 } GameActivityPointerAxes;
 
 /** \brief Get the toolType of the pointer. */
 inline int32_t GameActivityPointerAxes_getToolType(
     const GameActivityPointerAxes* pointerInfo) {
-    return pointerInfo->toolType;
+  return pointerInfo->toolType;
 }
 
 /** \brief Get the current X coordinate of the pointer. */
 inline float GameActivityPointerAxes_getX(
     const GameActivityPointerAxes* pointerInfo) {
-    return pointerInfo->axisValues[AMOTION_EVENT_AXIS_X];
+  return pointerInfo->axisValues[AMOTION_EVENT_AXIS_X];
 }
 
 /** \brief Get the current Y coordinate of the pointer. */
 inline float GameActivityPointerAxes_getY(
     const GameActivityPointerAxes* pointerInfo) {
-    return pointerInfo->axisValues[AMOTION_EVENT_AXIS_Y];
+  return pointerInfo->axisValues[AMOTION_EVENT_AXIS_Y];
 }
 
 /**
@@ -126,44 +126,44 @@ float GameActivityPointerAxes_getAxisValue(
 
 inline float GameActivityPointerAxes_getPressure(
     const GameActivityPointerAxes* pointerInfo) {
-    return GameActivityPointerAxes_getAxisValue(pointerInfo,
-                                                AMOTION_EVENT_AXIS_PRESSURE);
+  return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                              AMOTION_EVENT_AXIS_PRESSURE);
 }
 
 inline float GameActivityPointerAxes_getSize(
     const GameActivityPointerAxes* pointerInfo) {
-    return GameActivityPointerAxes_getAxisValue(pointerInfo,
-                                                AMOTION_EVENT_AXIS_SIZE);
+  return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                              AMOTION_EVENT_AXIS_SIZE);
 }
 
 inline float GameActivityPointerAxes_getTouchMajor(
     const GameActivityPointerAxes* pointerInfo) {
-    return GameActivityPointerAxes_getAxisValue(pointerInfo,
-                                                AMOTION_EVENT_AXIS_TOUCH_MAJOR);
+  return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                              AMOTION_EVENT_AXIS_TOUCH_MAJOR);
 }
 
 inline float GameActivityPointerAxes_getTouchMinor(
     const GameActivityPointerAxes* pointerInfo) {
-    return GameActivityPointerAxes_getAxisValue(pointerInfo,
-                                                AMOTION_EVENT_AXIS_TOUCH_MINOR);
+  return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                              AMOTION_EVENT_AXIS_TOUCH_MINOR);
 }
 
 inline float GameActivityPointerAxes_getToolMajor(
     const GameActivityPointerAxes* pointerInfo) {
-    return GameActivityPointerAxes_getAxisValue(pointerInfo,
-                                                AMOTION_EVENT_AXIS_TOOL_MAJOR);
+  return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                              AMOTION_EVENT_AXIS_TOOL_MAJOR);
 }
 
 inline float GameActivityPointerAxes_getToolMinor(
     const GameActivityPointerAxes* pointerInfo) {
-    return GameActivityPointerAxes_getAxisValue(pointerInfo,
-                                                AMOTION_EVENT_AXIS_TOOL_MINOR);
+  return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                              AMOTION_EVENT_AXIS_TOOL_MINOR);
 }
 
 inline float GameActivityPointerAxes_getOrientation(
     const GameActivityPointerAxes* pointerInfo) {
-    return GameActivityPointerAxes_getAxisValue(pointerInfo,
-                                                AMOTION_EVENT_AXIS_ORIENTATION);
+  return GameActivityPointerAxes_getAxisValue(pointerInfo,
+                                              AMOTION_EVENT_AXIS_ORIENTATION);
 }
 
 /**
@@ -171,7 +171,7 @@ inline float GameActivityPointerAxes_getOrientation(
  */
 #if (defined GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT_OVERRIDE)
 #define GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT \
-    GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT_OVERRIDE
+  GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT_OVERRIDE
 #else
 #define GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT 8
 #endif
@@ -183,32 +183,32 @@ inline float GameActivityPointerAxes_getOrientation(
  * (see https://developer.android.com/reference/android/view/MotionEvent).
  */
 typedef struct GameActivityMotionEvent {
-    int32_t deviceId;
-    int32_t source;
-    int32_t action;
+  int32_t deviceId;
+  int32_t source;
+  int32_t action;
 
-    int64_t eventTime;
-    int64_t downTime;
+  int64_t eventTime;
+  int64_t downTime;
 
-    int32_t flags;
-    int32_t metaState;
+  int32_t flags;
+  int32_t metaState;
 
-    int32_t actionButton;
-    int32_t buttonState;
-    int32_t classification;
-    int32_t edgeFlags;
+  int32_t actionButton;
+  int32_t buttonState;
+  int32_t classification;
+  int32_t edgeFlags;
 
-    uint32_t pointerCount;
-    GameActivityPointerAxes
-        pointers[GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT];
+  uint32_t pointerCount;
+  GameActivityPointerAxes
+      pointers[GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT];
 
-    int historySize;
-    int64_t* historicalEventTimesMillis;
-    int64_t* historicalEventTimesNanos;
-    float* historicalAxisValues;
+  int historySize;
+  int64_t* historicalEventTimesMillis;
+  int64_t* historicalEventTimesNanos;
+  float* historicalAxisValues;
 
-    float precisionX;
-    float precisionY;
+  float precisionX;
+  float precisionY;
 } GameActivityMotionEvent;
 
 float GameActivityMotionEvent_getHistoricalAxisValue(
@@ -217,78 +217,66 @@ float GameActivityMotionEvent_getHistoricalAxisValue(
 
 inline int GameActivityMotionEvent_getHistorySize(
     const GameActivityMotionEvent* event) {
-    return event->historySize;
+  return event->historySize;
 }
 
 inline float GameActivityMotionEvent_getHistoricalX(
     const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_X, pointerIndex, historyPos);
+  return GameActivityMotionEvent_getHistoricalAxisValue(
+      event, AMOTION_EVENT_AXIS_X, pointerIndex, historyPos);
 }
 
 inline float GameActivityMotionEvent_getHistoricalY(
     const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_Y, pointerIndex, historyPos);
+  return GameActivityMotionEvent_getHistoricalAxisValue(
+      event, AMOTION_EVENT_AXIS_Y, pointerIndex, historyPos);
 }
 
 inline float GameActivityMotionEvent_getHistoricalPressure(
     const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_PRESSURE, pointerIndex, historyPos);
+  return GameActivityMotionEvent_getHistoricalAxisValue(
+      event, AMOTION_EVENT_AXIS_PRESSURE, pointerIndex, historyPos);
 }
 
 inline float GameActivityMotionEvent_getHistoricalSize(
     const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_SIZE, pointerIndex, historyPos);
+  return GameActivityMotionEvent_getHistoricalAxisValue(
+      event, AMOTION_EVENT_AXIS_SIZE, pointerIndex, historyPos);
 }
 
 inline float GameActivityMotionEvent_getHistoricalTouchMajor(
     const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_TOUCH_MAJOR, pointerIndex, historyPos);
+  return GameActivityMotionEvent_getHistoricalAxisValue(
+      event, AMOTION_EVENT_AXIS_TOUCH_MAJOR, pointerIndex, historyPos);
 }
 
 inline float GameActivityMotionEvent_getHistoricalTouchMinor(
     const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_TOUCH_MINOR, pointerIndex, historyPos);
+  return GameActivityMotionEvent_getHistoricalAxisValue(
+      event, AMOTION_EVENT_AXIS_TOUCH_MINOR, pointerIndex, historyPos);
 }
 
 inline float GameActivityMotionEvent_getHistoricalToolMajor(
     const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_TOOL_MAJOR, pointerIndex, historyPos);
+  return GameActivityMotionEvent_getHistoricalAxisValue(
+      event, AMOTION_EVENT_AXIS_TOOL_MAJOR, pointerIndex, historyPos);
 }
 
 inline float GameActivityMotionEvent_getHistoricalToolMinor(
     const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_TOOL_MINOR, pointerIndex, historyPos);
+  return GameActivityMotionEvent_getHistoricalAxisValue(
+      event, AMOTION_EVENT_AXIS_TOOL_MINOR, pointerIndex, historyPos);
 }
 
 inline float GameActivityMotionEvent_getHistoricalOrientation(
     const GameActivityMotionEvent* event, int pointerIndex, int historyPos) {
-    return GameActivityMotionEvent_getHistoricalAxisValue(
-        event, AMOTION_EVENT_AXIS_ORIENTATION, pointerIndex, historyPos);
+  return GameActivityMotionEvent_getHistoricalAxisValue(
+      event, AMOTION_EVENT_AXIS_ORIENTATION, pointerIndex, historyPos);
 }
 
 /** \brief Handle the freeing of the GameActivityMotionEvent struct. */
 void GameActivityMotionEvent_destroy(GameActivityMotionEvent* c_event);
 
-/**
- * \brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`.
- *
- * This is done automatically by the GameActivity: see `onTouchEvent` to set
- * a callback to consume the received events.
- * This function can be used if you re-implement events handling in your own
- * activity.
- * Ownership of out_event is maintained by the caller.
- */
-void GameActivityMotionEvent_fromJava(JNIEnv* env, jobject motionEvent,
-                                      GameActivityMotionEvent* out_event);
-
 /**
  * \brief Describe a key event that happened on the GameActivity SurfaceView.
  *
@@ -298,35 +286,23 @@ void GameActivityMotionEvent_fromJava(JNIEnv* env, jobject motionEvent,
  * nanoseconds in this struct.
  */
 typedef struct GameActivityKeyEvent {
-    int32_t deviceId;
-    int32_t source;
-    int32_t action;
+  int32_t deviceId;
+  int32_t source;
+  int32_t action;
 
-    int64_t eventTime;
-    int64_t downTime;
+  int64_t eventTime;
+  int64_t downTime;
 
-    int32_t flags;
-    int32_t metaState;
+  int32_t flags;
+  int32_t metaState;
 
-    int32_t modifiers;
-    int32_t repeatCount;
-    int32_t keyCode;
-    int32_t scanCode;
-    //int32_t unicodeChar;
+  int32_t modifiers;
+  int32_t repeatCount;
+  int32_t keyCode;
+  int32_t scanCode;
+  // int32_t unicodeChar;
 } GameActivityKeyEvent;
 
-/**
- * \brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.
- *
- * This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`
- * to set a callback to consume the received events.
- * This function can be used if you re-implement events handling in your own
- * activity.
- * Ownership of out_event is maintained by the caller.
- */
-void GameActivityKeyEvent_fromJava(JNIEnv* env, jobject motionEvent,
-                                   GameActivityKeyEvent* out_event);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityLog.h b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityLog.h
index ba9a9e9..311b3c4 100644
--- a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityLog.h
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivityLog.h
@@ -26,7 +26,7 @@
 #define ALOGV(...)
 #else
 #define ALOGV(...) \
-    __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__);
+  __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__);
 #endif
 
 /* Returns 2nd arg.  Used to substitute default value if caller's vararg list
@@ -40,21 +40,21 @@
 #define __android_rest(first, ...) , ##__VA_ARGS__
 
 #define android_printAssert(cond, tag, fmt...) \
-    __android_log_assert(cond, tag,            \
-                         __android_second(0, ##fmt, NULL) __android_rest(fmt))
+  __android_log_assert(cond, tag,              \
+                       __android_second(0, ##fmt, NULL) __android_rest(fmt))
 
 #define CONDITION(cond) (__builtin_expect((cond) != 0, 0))
 
 #ifndef LOG_ALWAYS_FATAL_IF
-#define LOG_ALWAYS_FATAL_IF(cond, ...)                                \
-    ((CONDITION(cond))                                                \
-         ? ((void)android_printAssert(#cond, LOG_TAG, ##__VA_ARGS__)) \
-         : (void)0)
+#define LOG_ALWAYS_FATAL_IF(cond, ...)                              \
+  ((CONDITION(cond))                                                \
+       ? ((void)android_printAssert(#cond, LOG_TAG, ##__VA_ARGS__)) \
+       : (void)0)
 #endif
 
 #ifndef LOG_ALWAYS_FATAL
 #define LOG_ALWAYS_FATAL(...) \
-    (((void)android_printAssert(NULL, LOG_TAG, ##__VA_ARGS__)))
+  (((void)android_printAssert(NULL, LOG_TAG, ##__VA_ARGS__)))
 #endif
 
 /*
@@ -62,14 +62,14 @@
  */
 #ifndef SLOGW
 #define SLOGW(...) \
-    ((void)__android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__))
+  ((void)__android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__))
 #endif
 
 #ifndef SLOGW_IF
-#define SLOGW_IF(cond, ...)                                                    \
-    ((__predict_false(cond))                                                   \
-         ? ((void)__android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)) \
-         : (void)0)
+#define SLOGW_IF(cond, ...)                                                  \
+  ((__predict_false(cond))                                                   \
+       ? ((void)__android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)) \
+       : (void)0)
 #endif
 
 /*
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.c b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.c
deleted file mode 100644
index a7bcb85..0000000
--- a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.c
+++ /dev/null
@@ -1,732 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "android_native_app_glue.h"
-
-#include <android/log.h>
-#include <assert.h>
-#include <errno.h>
-#include <jni.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#define NATIVE_APP_GLUE_MOTION_EVENTS_DEFAULT_BUF_SIZE 16
-#define NATIVE_APP_GLUE_KEY_EVENTS_DEFAULT_BUF_SIZE 4
-
-#define LOGI(...) \
-    ((void)__android_log_print(ANDROID_LOG_INFO, "threaded_app", __VA_ARGS__))
-#define LOGE(...) \
-    ((void)__android_log_print(ANDROID_LOG_ERROR, "threaded_app", __VA_ARGS__))
-#define LOGW(...) \
-    ((void)__android_log_print(ANDROID_LOG_WARN, "threaded_app", __VA_ARGS__))
-#define LOGW_ONCE(...)                                        \
-    do {                                                       \
-        static bool alogw_once##__FILE__##__LINE__##__ = true; \
-        if (alogw_once##__FILE__##__LINE__##__) {              \
-            alogw_once##__FILE__##__LINE__##__ = false;        \
-            LOGW(__VA_ARGS__);                                \
-        }                                                      \
-    } while (0)
-
-/* For debug builds, always enable the debug traces in this library */
-#ifndef NDEBUG
-#define LOGV(...)                                                   \
-    ((void)__android_log_print(ANDROID_LOG_VERBOSE, "threaded_app", \
-                               __VA_ARGS__))
-#else
-#define LOGV(...) ((void)0)
-#endif
-
-static void free_saved_state(struct android_app* android_app) {
-    pthread_mutex_lock(&android_app->mutex);
-    if (android_app->savedState != NULL) {
-        free(android_app->savedState);
-        android_app->savedState = NULL;
-        android_app->savedStateSize = 0;
-    }
-    pthread_mutex_unlock(&android_app->mutex);
-}
-
-int8_t android_app_read_cmd(struct android_app* android_app) {
-    int8_t cmd;
-    if (read(android_app->msgread, &cmd, sizeof(cmd)) != sizeof(cmd)) {
-        LOGE("No data on command pipe!");
-        return -1;
-    }
-    if (cmd == APP_CMD_SAVE_STATE) free_saved_state(android_app);
-    return cmd;
-}
-
-static void print_cur_config(struct android_app* android_app) {
-    char lang[2], country[2];
-    AConfiguration_getLanguage(android_app->config, lang);
-    AConfiguration_getCountry(android_app->config, country);
-
-    LOGV(
-        "Config: mcc=%d mnc=%d lang=%c%c cnt=%c%c orien=%d touch=%d dens=%d "
-        "keys=%d nav=%d keysHid=%d navHid=%d sdk=%d size=%d long=%d "
-        "modetype=%d modenight=%d",
-        AConfiguration_getMcc(android_app->config),
-        AConfiguration_getMnc(android_app->config), lang[0], lang[1],
-        country[0], country[1],
-        AConfiguration_getOrientation(android_app->config),
-        AConfiguration_getTouchscreen(android_app->config),
-        AConfiguration_getDensity(android_app->config),
-        AConfiguration_getKeyboard(android_app->config),
-        AConfiguration_getNavigation(android_app->config),
-        AConfiguration_getKeysHidden(android_app->config),
-        AConfiguration_getNavHidden(android_app->config),
-        AConfiguration_getSdkVersion(android_app->config),
-        AConfiguration_getScreenSize(android_app->config),
-        AConfiguration_getScreenLong(android_app->config),
-        AConfiguration_getUiModeType(android_app->config),
-        AConfiguration_getUiModeNight(android_app->config));
-}
-
-void android_app_pre_exec_cmd(struct android_app* android_app, int8_t cmd) {
-    switch (cmd) {
-        case UNUSED_APP_CMD_INPUT_CHANGED:
-            LOGV("UNUSED_APP_CMD_INPUT_CHANGED");
-            // Do nothing. This can be used in the future to handle AInputQueue
-            // natively, like done in NativeActivity.
-            break;
-
-        case APP_CMD_INIT_WINDOW:
-            LOGV("APP_CMD_INIT_WINDOW");
-            pthread_mutex_lock(&android_app->mutex);
-            android_app->window = android_app->pendingWindow;
-            pthread_cond_broadcast(&android_app->cond);
-            pthread_mutex_unlock(&android_app->mutex);
-            break;
-
-        case APP_CMD_TERM_WINDOW:
-            LOGV("APP_CMD_TERM_WINDOW");
-            pthread_cond_broadcast(&android_app->cond);
-            break;
-
-        case APP_CMD_RESUME:
-        case APP_CMD_START:
-        case APP_CMD_PAUSE:
-        case APP_CMD_STOP:
-            LOGV("activityState=%d", cmd);
-            pthread_mutex_lock(&android_app->mutex);
-            android_app->activityState = cmd;
-            pthread_cond_broadcast(&android_app->cond);
-            pthread_mutex_unlock(&android_app->mutex);
-            break;
-
-        case APP_CMD_CONFIG_CHANGED:
-            LOGV("APP_CMD_CONFIG_CHANGED");
-            AConfiguration_fromAssetManager(
-                android_app->config, android_app->activity->assetManager);
-            print_cur_config(android_app);
-            break;
-
-        case APP_CMD_DESTROY:
-            LOGV("APP_CMD_DESTROY");
-            android_app->destroyRequested = 1;
-            break;
-    }
-}
-
-void android_app_post_exec_cmd(struct android_app* android_app, int8_t cmd) {
-    switch (cmd) {
-        case APP_CMD_TERM_WINDOW:
-            LOGV("APP_CMD_TERM_WINDOW");
-            pthread_mutex_lock(&android_app->mutex);
-            android_app->window = NULL;
-            pthread_cond_broadcast(&android_app->cond);
-            pthread_mutex_unlock(&android_app->mutex);
-            break;
-
-        case APP_CMD_SAVE_STATE:
-            LOGV("APP_CMD_SAVE_STATE");
-            pthread_mutex_lock(&android_app->mutex);
-            android_app->stateSaved = 1;
-            pthread_cond_broadcast(&android_app->cond);
-            pthread_mutex_unlock(&android_app->mutex);
-            break;
-
-        case APP_CMD_RESUME:
-            free_saved_state(android_app);
-            break;
-    }
-}
-
-void app_dummy() {}
-
-static void android_app_destroy(struct android_app* android_app) {
-    LOGV("android_app_destroy!");
-    free_saved_state(android_app);
-    pthread_mutex_lock(&android_app->mutex);
-
-    AConfiguration_delete(android_app->config);
-    android_app->destroyed = 1;
-    pthread_cond_broadcast(&android_app->cond);
-    pthread_mutex_unlock(&android_app->mutex);
-    // Can't touch android_app object after this.
-}
-
-static void process_cmd(struct android_app* app,
-                        struct android_poll_source* source) {
-    int8_t cmd = android_app_read_cmd(app);
-    android_app_pre_exec_cmd(app, cmd);
-    if (app->onAppCmd != NULL) app->onAppCmd(app, cmd);
-    android_app_post_exec_cmd(app, cmd);
-}
-
-// This is run on a separate thread (i.e: not the main thread).
-static void* android_app_entry(void* param) {
-    struct android_app* android_app = (struct android_app*)param;
-    int input_buf_idx = 0;
-
-    LOGV("android_app_entry called");
-    android_app->config = AConfiguration_new();
-    LOGV("android_app = %p", android_app);
-    LOGV("config = %p", android_app->config);
-    LOGV("activity = %p", android_app->activity);
-    LOGV("assetmanager = %p", android_app->activity->assetManager);
-    AConfiguration_fromAssetManager(android_app->config,
-                                    android_app->activity->assetManager);
-
-    print_cur_config(android_app);
-
-    /* initialize event buffers */
-    for (input_buf_idx = 0; input_buf_idx < NATIVE_APP_GLUE_MAX_INPUT_BUFFERS; input_buf_idx++) {
-        struct android_input_buffer *buf = &android_app->inputBuffers[input_buf_idx];
-
-        buf->motionEventsBufferSize = NATIVE_APP_GLUE_MOTION_EVENTS_DEFAULT_BUF_SIZE;
-        buf->motionEvents = (GameActivityMotionEvent *) malloc(sizeof(GameActivityMotionEvent) *
-                                                               buf->motionEventsBufferSize);
-
-        buf->keyEventsBufferSize = NATIVE_APP_GLUE_KEY_EVENTS_DEFAULT_BUF_SIZE;
-        buf->keyEvents = (GameActivityKeyEvent *) malloc(sizeof(GameActivityKeyEvent) *
-                                                         buf->keyEventsBufferSize);
-    }
-
-    android_app->cmdPollSource.id = LOOPER_ID_MAIN;
-    android_app->cmdPollSource.app = android_app;
-    android_app->cmdPollSource.process = process_cmd;
-
-    ALooper* looper = ALooper_prepare(ALOOPER_PREPARE_ALLOW_NON_CALLBACKS);
-    ALooper_addFd(looper, android_app->msgread, LOOPER_ID_MAIN,
-                  ALOOPER_EVENT_INPUT, NULL, &android_app->cmdPollSource);
-    android_app->looper = looper;
-
-    pthread_mutex_lock(&android_app->mutex);
-    android_app->running = 1;
-    pthread_cond_broadcast(&android_app->cond);
-    pthread_mutex_unlock(&android_app->mutex);
-
-    _rust_glue_entry(android_app);
-
-    android_app_destroy(android_app);
-    return NULL;
-}
-
-// Codes from https://developer.android.com/reference/android/view/KeyEvent
-#define KEY_EVENT_KEYCODE_VOLUME_DOWN 25
-#define KEY_EVENT_KEYCODE_VOLUME_MUTE 164
-#define KEY_EVENT_KEYCODE_VOLUME_UP 24
-#define KEY_EVENT_KEYCODE_CAMERA 27
-#define KEY_EVENT_KEYCODE_ZOOM_IN 168
-#define KEY_EVENT_KEYCODE_ZOOM_OUT 169
-
-// Double-buffer the key event filter to avoid race condition.
-static bool default_key_filter(const GameActivityKeyEvent* event) {
-    // Ignore camera, volume, etc. buttons
-    return !(event->keyCode == KEY_EVENT_KEYCODE_VOLUME_DOWN ||
-             event->keyCode == KEY_EVENT_KEYCODE_VOLUME_MUTE ||
-             event->keyCode == KEY_EVENT_KEYCODE_VOLUME_UP ||
-             event->keyCode == KEY_EVENT_KEYCODE_CAMERA ||
-             event->keyCode == KEY_EVENT_KEYCODE_ZOOM_IN ||
-             event->keyCode == KEY_EVENT_KEYCODE_ZOOM_OUT);
-}
-
-// See
-// https://developer.android.com/reference/android/view/InputDevice#SOURCE_TOUCHSCREEN
-#define SOURCE_TOUCHSCREEN 0x00001002
-
-static bool default_motion_filter(const GameActivityMotionEvent* event) {
-    // Ignore any non-touch events.
-    return event->source == SOURCE_TOUCHSCREEN;
-}
-
-// --------------------------------------------------------------------
-// Native activity interaction (called from main thread)
-// --------------------------------------------------------------------
-
-static struct android_app* android_app_create(GameActivity* activity,
-                                              void* savedState,
-                                              size_t savedStateSize) {
-    //  struct android_app* android_app = calloc(1, sizeof(struct android_app));
-    struct android_app* android_app =
-        (struct android_app*)malloc(sizeof(struct android_app));
-    memset(android_app, 0, sizeof(struct android_app));
-    android_app->activity = activity;
-
-    pthread_mutex_init(&android_app->mutex, NULL);
-    pthread_cond_init(&android_app->cond, NULL);
-
-    if (savedState != NULL) {
-        android_app->savedState = malloc(savedStateSize);
-        android_app->savedStateSize = savedStateSize;
-        memcpy(android_app->savedState, savedState, savedStateSize);
-    }
-
-    int msgpipe[2];
-    if (pipe(msgpipe)) {
-        LOGE("could not create pipe: %s", strerror(errno));
-        return NULL;
-    }
-    android_app->msgread = msgpipe[0];
-    android_app->msgwrite = msgpipe[1];
-
-    android_app->keyEventFilter = default_key_filter;
-    android_app->motionEventFilter = default_motion_filter;
-
-    LOGV("Launching android_app_entry in a thread");
-    pthread_attr_t attr;
-    pthread_attr_init(&attr);
-    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-    pthread_create(&android_app->thread, &attr, android_app_entry, android_app);
-
-    // Wait for thread to start.
-    pthread_mutex_lock(&android_app->mutex);
-    while (!android_app->running) {
-        pthread_cond_wait(&android_app->cond, &android_app->mutex);
-    }
-    pthread_mutex_unlock(&android_app->mutex);
-
-    return android_app;
-}
-
-static void android_app_write_cmd(struct android_app* android_app, int8_t cmd) {
-    if (write(android_app->msgwrite, &cmd, sizeof(cmd)) != sizeof(cmd)) {
-        LOGE("Failure writing android_app cmd: %s", strerror(errno));
-    }
-}
-
-static void android_app_set_window(struct android_app* android_app,
-                                   ANativeWindow* window) {
-    LOGV("android_app_set_window called");
-    pthread_mutex_lock(&android_app->mutex);
-
-    // NB: we have to consider that the native thread could have already
-    // (gracefully) exit (setting android_app->destroyed) and so we need
-    // to be careful to avoid a deadlock waiting for a thread that's
-    // already exit.
-    if (android_app->destroyed) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return;
-    }
-    if (android_app->pendingWindow != NULL) {
-        android_app_write_cmd(android_app, APP_CMD_TERM_WINDOW);
-    }
-    android_app->pendingWindow = window;
-    if (window != NULL) {
-        android_app_write_cmd(android_app, APP_CMD_INIT_WINDOW);
-    }
-    while (android_app->window != android_app->pendingWindow) {
-        pthread_cond_wait(&android_app->cond, &android_app->mutex);
-    }
-    pthread_mutex_unlock(&android_app->mutex);
-}
-
-static void android_app_set_activity_state(struct android_app* android_app,
-                                           int8_t cmd) {
-    pthread_mutex_lock(&android_app->mutex);
-
-    // NB: we have to consider that the native thread could have already
-    // (gracefully) exit (setting android_app->destroyed) and so we need
-    // to be careful to avoid a deadlock waiting for a thread that's
-    // already exit.
-    if (!android_app->destroyed) {
-        android_app_write_cmd(android_app, cmd);
-        while (android_app->activityState != cmd) {
-            pthread_cond_wait(&android_app->cond, &android_app->mutex);
-        }
-    }
-    pthread_mutex_unlock(&android_app->mutex);
-}
-
-static void android_app_free(struct android_app* android_app) {
-    int input_buf_idx = 0;
-
-    pthread_mutex_lock(&android_app->mutex);
-
-    // It's possible that onDestroy is called after we have already 'destroyed'
-    // the app (via `android_app_destroy` due to `android_main` returning.
-    //
-    // In this case `->destroyed` will already be set (so we won't deadlock in
-    // the loop below) but we still need to close the messaging fds and finish
-    // freeing the android_app
-
-    android_app_write_cmd(android_app, APP_CMD_DESTROY);
-    while (!android_app->destroyed) {
-        pthread_cond_wait(&android_app->cond, &android_app->mutex);
-    }
-    pthread_mutex_unlock(&android_app->mutex);
-
-    for (input_buf_idx = 0; input_buf_idx < NATIVE_APP_GLUE_MAX_INPUT_BUFFERS; input_buf_idx++) {
-        struct android_input_buffer *buf = &android_app->inputBuffers[input_buf_idx];
-
-        android_app_clear_motion_events(buf);
-        free(buf->motionEvents);
-        free(buf->keyEvents);
-    }
-
-    close(android_app->msgread);
-    close(android_app->msgwrite);
-    pthread_cond_destroy(&android_app->cond);
-    pthread_mutex_destroy(&android_app->mutex);
-    free(android_app);
-}
-
-static inline struct android_app* ToApp(GameActivity* activity) {
-    return (struct android_app*)activity->instance;
-}
-
-static void onDestroy(GameActivity* activity) {
-    LOGV("Destroy: %p", activity);
-    android_app_free(ToApp(activity));
-}
-
-static void onStart(GameActivity* activity) {
-    LOGV("Start: %p", activity);
-    android_app_set_activity_state(ToApp(activity), APP_CMD_START);
-}
-
-static void onResume(GameActivity* activity) {
-    LOGV("Resume: %p", activity);
-    android_app_set_activity_state(ToApp(activity), APP_CMD_RESUME);
-}
-
-static void onSaveInstanceState(GameActivity* activity,
-                                SaveInstanceStateRecallback recallback,
-                                void* context) {
-    LOGV("SaveInstanceState: %p", activity);
-
-    struct android_app* android_app = ToApp(activity);
-    pthread_mutex_lock(&android_app->mutex);
-
-    // NB: we have to consider that the native thread could have already
-    // (gracefully) exit (setting android_app->destroyed) and so we need
-    // to be careful to avoid a deadlock waiting for a thread that's
-    // already exit.
-    if (android_app->destroyed) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return;
-    }
-
-    android_app->stateSaved = 0;
-    android_app_write_cmd(android_app, APP_CMD_SAVE_STATE);
-    while (!android_app->stateSaved) {
-        pthread_cond_wait(&android_app->cond, &android_app->mutex);
-    }
-
-    if (android_app->savedState != NULL) {
-        // Tell the Java side about our state.
-        recallback((const char*)android_app->savedState,
-                   android_app->savedStateSize, context);
-        // Now we can free it.
-        free(android_app->savedState);
-        android_app->savedState = NULL;
-        android_app->savedStateSize = 0;
-    }
-
-    pthread_mutex_unlock(&android_app->mutex);
-}
-
-static void onPause(GameActivity* activity) {
-    LOGV("Pause: %p", activity);
-    android_app_set_activity_state(ToApp(activity), APP_CMD_PAUSE);
-}
-
-static void onStop(GameActivity* activity) {
-    LOGV("Stop: %p", activity);
-    android_app_set_activity_state(ToApp(activity), APP_CMD_STOP);
-}
-
-static void onConfigurationChanged(GameActivity* activity) {
-    LOGV("ConfigurationChanged: %p", activity);
-    android_app_write_cmd(ToApp(activity), APP_CMD_CONFIG_CHANGED);
-}
-
-static void onTrimMemory(GameActivity* activity, int level) {
-    LOGV("TrimMemory: %p %d", activity, level);
-    android_app_write_cmd(ToApp(activity), APP_CMD_LOW_MEMORY);
-}
-
-static void onWindowFocusChanged(GameActivity* activity, bool focused) {
-    LOGV("WindowFocusChanged: %p -- %d", activity, focused);
-    android_app_write_cmd(ToApp(activity),
-                          focused ? APP_CMD_GAINED_FOCUS : APP_CMD_LOST_FOCUS);
-}
-
-static void onNativeWindowCreated(GameActivity* activity,
-                                  ANativeWindow* window) {
-    LOGV("NativeWindowCreated: %p -- %p", activity, window);
-    android_app_set_window(ToApp(activity), window);
-}
-
-static void onNativeWindowDestroyed(GameActivity* activity,
-                                    ANativeWindow* window) {
-    LOGV("NativeWindowDestroyed: %p -- %p", activity, window);
-    android_app_set_window(ToApp(activity), NULL);
-}
-
-static void onNativeWindowRedrawNeeded(GameActivity* activity,
-                                       ANativeWindow* window) {
-    LOGV("NativeWindowRedrawNeeded: %p -- %p", activity, window);
-    android_app_write_cmd(ToApp(activity), APP_CMD_WINDOW_REDRAW_NEEDED);
-}
-
-static void onNativeWindowResized(GameActivity* activity, ANativeWindow* window,
-                                  int32_t width, int32_t height) {
-    LOGV("NativeWindowResized: %p -- %p ( %d x %d )", activity, window, width,
-         height);
-    android_app_write_cmd(ToApp(activity), APP_CMD_WINDOW_RESIZED);
-}
-
-void android_app_set_motion_event_filter(struct android_app* app,
-                                         android_motion_event_filter filter) {
-    pthread_mutex_lock(&app->mutex);
-    app->motionEventFilter = filter;
-    pthread_mutex_unlock(&app->mutex);
-}
-
-bool android_app_input_available_wake_up(struct android_app* app) {
-    pthread_mutex_lock(&app->mutex);
-    bool available = app->inputAvailableWakeUp;
-    app->inputAvailableWakeUp = false;
-    pthread_mutex_unlock(&app->mutex);
-    return available;
-}
-
-// NB: should be called with the android_app->mutex held already
-static void notifyInput(struct android_app* android_app) {
-    // Don't spam the mainloop with wake ups if we've already sent one
-    if (android_app->inputSwapPending) {
-        return;
-    }
-
-    if (android_app->looper != NULL) {
-        // for the app thread to know why it received the wake() up
-        android_app->inputAvailableWakeUp = true;
-        android_app->inputSwapPending = true;
-        ALooper_wake(android_app->looper);
-    }
-}
-
-static bool onTouchEvent(GameActivity* activity,
-                         const GameActivityMotionEvent* event) {
-    struct android_app* android_app = ToApp(activity);
-    pthread_mutex_lock(&android_app->mutex);
-
-    // NB: we have to consider that the native thread could have already
-    // (gracefully) exit (setting android_app->destroyed) and so we need
-    // to be careful to avoid a deadlock waiting for a thread that's
-    // already exit.
-    if (android_app->destroyed) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return false;
-    }
-
-    if (android_app->motionEventFilter != NULL &&
-        !android_app->motionEventFilter(event)) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return false;
-    }
-
-    struct android_input_buffer* inputBuffer =
-        &android_app->inputBuffers[android_app->currentInputBuffer];
-
-    // Add to the list of active motion events
-    if (inputBuffer->motionEventsCount >= inputBuffer->motionEventsBufferSize) {
-        inputBuffer->motionEventsBufferSize *= 2;
-        inputBuffer->motionEvents = (GameActivityMotionEvent *) realloc(inputBuffer->motionEvents,
-            sizeof(GameActivityMotionEvent) * inputBuffer->motionEventsBufferSize);
-
-        if (inputBuffer->motionEvents == NULL) {
-            LOGE("onTouchEvent: out of memory");
-            abort();
-        }
-    }
-
-    int new_ix = inputBuffer->motionEventsCount;
-    memcpy(&inputBuffer->motionEvents[new_ix], event, sizeof(GameActivityMotionEvent));
-    ++inputBuffer->motionEventsCount;
-    notifyInput(android_app);
-
-    pthread_mutex_unlock(&android_app->mutex);
-    return true;
-}
-
-struct android_input_buffer* android_app_swap_input_buffers(
-    struct android_app* android_app) {
-    pthread_mutex_lock(&android_app->mutex);
-
-    struct android_input_buffer* inputBuffer =
-        &android_app->inputBuffers[android_app->currentInputBuffer];
-
-    if (inputBuffer->motionEventsCount == 0 &&
-        inputBuffer->keyEventsCount == 0) {
-        inputBuffer = NULL;
-    } else {
-        android_app->currentInputBuffer =
-            (android_app->currentInputBuffer + 1) %
-            NATIVE_APP_GLUE_MAX_INPUT_BUFFERS;
-    }
-
-    android_app->inputSwapPending = false;
-    android_app->inputAvailableWakeUp = false;
-
-    pthread_mutex_unlock(&android_app->mutex);
-
-    return inputBuffer;
-}
-
-void android_app_clear_motion_events(struct android_input_buffer* inputBuffer) {
-    // We do not need to lock here if the inputBuffer has already been swapped
-    // as is handled by the game loop thread
-    while (inputBuffer->motionEventsCount > 0) {
-        GameActivityMotionEvent_destroy(
-            &inputBuffer->motionEvents[inputBuffer->motionEventsCount - 1]);
-
-        inputBuffer->motionEventsCount--;
-    }
-    assert(inputBuffer->motionEventsCount == 0);
-}
-
-void android_app_set_key_event_filter(struct android_app* app,
-                                      android_key_event_filter filter) {
-    pthread_mutex_lock(&app->mutex);
-    app->keyEventFilter = filter;
-    pthread_mutex_unlock(&app->mutex);
-}
-
-static bool onKey(GameActivity* activity, const GameActivityKeyEvent* event) {
-    struct android_app* android_app = ToApp(activity);
-    pthread_mutex_lock(&android_app->mutex);
-
-    // NB: we have to consider that the native thread could have already
-    // (gracefully) exit (setting android_app->destroyed) and so we need
-    // to be careful to avoid a deadlock waiting for a thread that's
-    // already exit.
-    if (android_app->destroyed) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return false;
-    }
-
-    if (android_app->keyEventFilter != NULL &&
-        !android_app->keyEventFilter(event)) {
-        pthread_mutex_unlock(&android_app->mutex);
-        return false;
-    }
-
-    struct android_input_buffer* inputBuffer =
-        &android_app->inputBuffers[android_app->currentInputBuffer];
-
-    // Add to the list of active key down events
-    if (inputBuffer->keyEventsCount >= inputBuffer->keyEventsBufferSize) {
-        inputBuffer->keyEventsBufferSize = inputBuffer->keyEventsBufferSize * 2;
-        inputBuffer->keyEvents = (GameActivityKeyEvent *) realloc(inputBuffer->keyEvents,
-            sizeof(GameActivityKeyEvent) * inputBuffer->keyEventsBufferSize);
-
-        if (inputBuffer->keyEvents == NULL) {
-            LOGE("onKey: out of memory");
-            abort();
-        }
-    }
-
-    int new_ix = inputBuffer->keyEventsCount;
-    memcpy(&inputBuffer->keyEvents[new_ix], event, sizeof(GameActivityKeyEvent));
-    ++inputBuffer->keyEventsCount;
-    notifyInput(android_app);
-
-    pthread_mutex_unlock(&android_app->mutex);
-    return true;
-}
-
-void android_app_clear_key_events(struct android_input_buffer* inputBuffer) {
-    inputBuffer->keyEventsCount = 0;
-}
-
-static void onTextInputEvent(GameActivity* activity,
-                             const GameTextInputState* state) {
-    struct android_app* android_app = ToApp(activity);
-    pthread_mutex_lock(&android_app->mutex);
-    if (!android_app->destroyed) {
-        android_app->textInputState = 1;
-        notifyInput(android_app);
-    }
-    pthread_mutex_unlock(&android_app->mutex);
-}
-
-static void onWindowInsetsChanged(GameActivity* activity) {
-    LOGV("WindowInsetsChanged: %p", activity);
-    android_app_write_cmd(ToApp(activity), APP_CMD_WINDOW_INSETS_CHANGED);
-}
-
-static void onContentRectChanged(GameActivity* activity, const ARect *rect) {
-    LOGV("ContentRectChanged: %p -- (%d %d) (%d %d)", activity, rect->left, rect->top,
-         rect->right, rect->bottom);
-
-    struct android_app* android_app = ToApp(activity);
-
-    pthread_mutex_lock(&android_app->mutex);
-    android_app->contentRect = *rect;
-
-    android_app_write_cmd(android_app, APP_CMD_CONTENT_RECT_CHANGED);
-    pthread_mutex_unlock(&android_app->mutex);
-}
-
-// XXX: This symbol is renamed with a _C suffix and then re-exported from
-// Rust because Rust/Cargo don't give us a way to directly export symbols
-// from C/C++ code: https://github.com/rust-lang/rfcs/issues/2771
-//
-JNIEXPORT
-void GameActivity_onCreate_C(GameActivity* activity, void* savedState,
-                           size_t savedStateSize) {
-    LOGV("Creating: %p", activity);
-    activity->callbacks->onDestroy = onDestroy;
-    activity->callbacks->onStart = onStart;
-    activity->callbacks->onResume = onResume;
-    activity->callbacks->onSaveInstanceState = onSaveInstanceState;
-    activity->callbacks->onPause = onPause;
-    activity->callbacks->onStop = onStop;
-    activity->callbacks->onTouchEvent = onTouchEvent;
-    activity->callbacks->onKeyDown = onKey;
-    activity->callbacks->onKeyUp = onKey;
-    activity->callbacks->onTextInputEvent = onTextInputEvent;
-    activity->callbacks->onConfigurationChanged = onConfigurationChanged;
-    activity->callbacks->onTrimMemory = onTrimMemory;
-    activity->callbacks->onWindowFocusChanged = onWindowFocusChanged;
-    activity->callbacks->onNativeWindowCreated = onNativeWindowCreated;
-    activity->callbacks->onNativeWindowDestroyed = onNativeWindowDestroyed;
-    activity->callbacks->onNativeWindowRedrawNeeded =
-        onNativeWindowRedrawNeeded;
-    activity->callbacks->onNativeWindowResized = onNativeWindowResized;
-    activity->callbacks->onWindowInsetsChanged = onWindowInsetsChanged;
-    activity->callbacks->onContentRectChanged = onContentRectChanged;
-    LOGV("Callbacks set: %p", activity->callbacks);
-
-    activity->instance =
-        android_app_create(activity, savedState, savedStateSize);
-}
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h
index 6fa5721..cdb1ac8 100644
--- a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h
@@ -27,6 +27,7 @@
 #include <poll.h>
 #include <pthread.h>
 #include <sched.h>
+#include <stdint.h>
 
 #include "game-activity/GameActivity.h"
 
@@ -86,55 +87,54 @@ struct android_app;
  * when that source has data ready.
  */
 struct android_poll_source {
-    /**
-     * The identifier of this source.  May be LOOPER_ID_MAIN or
-     * LOOPER_ID_INPUT.
-     */
-    int32_t id;
-
-    /** The android_app this ident is associated with. */
-    struct android_app* app;
-
-    /**
-     * Function to call to perform the standard processing of data from
-     * this source.
-     */
-    void (*process)(struct android_app* app,
-                    struct android_poll_source* source);
+  /**
+   * The identifier of this source.  May be LOOPER_ID_MAIN or
+   * LOOPER_ID_INPUT.
+   */
+  int32_t id;
+
+  /** The android_app this ident is associated with. */
+  struct android_app* app;
+
+  /**
+   * Function to call to perform the standard processing of data from
+   * this source.
+   */
+  void (*process)(struct android_app* app, struct android_poll_source* source);
 };
 
 struct android_input_buffer {
-    /**
-     * Pointer to a read-only array of GameActivityMotionEvent.
-     * Only the first motionEventsCount events are valid.
-     */
-    GameActivityMotionEvent *motionEvents;
-
-    /**
-     * The number of valid motion events in `motionEvents`.
-     */
-    uint64_t motionEventsCount;
-
-    /**
-     * The size of the `motionEvents` buffer.
-     */
-    uint64_t motionEventsBufferSize;
-
-    /**
-     * Pointer to a read-only array of GameActivityKeyEvent.
-     * Only the first keyEventsCount events are valid.
-     */
-    GameActivityKeyEvent *keyEvents;
-
-    /**
-     * The number of valid "Key" events in `keyEvents`.
-     */
-    uint64_t keyEventsCount;
-
-    /**
-     * The size of the `keyEvents` buffer.
-     */
-    uint64_t keyEventsBufferSize;
+  /**
+   * Pointer to a read-only array of GameActivityMotionEvent.
+   * Only the first motionEventsCount events are valid.
+   */
+  GameActivityMotionEvent* motionEvents;
+
+  /**
+   * The number of valid motion events in `motionEvents`.
+   */
+  uint64_t motionEventsCount;
+
+  /**
+   * The size of the `motionEvents` buffer.
+   */
+  uint64_t motionEventsBufferSize;
+
+  /**
+   * Pointer to a read-only array of GameActivityKeyEvent.
+   * Only the first keyEventsCount events are valid.
+   */
+  GameActivityKeyEvent* keyEvents;
+
+  /**
+   * The number of valid "Key" events in `keyEvents`.
+   */
+  uint64_t keyEventsCount;
+
+  /**
+   * The size of the `keyEvents` buffer.
+   */
+  uint64_t keyEventsBufferSize;
 };
 
 /**
@@ -164,261 +164,294 @@ typedef bool (*android_motion_event_filter)(const GameActivityMotionEvent*);
  * Java objects.
  */
 struct android_app {
-    /**
-     * An optional pointer to application-defined state.
-     */
-    void* userData;
-
-    /**
-     * A required callback for processing main app commands (`APP_CMD_*`).
-     * This is called each frame if there are app commands that need processing.
-     */
-    void (*onAppCmd)(struct android_app* app, int32_t cmd);
-
-    /** The GameActivity object instance that this app is running in. */
-    GameActivity* activity;
-
-    /** The current configuration the app is running in. */
-    AConfiguration* config;
-
-    /**
-     * The last activity saved state, as provided at creation time.
-     * It is NULL if there was no state.  You can use this as you need; the
-     * memory will remain around until you call android_app_exec_cmd() for
-     * APP_CMD_RESUME, at which point it will be freed and savedState set to
-     * NULL. These variables should only be changed when processing a
-     * APP_CMD_SAVE_STATE, at which point they will be initialized to NULL and
-     * you can malloc your state and place the information here.  In that case
-     * the memory will be freed for you later.
-     */
-    void* savedState;
-
-    /**
-     * The size of the activity saved state. It is 0 if `savedState` is NULL.
-     */
-    size_t savedStateSize;
-
-    /** The ALooper associated with the app's thread. */
-    ALooper* looper;
-
-    /** When non-NULL, this is the window surface that the app can draw in. */
-    ANativeWindow* window;
-
-    /**
-     * Current content rectangle of the window; this is the area where the
-     * window's content should be placed to be seen by the user.
-     */
-    ARect contentRect;
-
-    /**
-     * Current state of the app's activity.  May be either APP_CMD_START,
-     * APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP.
-     */
-    int activityState;
-
-    /**
-     * This is non-zero when the application's GameActivity is being
-     * destroyed and waiting for the app thread to complete.
-     */
-    int destroyRequested;
+  /**
+   * An optional pointer to application-defined state.
+   */
+  void* userData;
+
+  /**
+   * A required callback for processing main app commands (`APP_CMD_*`).
+   * This is called each frame if there are app commands that need processing.
+   */
+  void (*onAppCmd)(struct android_app* app, int32_t cmd);
+
+  /** The GameActivity object instance that this app is running in. */
+  GameActivity* activity;
+
+  /** The current configuration the app is running in. */
+  AConfiguration* config;
+
+  /**
+   * The last activity saved state, as provided at creation time.
+   * It is NULL if there was no state.  You can use this as you need; the
+   * memory will remain around until you call android_app_exec_cmd() for
+   * APP_CMD_RESUME, at which point it will be freed and savedState set to
+   * NULL. These variables should only be changed when processing a
+   * APP_CMD_SAVE_STATE, at which point they will be initialized to NULL and
+   * you can malloc your state and place the information here.  In that case
+   * the memory will be freed for you later.
+   */
+  void* savedState;
+
+  /**
+   * The size of the activity saved state. It is 0 if `savedState` is NULL.
+   */
+  size_t savedStateSize;
+
+  /** The ALooper associated with the app's thread. */
+  ALooper* looper;
+
+  /** When non-NULL, this is the window surface that the app can draw in. */
+  ANativeWindow* window;
+
+  /**
+   * Current content rectangle of the window; this is the area where the
+   * window's content should be placed to be seen by the user.
+   */
+  ARect contentRect;
+
+  /**
+   * Whether the software keyboard is visible or not.
+   */
+  bool softwareKeyboardVisible;
+
+  /**
+   * Last editor action. Valid within APP_CMD_SOFTWARE_KB_VIS_CHANGED handler.
+   */
+  int editorAction;
+
+  /**
+   * Current state of the app's activity.  May be either APP_CMD_START,
+   * APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP.
+   */
+  int activityState;
+
+  /**
+   * This is non-zero when the application's GameActivity is being
+   * destroyed and waiting for the app thread to complete.
+   */
+  int destroyRequested;
 
 #define NATIVE_APP_GLUE_MAX_INPUT_BUFFERS 2
 
-    /**
-     * This is used for buffering input from GameActivity. Once ready, the
-     * application thread switches the buffers and processes what was
-     * accumulated.
-     */
-    struct android_input_buffer inputBuffers[NATIVE_APP_GLUE_MAX_INPUT_BUFFERS];
-
-    int currentInputBuffer;
-
-    /**
-     * 0 if no text input event is outstanding, 1 if it is.
-     * Use `GameActivity_getTextInputState` to get information
-     * about the text entered by the user.
-     */
-    int textInputState;
-
-    // Below are "private" implementation of the glue code.
-    /** @cond INTERNAL */
-
-    pthread_mutex_t mutex;
-    pthread_cond_t cond;
-
-    int msgread;
-    int msgwrite;
-
-    pthread_t thread;
-
-    struct android_poll_source cmdPollSource;
-
-    int running;
-    int stateSaved;
-    int destroyed;
-    int redrawNeeded;
-    ANativeWindow* pendingWindow;
-    ARect pendingContentRect;
-
-    android_key_event_filter keyEventFilter;
-    android_motion_event_filter motionEventFilter;
-
-    // When new input is received we set both of these flags and use the looper to
-    // wake up the application mainloop.
-    //
-    // To avoid spamming the mainloop with wake ups from lots of input though we
-    // don't sent a wake up if the inputSwapPending flag is already set. (i.e.
-    // we already expect input to be processed in a finite amount of time due to
-    // our previous wake up)
-    //
-    // When a wake up is received then we will check this flag (clearing it
-    // at the same time). If it was set then an InputAvailable event is sent to
-    // the application - which should lead to all input being processed within
-    // a finite amount of time.
-    //
-    // The next time android_app_swap_input_buffers is called, both flags will be
-    // cleared.
-    //
-    // NB: both of these should only be read with the app mutex held
-    bool inputAvailableWakeUp;
-    bool inputSwapPending;
-
-    /** @endcond */
+  /**
+   * This is used for buffering input from GameActivity. Once ready, the
+   * application thread switches the buffers and processes what was
+   * accumulated.
+   */
+  struct android_input_buffer inputBuffers[NATIVE_APP_GLUE_MAX_INPUT_BUFFERS];
+
+  int currentInputBuffer;
+
+  /**
+   * 0 if no text input event is outstanding, 1 if it is.
+   * Use `GameActivity_getTextInputState` to get information
+   * about the text entered by the user.
+   */
+  int textInputState;
+
+  // Below are "private" implementation of the glue code.
+  /** @cond INTERNAL */
+
+  pthread_mutex_t mutex;
+  pthread_cond_t cond;
+
+  int msgread;
+  int msgwrite;
+
+  pthread_t thread;
+
+  struct android_poll_source cmdPollSource;
+
+  int running;
+  int stateSaved;
+  int destroyed;
+  int redrawNeeded;
+  ANativeWindow* pendingWindow;
+  ARect pendingContentRect;
+
+  android_key_event_filter keyEventFilter;
+  android_motion_event_filter motionEventFilter;
+
+  // When new input is received we set both of these flags and use the looper to
+  // wake up the application mainloop.
+  //
+  // To avoid spamming the mainloop with wake ups from lots of input though we
+  // don't sent a wake up if the inputSwapPending flag is already set. (i.e.
+  // we already expect input to be processed in a finite amount of time due to
+  // our previous wake up)
+  //
+  // When a wake up is received then we will check this flag (clearing it
+  // at the same time). If it was set then an InputAvailable event is sent to
+  // the application - which should lead to all input being processed within
+  // a finite amount of time.
+  //
+  // The next time android_app_swap_input_buffers is called, both flags will be
+  // cleared.
+  //
+  // NB: both of these should only be read with the app mutex held
+  bool inputAvailableWakeUp;
+  bool inputSwapPending;
+
+  /** @endcond */
 };
 
 /**
  * Looper ID of commands coming from the app's main thread, an AInputQueue or
  * user-defined sources.
  */
-enum NativeAppGlueLooperId {
-    /**
-     * Looper data ID of commands coming from the app's main thread, which
-     * is returned as an identifier from ALooper_pollOnce().  The data for this
-     * identifier is a pointer to an android_poll_source structure.
-     * These can be retrieved and processed with android_app_read_cmd()
-     * and android_app_exec_cmd().
-     */
-    LOOPER_ID_MAIN = 1,
-
-    /**
-     * Unused. Reserved for future use when usage of AInputQueue will be
-     * supported.
-     */
-    LOOPER_ID_INPUT = 2,
-
-    /**
-     * Start of user-defined ALooper identifiers.
-     */
-    LOOPER_ID_USER = 3,
+enum NativeAppGlueLooperId : int8_t {
+  /**
+   * Looper data ID of commands coming from the app's main thread, which
+   * is returned as an identifier from ALooper_pollOnce().  The data for this
+   * identifier is a pointer to an android_poll_source structure.
+   * These can be retrieved and processed with android_app_read_cmd()
+   * and android_app_exec_cmd().
+   */
+  LOOPER_ID_MAIN = 1,
+
+  /**
+   * Unused. Reserved for future use when usage of AInputQueue will be
+   * supported.
+   */
+  LOOPER_ID_INPUT = 2,
+
+  /**
+   * Start of user-defined ALooper identifiers.
+   */
+  LOOPER_ID_USER = 3,
 };
 
 /**
  * Commands passed from the application's main Java thread to the game's thread.
+ *
+ * Values from 0 to 127 are reserved for this library; values from -128 to -1
+ * can be used for custom user's events.
  */
-enum NativeAppGlueAppCmd {
-    /**
-     * Unused. Reserved for future use when usage of AInputQueue will be
-     * supported.
-     */
-    UNUSED_APP_CMD_INPUT_CHANGED,
-
-    /**
-     * Command from main thread: a new ANativeWindow is ready for use.  Upon
-     * receiving this command, android_app->window will contain the new window
-     * surface.
-     */
-    APP_CMD_INIT_WINDOW,
-
-    /**
-     * Command from main thread: the existing ANativeWindow needs to be
-     * terminated.  Upon receiving this command, android_app->window still
-     * contains the existing window; after calling android_app_exec_cmd
-     * it will be set to NULL.
-     */
-    APP_CMD_TERM_WINDOW,
-
-    /**
-     * Command from main thread: the current ANativeWindow has been resized.
-     * Please redraw with its new size.
-     */
-    APP_CMD_WINDOW_RESIZED,
-
-    /**
-     * Command from main thread: the system needs that the current ANativeWindow
-     * be redrawn.  You should redraw the window before handing this to
-     * android_app_exec_cmd() in order to avoid transient drawing glitches.
-     */
-    APP_CMD_WINDOW_REDRAW_NEEDED,
-
-    /**
-     * Command from main thread: the content area of the window has changed,
-     * such as from the soft input window being shown or hidden.  You can
-     * find the new content rect in android_app::contentRect.
-     */
-    APP_CMD_CONTENT_RECT_CHANGED,
-
-    /**
-     * Command from main thread: the app's activity window has gained
-     * input focus.
-     */
-    APP_CMD_GAINED_FOCUS,
-
-    /**
-     * Command from main thread: the app's activity window has lost
-     * input focus.
-     */
-    APP_CMD_LOST_FOCUS,
-
-    /**
-     * Command from main thread: the current device configuration has changed.
-     */
-    APP_CMD_CONFIG_CHANGED,
-
-    /**
-     * Command from main thread: the system is running low on memory.
-     * Try to reduce your memory use.
-     */
-    APP_CMD_LOW_MEMORY,
-
-    /**
-     * Command from main thread: the app's activity has been started.
-     */
-    APP_CMD_START,
-
-    /**
-     * Command from main thread: the app's activity has been resumed.
-     */
-    APP_CMD_RESUME,
-
-    /**
-     * Command from main thread: the app should generate a new saved state
-     * for itself, to restore from later if needed.  If you have saved state,
-     * allocate it with malloc and place it in android_app.savedState with
-     * the size in android_app.savedStateSize.  The will be freed for you
-     * later.
-     */
-    APP_CMD_SAVE_STATE,
-
-    /**
-     * Command from main thread: the app's activity has been paused.
-     */
-    APP_CMD_PAUSE,
-
-    /**
-     * Command from main thread: the app's activity has been stopped.
-     */
-    APP_CMD_STOP,
-
-    /**
-     * Command from main thread: the app's activity is being destroyed,
-     * and waiting for the app thread to clean up and exit before proceeding.
-     */
-    APP_CMD_DESTROY,
-
-    /**
-     * Command from main thread: the app's insets have changed.
-     */
-    APP_CMD_WINDOW_INSETS_CHANGED,
+enum NativeAppGlueAppCmd : int8_t {
+  /**
+   * Unused. Reserved for future use when usage of AInputQueue will be
+   * supported.
+   */
+  UNUSED_APP_CMD_INPUT_CHANGED,
+
+  /**
+   * Command from main thread: a new ANativeWindow is ready for use.  Upon
+   * receiving this command, android_app->window will contain the new window
+   * surface.
+   */
+  APP_CMD_INIT_WINDOW,
+
+  /**
+   * Command from main thread: the existing ANativeWindow needs to be
+   * terminated.  Upon receiving this command, android_app->window still
+   * contains the existing window; after calling android_app_exec_cmd
+   * it will be set to NULL.
+   */
+  APP_CMD_TERM_WINDOW,
+
+  /**
+   * Command from main thread: the current ANativeWindow has been resized.
+   * Please redraw with its new size.
+   */
+  APP_CMD_WINDOW_RESIZED,
+
+  /**
+   * Command from main thread: the system needs that the current ANativeWindow
+   * be redrawn.  You should redraw the window before handing this to
+   * android_app_exec_cmd() in order to avoid transient drawing glitches.
+   */
+  APP_CMD_WINDOW_REDRAW_NEEDED,
+
+  /**
+   * Command from main thread: the content area of the window has changed,
+   * such as from the soft input window being shown or hidden.  You can
+   * find the new content rect in android_app::contentRect.
+   */
+  APP_CMD_CONTENT_RECT_CHANGED,
+
+  /**
+   * Command from main thread: the software keyboard was shown or hidden.
+   */
+  APP_CMD_SOFTWARE_KB_VIS_CHANGED,
+
+  /**
+   * Command from main thread: the app's activity window has gained
+   * input focus.
+   */
+  APP_CMD_GAINED_FOCUS,
+
+  /**
+   * Command from main thread: the app's activity window has lost
+   * input focus.
+   */
+  APP_CMD_LOST_FOCUS,
+
+  /**
+   * Command from main thread: the current device configuration has changed.
+   */
+  APP_CMD_CONFIG_CHANGED,
+
+  /**
+   * Command from main thread: the system is running low on memory.
+   * Try to reduce your memory use.
+   */
+  APP_CMD_LOW_MEMORY,
+
+  /**
+   * Command from main thread: the app's activity has been started.
+   */
+  APP_CMD_START,
+
+  /**
+   * Command from main thread: the app's activity has been resumed.
+   */
+  APP_CMD_RESUME,
+
+  /**
+   * Command from main thread: the app should generate a new saved state
+   * for itself, to restore from later if needed.  If you have saved state,
+   * allocate it with malloc and place it in android_app.savedState with
+   * the size in android_app.savedStateSize.  The will be freed for you
+   * later.
+   */
+  APP_CMD_SAVE_STATE,
+
+  /**
+   * Command from main thread: the app's activity has been paused.
+   */
+  APP_CMD_PAUSE,
+
+  /**
+   * Command from main thread: the app's activity has been stopped.
+   */
+  APP_CMD_STOP,
+
+  /**
+   * Command from main thread: the app's activity is being destroyed,
+   * and waiting for the app thread to clean up and exit before proceeding.
+   */
+  APP_CMD_DESTROY,
+
+  /**
+   * Command from main thread: the app's insets have changed.
+   */
+  APP_CMD_WINDOW_INSETS_CHANGED,
+
+  /**
+   * Command from main thread: an editor action has been triggered.
+   */
+  APP_CMD_EDITOR_ACTION,
+
+  /**
+   * Command from main thread: a keyboard event has been received.
+   */
+  APP_CMD_KEY_EVENT,
+
+  /**
+   * Command from main thread: a touch event has been received.
+   */
+  APP_CMD_TOUCH_EVENT,
 
 };
 
@@ -495,6 +528,16 @@ void android_app_set_key_event_filter(struct android_app* app,
 void android_app_set_motion_event_filter(struct android_app* app,
                                          android_motion_event_filter filter);
 
+/**
+ * You can send your custom events using the function below.
+ *
+ * Make sure your custom codes do not overlap with this library's ones.
+ *
+ * Values from 0 to 127 are reserved for this library; values from -128 to -1
+ * can be used for custom user's events.
+ */
+void android_app_write_cmd(struct android_app* android_app, int8_t cmd);
+
 /**
  * Determines if a looper wake up was due to new input becoming available
  */
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/GameActivity.cpp b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/GameActivity.cpp
new file mode 100644
index 0000000..a178793
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/GameActivity.cpp
@@ -0,0 +1,1399 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <android/api-level.h>
+#include <android/asset_manager.h>
+#include <android/asset_manager_jni.h>
+#include <android/log.h>
+#include <android/looper.h>
+#include <android/native_window.h>
+#include <android/native_window_jni.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <game-activity/GameActivity.h>
+#include <game-activity/GameActivityLog.h>
+#include <jni.h>
+#include <poll.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/system_properties.h>
+#include <sys/types.h>
+#include <system_utils.h>
+#include <unistd.h>
+
+#include <memory>
+#include <mutex>
+#include <string>
+#include <vector>
+
+#include "GameActivityEvents_internal.h"
+
+namespace {
+
+struct OwnedGameTextInputState {
+  OwnedGameTextInputState &operator=(const GameTextInputState &rhs) {
+    inner = rhs;
+    owned_string = std::string(rhs.text_UTF8, rhs.text_length);
+    inner.text_UTF8 = owned_string.data();
+    return *this;
+  }
+  GameTextInputState inner;
+  std::string owned_string;
+};
+
+}  // anonymous namespace
+
+#ifndef NELEM
+#define NELEM(x) ((int)(sizeof(x) / sizeof((x)[0])))
+#endif
+
+/*
+ * JNI methods of the GameActivity Java class.
+ */
+static struct {
+  jmethodID finish;
+  jmethodID setWindowFlags;
+  jmethodID getWindowInsets;
+  jmethodID getWaterfallInsets;
+  jmethodID setImeEditorInfoFields;
+} gGameActivityClassInfo;
+
+/*
+ * JNI methods of the android.os.LocaleList class.
+ */
+static struct {
+  jmethodID size;
+  jmethodID get;
+} gLocaleListClassInfo;
+
+/*
+ * JNI methods of the java.util.Locale class.
+ */
+static struct {
+  jmethodID getLanguage;
+  jmethodID getScript;
+  jmethodID getCountry;
+  jmethodID getVariant;
+} gLocaleClassInfo;
+
+/*
+ * JNI fields of the androidx.core.graphics.Insets Java class.
+ */
+static struct {
+  jfieldID left;
+  jfieldID right;
+  jfieldID top;
+  jfieldID bottom;
+} gInsetsClassInfo;
+
+/*
+ * JNI fields of the Configuration Java class.
+ */
+static struct ConfigurationClassInfo {
+  jfieldID colorMode;
+  jfieldID densityDpi;
+  jfieldID fontScale;
+  jfieldID fontWeightAdjustment;
+  jfieldID hardKeyboardHidden;
+  jfieldID keyboard;
+  jfieldID keyboardHidden;
+  jfieldID mcc;
+  jfieldID mnc;
+  jfieldID navigation;
+  jfieldID navigationHidden;
+  jfieldID orientation;
+  jfieldID screenHeightDp;
+  jfieldID screenLayout;
+  jfieldID screenWidthDp;
+  jfieldID smallestScreenWidthDp;
+  jfieldID touchscreen;
+  jfieldID uiMode;
+
+  jmethodID getLocales;
+} gConfigurationClassInfo;
+
+/*
+ * JNI methods of the WindowInsetsCompat.Type Java class.
+ */
+static struct {
+  jmethodID methods[GAMECOMMON_INSETS_TYPE_COUNT];
+  jclass clazz;
+} gWindowInsetsCompatTypeClassInfo;
+
+/*
+ * Contains a command to be executed by the GameActivity
+ * on the application main thread.
+ */
+struct ActivityWork {
+  int32_t cmd;
+  int64_t arg1;
+  int64_t arg2;
+  int64_t arg3;
+};
+
+/*
+ * The type of commands that can be passed to the GameActivity and that
+ * are executed on the application main thread.
+ */
+enum {
+  CMD_FINISH = 1,
+  CMD_SET_WINDOW_FORMAT,
+  CMD_SET_WINDOW_FLAGS,
+  CMD_SHOW_SOFT_INPUT,
+  CMD_HIDE_SOFT_INPUT,
+  CMD_SET_SOFT_INPUT_STATE,
+  CMD_SET_IME_EDITOR_INFO,
+  CMD_RESTART_INPUT
+};
+
+/*
+ * A class for locale information, matching Android Java Locale class.
+ */
+struct Locale {
+  std::string language;
+  std::string script;
+  std::string country;
+  std::string variant;
+};
+
+/*
+ * Last known Configuration values. They may be accessed from the different
+ * thread, this is why they are made atomic.
+ */
+static struct Configuration {
+  int colorMode;
+  int densityDpi;
+  float fontScale;
+  int fontWeightAdjustment;
+  int hardKeyboardHidden;
+  int keyboard;
+  int keyboardHidden;
+  int mcc;
+  int mnc;
+  int navigation;
+  int navigationHidden;
+  int orientation;
+  int screenHeightDp;
+  int screenLayout;
+  int screenWidthDp;
+  int smallestScreenWidthDp;
+  int touchscreen;
+  int uiMode;
+  std::vector<Locale> locales;
+} gConfiguration;
+
+static std::mutex gConfigMutex;
+
+/*
+ * Write a command to be executed by the GameActivity on the application main
+ * thread.
+ */
+static void write_work(int fd, int32_t cmd, int64_t arg1 = 0, int64_t arg2 = 0,
+                       int64_t arg3 = 0) {
+  ActivityWork work;
+  work.cmd = cmd;
+  work.arg1 = arg1;
+  work.arg2 = arg2;
+  work.arg3 = arg3;
+
+  LOG_TRACE("write_work: cmd=%d", cmd);
+restart:
+  int res = write(fd, &work, sizeof(work));
+  if (res < 0 && errno == EINTR) {
+    goto restart;
+  }
+
+  if (res == sizeof(work)) return;
+
+  if (res < 0) {
+    ALOGW("Failed writing to work fd: %s", strerror(errno));
+  } else {
+    ALOGW("Truncated writing to work fd: %d", res);
+  }
+}
+
+/*
+ * Read commands to be executed by the GameActivity on the application main
+ * thread.
+ */
+static bool read_work(int fd, ActivityWork *outWork) {
+  int res = read(fd, outWork, sizeof(ActivityWork));
+  // no need to worry about EINTR, poll loop will just come back again.
+  if (res == sizeof(ActivityWork)) return true;
+
+  if (res < 0) {
+    ALOGW("Failed reading work fd: %s", strerror(errno));
+  } else {
+    ALOGW("Truncated reading work fd: %d", res);
+  }
+  return false;
+}
+
+/*
+ * Native state for interacting with the GameActivity class.
+ */
+struct NativeCode : public GameActivity {
+  NativeCode() {
+    memset((GameActivity *)this, 0, sizeof(GameActivity));
+    memset(&callbacks, 0, sizeof(callbacks));
+    memset(&insetsState, 0, sizeof(insetsState));
+    nativeWindow = NULL;
+    mainWorkRead = mainWorkWrite = -1;
+    gameTextInput = NULL;
+    softwareKeyboardVisible = false;
+    sdkVersion = gamesdk::GetSystemPropAsInt("ro.build.version.sdk");
+    ALOGD("SDK version: %d", sdkVersion);
+  }
+
+  ~NativeCode() {
+    if (callbacks.onDestroy != NULL) {
+      callbacks.onDestroy(this);
+    }
+    if (env != NULL) {
+      if (javaGameActivity != NULL) {
+        env->DeleteGlobalRef(javaGameActivity);
+      }
+      if (javaAssetManager != NULL) {
+        env->DeleteGlobalRef(javaAssetManager);
+      }
+    }
+    GameTextInput_destroy(gameTextInput);
+    if (looper != NULL && mainWorkRead >= 0) {
+      ALooper_removeFd(looper, mainWorkRead);
+    }
+    ALooper_release(looper);
+    looper = NULL;
+
+    setSurface(NULL);
+    if (mainWorkRead >= 0) close(mainWorkRead);
+    if (mainWorkWrite >= 0) close(mainWorkWrite);
+  }
+
+  void setSurface(jobject _surface) {
+    if (nativeWindow != NULL) {
+      ANativeWindow_release(nativeWindow);
+    }
+    if (_surface != NULL) {
+      nativeWindow = ANativeWindow_fromSurface(env, _surface);
+    } else {
+      nativeWindow = NULL;
+    }
+  }
+
+  GameActivityCallbacks callbacks;
+
+  std::string internalDataPathObj;
+  std::string externalDataPathObj;
+  std::string obbPathObj;
+
+  ANativeWindow *nativeWindow;
+  int32_t lastWindowWidth;
+  int32_t lastWindowHeight;
+
+  // These are used to wake up the main thread to process work.
+  int mainWorkRead;
+  int mainWorkWrite;
+  ALooper *looper;
+
+  // Need to hold on to a reference here in case the upper layers destroy our
+  // AssetManager.
+  jobject javaAssetManager;
+
+  GameTextInput *gameTextInput;
+  // Set by users in GameActivity_setTextInputState, then passed to
+  // GameTextInput.
+  OwnedGameTextInputState gameTextInputState;
+  std::mutex gameTextInputStateMutex;
+
+  ARect insetsState[GAMECOMMON_INSETS_TYPE_COUNT];
+  bool softwareKeyboardVisible;
+};
+
+static void readConfigurationValues(NativeCode *code, jobject javaConfig);
+
+extern "C" void GameActivity_finish(GameActivity *activity) {
+  NativeCode *code = static_cast<NativeCode *>(activity);
+  write_work(code->mainWorkWrite, CMD_FINISH, 0);
+}
+
+extern "C" void GameActivity_setWindowFlags(GameActivity *activity,
+                                            uint32_t values, uint32_t mask) {
+  NativeCode *code = static_cast<NativeCode *>(activity);
+  write_work(code->mainWorkWrite, CMD_SET_WINDOW_FLAGS, values, mask);
+}
+
+extern "C" void GameActivity_showSoftInput(GameActivity *activity,
+                                           uint32_t flags) {
+  NativeCode *code = static_cast<NativeCode *>(activity);
+  write_work(code->mainWorkWrite, CMD_SHOW_SOFT_INPUT, flags);
+}
+
+extern "C" void GameActivity_restartInput(GameActivity *activity) {
+  NativeCode *code = static_cast<NativeCode *>(activity);
+  write_work(code->mainWorkWrite, CMD_RESTART_INPUT);
+}
+
+extern "C" void GameActivity_setTextInputState(
+    GameActivity *activity, const GameTextInputState *state) {
+  NativeCode *code = static_cast<NativeCode *>(activity);
+  std::lock_guard<std::mutex> lock(code->gameTextInputStateMutex);
+  code->gameTextInputState = *state;
+  write_work(code->mainWorkWrite, CMD_SET_SOFT_INPUT_STATE);
+}
+
+extern "C" void GameActivity_getTextInputState(
+    GameActivity *activity, GameTextInputGetStateCallback callback,
+    void *context) {
+  NativeCode *code = static_cast<NativeCode *>(activity);
+  return GameTextInput_getState(code->gameTextInput, callback, context);
+}
+
+extern "C" void GameActivity_hideSoftInput(GameActivity *activity,
+                                           uint32_t flags) {
+  NativeCode *code = static_cast<NativeCode *>(activity);
+  write_work(code->mainWorkWrite, CMD_HIDE_SOFT_INPUT, flags);
+}
+
+extern "C" void GameActivity_getWindowInsets(GameActivity *activity,
+                                             GameCommonInsetsType type,
+                                             ARect *insets) {
+  if (type < 0 || type >= GAMECOMMON_INSETS_TYPE_COUNT) return;
+  NativeCode *code = static_cast<NativeCode *>(activity);
+  *insets = code->insetsState[type];
+}
+
+extern "C" bool GameActivity_isSoftwareKeyboardVisible(GameActivity *activity) {
+  NativeCode *code = static_cast<NativeCode *>(activity);
+  return code->softwareKeyboardVisible;
+}
+
+extern "C" GameTextInput *GameActivity_getTextInput(
+    const GameActivity *activity) {
+  const NativeCode *code = static_cast<const NativeCode *>(activity);
+  return code->gameTextInput;
+}
+
+/*
+ * Log the JNI exception, if any.
+ */
+static void checkAndClearException(JNIEnv *env, const char *methodName) {
+  if (env->ExceptionCheck()) {
+    ALOGE("Exception while running %s", methodName);
+    env->ExceptionDescribe();
+    env->ExceptionClear();
+  }
+}
+
+/*
+ * Callback for handling native events on the application's main thread.
+ */
+static int mainWorkCallback(int fd, int events, void *data) {
+  ALOGD("************** mainWorkCallback *********");
+  NativeCode *code = (NativeCode *)data;
+  if ((events & POLLIN) == 0) {
+    return 1;
+  }
+
+  ActivityWork work;
+  if (!read_work(code->mainWorkRead, &work)) {
+    return 1;
+  }
+  LOG_TRACE("mainWorkCallback: cmd=%d", work.cmd);
+  switch (work.cmd) {
+    case CMD_FINISH: {
+      code->env->CallVoidMethod(code->javaGameActivity,
+                                gGameActivityClassInfo.finish);
+      checkAndClearException(code->env, "finish");
+    } break;
+    case CMD_SET_WINDOW_FLAGS: {
+      code->env->CallVoidMethod(
+          code->javaGameActivity, gGameActivityClassInfo.setWindowFlags,
+          static_cast<jint>(work.arg1), static_cast<jint>(work.arg2));
+      checkAndClearException(code->env, "setWindowFlags");
+    } break;
+    case CMD_SHOW_SOFT_INPUT: {
+      GameTextInput_showIme(code->gameTextInput, work.arg1);
+    } break;
+    case CMD_SET_SOFT_INPUT_STATE: {
+      std::lock_guard<std::mutex> lock(code->gameTextInputStateMutex);
+      GameTextInput_setState(code->gameTextInput,
+                             &code->gameTextInputState.inner);
+      checkAndClearException(code->env, "setTextInputState");
+    } break;
+    case CMD_HIDE_SOFT_INPUT: {
+      GameTextInput_hideIme(code->gameTextInput, work.arg1);
+    } break;
+    case CMD_SET_IME_EDITOR_INFO: {
+      code->env->CallVoidMethod(
+          code->javaGameActivity, gGameActivityClassInfo.setImeEditorInfoFields,
+          static_cast<jint>(work.arg1), static_cast<jint>(work.arg2),
+          static_cast<jint>(work.arg3));
+      checkAndClearException(code->env, "setImeEditorInfo");
+    } break;
+    case CMD_RESTART_INPUT: {
+      GameTextInput_restartInput(code->gameTextInput);
+    } break;
+    default:
+      ALOGW("Unknown work command: %d", work.cmd);
+      break;
+  }
+
+  return 1;
+}
+
+// ------------------------------------------------------------------------
+static thread_local std::string g_error_msg;
+
+static jlong initializeNativeCode_native(
+    JNIEnv *env, jobject javaGameActivity, jstring internalDataDir,
+    jstring obbDir, jstring externalDataDir, jobject jAssetMgr,
+    jbyteArray savedState, jobject javaConfig) {
+  LOG_TRACE("initializeNativeCode_native");
+  NativeCode *code = NULL;
+
+  code = new NativeCode();
+
+  code->looper = ALooper_forThread();
+  if (code->looper == nullptr) {
+    g_error_msg = "Unable to retrieve native ALooper";
+    ALOGW("%s", g_error_msg.c_str());
+    delete code;
+    return 0;
+  }
+  ALooper_acquire(code->looper);
+
+  int msgpipe[2];
+  if (pipe(msgpipe)) {
+    g_error_msg = "could not create pipe: ";
+    g_error_msg += strerror(errno);
+
+    ALOGW("%s", g_error_msg.c_str());
+    delete code;
+    return 0;
+  }
+  code->mainWorkRead = msgpipe[0];
+  code->mainWorkWrite = msgpipe[1];
+  int result = fcntl(code->mainWorkRead, F_SETFL, O_NONBLOCK);
+  SLOGW_IF(result != 0,
+           "Could not make main work read pipe "
+           "non-blocking: %s",
+           strerror(errno));
+  result = fcntl(code->mainWorkWrite, F_SETFL, O_NONBLOCK);
+  SLOGW_IF(result != 0,
+           "Could not make main work write pipe "
+           "non-blocking: %s",
+           strerror(errno));
+  ALooper_addFd(code->looper, code->mainWorkRead, 0, ALOOPER_EVENT_INPUT,
+                mainWorkCallback, code);
+
+  code->GameActivity::callbacks = &code->callbacks;
+  if (env->GetJavaVM(&code->vm) < 0) {
+    ALOGW("GameActivity GetJavaVM failed");
+    delete code;
+    return 0;
+  }
+  code->env = env;
+  code->javaGameActivity = env->NewGlobalRef(javaGameActivity);
+
+  const char *dirStr =
+      internalDataDir ? env->GetStringUTFChars(internalDataDir, NULL) : "";
+  code->internalDataPathObj = dirStr;
+  code->internalDataPath = code->internalDataPathObj.c_str();
+  if (internalDataDir) env->ReleaseStringUTFChars(internalDataDir, dirStr);
+
+  dirStr = externalDataDir ? env->GetStringUTFChars(externalDataDir, NULL) : "";
+  code->externalDataPathObj = dirStr;
+  code->externalDataPath = code->externalDataPathObj.c_str();
+  if (externalDataDir) env->ReleaseStringUTFChars(externalDataDir, dirStr);
+
+  code->javaAssetManager = env->NewGlobalRef(jAssetMgr);
+  code->assetManager = AAssetManager_fromJava(env, jAssetMgr);
+
+  dirStr = obbDir ? env->GetStringUTFChars(obbDir, NULL) : "";
+  code->obbPathObj = dirStr;
+  code->obbPath = code->obbPathObj.c_str();
+  if (obbDir) env->ReleaseStringUTFChars(obbDir, dirStr);
+
+  jbyte *rawSavedState = NULL;
+  jsize rawSavedSize = 0;
+  if (savedState != NULL) {
+    rawSavedState = env->GetByteArrayElements(savedState, NULL);
+    rawSavedSize = env->GetArrayLength(savedState);
+  }
+
+  // read configuration for the first time
+  readConfigurationValues(code, javaConfig);
+
+  GameActivity_onCreate_C(code, rawSavedState, rawSavedSize);
+
+  code->gameTextInput = GameTextInput_init(env, 0);
+  GameTextInput_setEventCallback(code->gameTextInput,
+                                 reinterpret_cast<GameTextInputEventCallback>(
+                                     code->callbacks.onTextInputEvent),
+                                 code);
+
+  if (rawSavedState != NULL) {
+    env->ReleaseByteArrayElements(savedState, rawSavedState, 0);
+  }
+
+  return reinterpret_cast<jlong>(code);
+}
+
+static jstring getDlError_native(JNIEnv *env, jobject javaGameActivity) {
+  jstring result = env->NewStringUTF(g_error_msg.c_str());
+  g_error_msg.clear();
+  return result;
+}
+
+static void terminateNativeCode_native(JNIEnv *env, jobject javaGameActivity,
+                                       jlong handle) {
+  LOG_TRACE("terminateNativeCode_native");
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+    delete code;
+  }
+}
+
+static void onStart_native(JNIEnv *env, jobject javaGameActivity,
+                           jlong handle) {
+  ALOGV("onStart_native");
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+    if (code->callbacks.onStart != NULL) {
+      code->callbacks.onStart(code);
+    }
+  }
+}
+
+static void onResume_native(JNIEnv *env, jobject javaGameActivity,
+                            jlong handle) {
+  LOG_TRACE("onResume_native");
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+    if (code->callbacks.onResume != NULL) {
+      code->callbacks.onResume(code);
+    }
+  }
+}
+
+struct SaveInstanceLocals {
+  JNIEnv *env;
+  jbyteArray array;
+};
+
+static jbyteArray onSaveInstanceState_native(JNIEnv *env,
+                                             jobject javaGameActivity,
+                                             jlong handle) {
+  LOG_TRACE("onSaveInstanceState_native");
+
+  SaveInstanceLocals locals{
+      env, NULL};  // Passed through the user's state prep function.
+
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+    if (code->callbacks.onSaveInstanceState != NULL) {
+      code->callbacks.onSaveInstanceState(
+          code,
+          [](const char *bytes, int len, void *context) {
+            auto locals = static_cast<SaveInstanceLocals *>(context);
+            if (len > 0) {
+              locals->array = locals->env->NewByteArray(len);
+              if (locals->array != NULL) {
+                locals->env->SetByteArrayRegion(locals->array, 0, len,
+                                                (const jbyte *)bytes);
+              }
+            }
+          },
+          &locals);
+    }
+  }
+  return locals.array;
+}
+
+static void onPause_native(JNIEnv *env, jobject javaGameActivity,
+                           jlong handle) {
+  LOG_TRACE("onPause_native");
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+    if (code->callbacks.onPause != NULL) {
+      code->callbacks.onPause(code);
+    }
+  }
+}
+
+static void onStop_native(JNIEnv *env, jobject javaGameActivity, jlong handle) {
+  LOG_TRACE("onStop_native");
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+    if (code->callbacks.onStop != NULL) {
+      code->callbacks.onStop(code);
+    }
+  }
+}
+
+static std::string getStringField(JNIEnv *env, jobject obj, jmethodID method) {
+  jstring str = (jstring)env->CallObjectMethod(obj, method);
+  const char *chars = env->GetStringUTFChars(str, NULL);
+  std::string res(chars);
+  env->ReleaseStringUTFChars(str, chars);
+  checkAndClearException(env, "getStringField");
+  return res;
+}
+
+static void readConfigurationValues(NativeCode *code, jobject javaConfig) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+
+  if (gConfigurationClassInfo.colorMode != NULL) {
+    gConfiguration.colorMode =
+        code->env->GetIntField(javaConfig, gConfigurationClassInfo.colorMode);
+  }
+
+  gConfiguration.densityDpi =
+      code->env->GetIntField(javaConfig, gConfigurationClassInfo.densityDpi);
+  gConfiguration.fontScale =
+      code->env->GetFloatField(javaConfig, gConfigurationClassInfo.fontScale);
+
+  if (gConfigurationClassInfo.fontWeightAdjustment != NULL) {
+    gConfiguration.fontWeightAdjustment = code->env->GetIntField(
+        javaConfig, gConfigurationClassInfo.fontWeightAdjustment);
+  }
+
+  gConfiguration.hardKeyboardHidden = code->env->GetIntField(
+      javaConfig, gConfigurationClassInfo.hardKeyboardHidden);
+  gConfiguration.keyboard =
+      code->env->GetIntField(javaConfig, gConfigurationClassInfo.keyboard);
+  gConfiguration.keyboardHidden = code->env->GetIntField(
+      javaConfig, gConfigurationClassInfo.keyboardHidden);
+  gConfiguration.mcc =
+      code->env->GetIntField(javaConfig, gConfigurationClassInfo.mcc);
+  gConfiguration.mnc =
+      code->env->GetIntField(javaConfig, gConfigurationClassInfo.mnc);
+  gConfiguration.navigation =
+      code->env->GetIntField(javaConfig, gConfigurationClassInfo.navigation);
+  gConfiguration.navigationHidden = code->env->GetIntField(
+      javaConfig, gConfigurationClassInfo.navigationHidden);
+  gConfiguration.orientation =
+      code->env->GetIntField(javaConfig, gConfigurationClassInfo.orientation);
+  gConfiguration.screenHeightDp = code->env->GetIntField(
+      javaConfig, gConfigurationClassInfo.screenHeightDp);
+  gConfiguration.screenLayout =
+      code->env->GetIntField(javaConfig, gConfigurationClassInfo.screenLayout);
+  gConfiguration.screenWidthDp =
+      code->env->GetIntField(javaConfig, gConfigurationClassInfo.screenWidthDp);
+  gConfiguration.smallestScreenWidthDp = code->env->GetIntField(
+      javaConfig, gConfigurationClassInfo.smallestScreenWidthDp);
+  gConfiguration.touchscreen =
+      code->env->GetIntField(javaConfig, gConfigurationClassInfo.touchscreen);
+  gConfiguration.uiMode =
+      code->env->GetIntField(javaConfig, gConfigurationClassInfo.uiMode);
+
+  checkAndClearException(code->env, "Configuration.get");
+
+  jobject locales = code->env->CallObjectMethod(
+      javaConfig, gConfigurationClassInfo.getLocales);
+  checkAndClearException(code->env, "getLocales");
+
+  int localesCount =
+      code->env->CallIntMethod(locales, gLocaleListClassInfo.size);
+  checkAndClearException(code->env, "size");
+  gConfiguration.locales.resize(localesCount);
+
+  // extract the data for every locale
+  for (int i = 0; i < localesCount; ++i) {
+    Locale &locale = gConfiguration.locales[i];
+
+    // get locale object from the array
+    jobject jniLocale =
+        code->env->CallObjectMethod(locales, gLocaleListClassInfo.get, i);
+    checkAndClearException(code->env, "GetObjectArrayElement");
+
+    // get data strings for this locale
+    locale.language =
+        getStringField(code->env, jniLocale, gLocaleClassInfo.getLanguage);
+    locale.script =
+        getStringField(code->env, jniLocale, gLocaleClassInfo.getScript);
+    locale.country =
+        getStringField(code->env, jniLocale, gLocaleClassInfo.getCountry);
+    locale.variant =
+        getStringField(code->env, jniLocale, gLocaleClassInfo.getVariant);
+  }
+}
+
+static void onConfigurationChanged_native(JNIEnv *env, jobject javaGameActivity,
+                                          jlong handle, jobject javaNewConfig) {
+  LOG_TRACE("onConfigurationChanged_native");
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+    readConfigurationValues(code, javaNewConfig);
+
+    if (code->callbacks.onConfigurationChanged != NULL) {
+      code->callbacks.onConfigurationChanged(code);
+    }
+  }
+}
+
+static void onTrimMemory_native(JNIEnv *env, jobject javaGameActivity,
+                                jlong handle, jint level) {
+  LOG_TRACE("onTrimMemory_native");
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+    if (code->callbacks.onTrimMemory != NULL) {
+      code->callbacks.onTrimMemory(code, level);
+    }
+  }
+}
+
+static void onWindowFocusChanged_native(JNIEnv *env, jobject javaGameActivity,
+                                        jlong handle, jboolean focused) {
+  LOG_TRACE("onWindowFocusChanged_native");
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+    if (code->callbacks.onWindowFocusChanged != NULL) {
+      code->callbacks.onWindowFocusChanged(code, focused ? 1 : 0);
+    }
+  }
+}
+
+static void onSurfaceCreated_native(JNIEnv *env, jobject javaGameActivity,
+                                    jlong handle, jobject surface) {
+  ALOGV("onSurfaceCreated_native");
+  LOG_TRACE("onSurfaceCreated_native");
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+    code->setSurface(surface);
+
+    if (code->nativeWindow != NULL &&
+        code->callbacks.onNativeWindowCreated != NULL) {
+      code->callbacks.onNativeWindowCreated(code, code->nativeWindow);
+    }
+  }
+}
+
+static void onSurfaceChanged_native(JNIEnv *env, jobject javaGameActivity,
+                                    jlong handle, jobject surface, jint format,
+                                    jint width, jint height) {
+  LOG_TRACE("onSurfaceChanged_native");
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+    ANativeWindow *oldNativeWindow = code->nativeWindow;
+    // Fix for window being destroyed behind the scenes on older Android
+    // versions.
+    if (oldNativeWindow != NULL) {
+      ANativeWindow_acquire(oldNativeWindow);
+    }
+    code->setSurface(surface);
+    if (oldNativeWindow != code->nativeWindow) {
+      if (oldNativeWindow != NULL &&
+          code->callbacks.onNativeWindowDestroyed != NULL) {
+        code->callbacks.onNativeWindowDestroyed(code, oldNativeWindow);
+      }
+      if (code->nativeWindow != NULL) {
+        if (code->callbacks.onNativeWindowCreated != NULL) {
+          code->callbacks.onNativeWindowCreated(code, code->nativeWindow);
+        }
+
+        code->lastWindowWidth = ANativeWindow_getWidth(code->nativeWindow);
+        code->lastWindowHeight = ANativeWindow_getHeight(code->nativeWindow);
+      }
+    } else {
+      // Maybe it was resized?
+      int32_t newWidth = ANativeWindow_getWidth(code->nativeWindow);
+      int32_t newHeight = ANativeWindow_getHeight(code->nativeWindow);
+
+      if (newWidth != code->lastWindowWidth ||
+          newHeight != code->lastWindowHeight) {
+        code->lastWindowWidth = newWidth;
+        code->lastWindowHeight = newHeight;
+
+        if (code->callbacks.onNativeWindowResized != NULL) {
+          code->callbacks.onNativeWindowResized(code, code->nativeWindow,
+                                                newWidth, newHeight);
+        }
+      }
+    }
+    // Release the window we acquired earlier.
+    if (oldNativeWindow != NULL) {
+      ANativeWindow_release(oldNativeWindow);
+    }
+  }
+}
+
+static void onSurfaceRedrawNeeded_native(JNIEnv *env, jobject javaGameActivity,
+                                         jlong handle) {
+  LOG_TRACE("onSurfaceRedrawNeeded_native");
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+    if (code->nativeWindow != NULL &&
+        code->callbacks.onNativeWindowRedrawNeeded != NULL) {
+      code->callbacks.onNativeWindowRedrawNeeded(code, code->nativeWindow);
+    }
+  }
+}
+
+static void onSurfaceDestroyed_native(JNIEnv *env, jobject javaGameActivity,
+                                      jlong handle) {
+  LOG_TRACE("onSurfaceDestroyed_native");
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+    if (code->nativeWindow != NULL &&
+        code->callbacks.onNativeWindowDestroyed != NULL) {
+      code->callbacks.onNativeWindowDestroyed(code, code->nativeWindow);
+    }
+    code->setSurface(NULL);
+  }
+}
+
+extern "C" void GameActivity_setImeEditorInfo(
+    GameActivity *activity, GameTextInputType inputType,
+    GameTextInputActionType actionId, GameTextInputImeOptions imeOptions) {
+  NativeCode *code = static_cast<NativeCode *>(activity);
+  write_work(code->mainWorkWrite, CMD_SET_IME_EDITOR_INFO, inputType, actionId,
+             imeOptions);
+}
+
+extern "C" int GameActivity_getColorMode(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.colorMode;
+}
+
+extern "C" int GameActivity_getDensityDpi(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.densityDpi;
+}
+
+extern "C" float GameActivity_getFontScale(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.fontScale;
+}
+
+extern "C" int GameActivity_getFontWeightAdjustment(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.fontWeightAdjustment;
+}
+
+extern "C" int GameActivity_getHardKeyboardHidden(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.hardKeyboardHidden;
+}
+
+extern "C" int GameActivity_getKeyboard(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.keyboard;
+}
+
+extern "C" int GameActivity_getKeyboardHidden(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.keyboardHidden;
+}
+
+extern "C" int GameActivity_getLocalesCount(GameActivity *activity) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.locales.size();
+}
+
+extern "C" int GameActivity_getMcc(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.mcc;
+}
+
+extern "C" int GameActivity_getMnc(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.mnc;
+}
+
+extern "C" int GameActivity_getNavigation(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.navigation;
+}
+
+extern "C" int GameActivity_getNavigationHidden(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.navigationHidden;
+}
+
+extern "C" int GameActivity_getOrientation(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.orientation;
+}
+
+extern "C" int GameActivity_getScreenHeightDp(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.screenHeightDp;
+}
+
+extern "C" int GameActivity_getScreenLayout(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.screenLayout;
+}
+
+extern "C" int GameActivity_getScreenWidthDp(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.screenWidthDp;
+}
+
+extern "C" int GameActivity_getSmallestScreenWidthDp(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.smallestScreenWidthDp;
+}
+
+extern "C" int GameActivity_getTouchscreen(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.touchscreen;
+}
+
+extern "C" int GameActivity_getUIMode(GameActivity *) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+  return gConfiguration.uiMode;
+}
+
+static int copyStringIfFits(char *dst, size_t dst_size, const std::string &s) {
+  if (dst_size <= s.size()) {
+    return ENOBUFS;
+  }
+
+  strcpy(dst, s.c_str());
+  return 0;
+}
+
+extern "C" int GameActivity_getLocaleLanguage(char *dst, size_t dst_size,
+                                              GameActivity *activity,
+                                              size_t localeIdx) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+
+  if (localeIdx >= gConfiguration.locales.size()) {
+    return EINVAL;
+  }
+
+  return copyStringIfFits(dst, dst_size,
+                          gConfiguration.locales[localeIdx].language);
+}
+
+extern "C" int GameActivity_getLocaleScript(char *dst, size_t dst_size,
+                                            GameActivity *activity,
+                                            size_t localeIdx) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+
+  if (localeIdx >= gConfiguration.locales.size()) {
+    return EINVAL;
+  }
+
+  return copyStringIfFits(dst, dst_size,
+                          gConfiguration.locales[localeIdx].script);
+}
+
+extern "C" int GameActivity_getLocaleCountry(char *dst, size_t dst_size,
+                                             GameActivity *activity,
+                                             size_t localeIdx) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+
+  if (localeIdx >= gConfiguration.locales.size()) {
+    return EINVAL;
+  }
+
+  return copyStringIfFits(dst, dst_size,
+                          gConfiguration.locales[localeIdx].country);
+}
+
+extern "C" int GameActivity_getLocaleVariant(char *dst, size_t dst_size,
+                                             GameActivity *activity,
+                                             size_t localeIdx) {
+  const std::lock_guard<std::mutex> lock(gConfigMutex);
+
+  if (localeIdx >= gConfiguration.locales.size()) {
+    return EINVAL;
+  }
+
+  return copyStringIfFits(dst, dst_size,
+                          gConfiguration.locales[localeIdx].variant);
+}
+
+static bool onTouchEvent_native(JNIEnv *env, jobject javaGameActivity,
+                                jlong handle, jobject motionEvent,
+                                int pointerCount, int historySize, int deviceId,
+                                int source, int action, int64_t eventTime,
+                                int64_t downTime, int flags, int metaState,
+                                int actionButton, int buttonState,
+                                int classification, int edgeFlags,
+                                float precisionX, float precisionY) {
+  if (handle == 0) return false;
+  NativeCode *code = (NativeCode *)handle;
+  if (code->callbacks.onTouchEvent == nullptr) return false;
+
+  static GameActivityMotionEvent c_event;
+
+  c_event.deviceId = deviceId;
+  c_event.source = source;
+  c_event.action = action;
+
+  c_event.eventTime = eventTime;
+  c_event.downTime = downTime;
+
+  c_event.flags = flags;
+  c_event.metaState = metaState;
+
+  c_event.actionButton = actionButton;
+  c_event.buttonState = buttonState;
+  c_event.classification = classification;
+  c_event.edgeFlags = edgeFlags;
+
+  c_event.precisionX = precisionX;
+  c_event.precisionY = precisionY;
+
+  GameActivityMotionEvent_fromJava(env, motionEvent, &c_event, pointerCount,
+                                   historySize);
+  return code->callbacks.onTouchEvent(code, &c_event);
+}
+
+static bool onKeyUp_native(JNIEnv *env, jobject javaGameActivity, jlong handle,
+                           jobject keyEvent) {
+  if (handle == 0) return false;
+  NativeCode *code = (NativeCode *)handle;
+  if (code->callbacks.onKeyUp == nullptr) return false;
+
+  static GameActivityKeyEvent c_event;
+  GameActivityKeyEvent_fromJava(env, keyEvent, &c_event);
+  return code->callbacks.onKeyUp(code, &c_event);
+}
+
+static bool onKeyDown_native(JNIEnv *env, jobject javaGameActivity,
+                             jlong handle, jobject keyEvent) {
+  if (handle == 0) return false;
+  NativeCode *code = (NativeCode *)handle;
+  if (code->callbacks.onKeyDown == nullptr) return false;
+
+  static GameActivityKeyEvent c_event;
+  GameActivityKeyEvent_fromJava(env, keyEvent, &c_event);
+  return code->callbacks.onKeyDown(code, &c_event);
+}
+
+static void onTextInput_native(JNIEnv *env, jobject activity, jlong handle,
+                               jobject textInputEvent) {
+  if (handle == 0) return;
+  NativeCode *code = (NativeCode *)handle;
+  GameTextInput_processEvent(code->gameTextInput, textInputEvent);
+}
+
+static void onWindowInsetsChanged_native(JNIEnv *env, jobject activity,
+                                         jlong handle) {
+  if (handle == 0) return;
+  NativeCode *code = (NativeCode *)handle;
+  if (code->callbacks.onWindowInsetsChanged == nullptr) return;
+  for (int type = 0; type < GAMECOMMON_INSETS_TYPE_COUNT; ++type) {
+    jobject jinsets;
+    // Note that waterfall insets are handled differently on the Java side.
+    if (type == GAMECOMMON_INSETS_TYPE_WATERFALL) {
+      jinsets = env->CallObjectMethod(
+          code->javaGameActivity, gGameActivityClassInfo.getWaterfallInsets);
+    } else {
+      jint jtype = env->CallStaticIntMethod(
+          gWindowInsetsCompatTypeClassInfo.clazz,
+          gWindowInsetsCompatTypeClassInfo.methods[type]);
+      jinsets =
+          env->CallObjectMethod(code->javaGameActivity,
+                                gGameActivityClassInfo.getWindowInsets, jtype);
+    }
+    ARect &insets = code->insetsState[type];
+    if (jinsets == nullptr) {
+      insets.left = 0;
+      insets.right = 0;
+      insets.top = 0;
+      insets.bottom = 0;
+    } else {
+      insets.left = env->GetIntField(jinsets, gInsetsClassInfo.left);
+      insets.right = env->GetIntField(jinsets, gInsetsClassInfo.right);
+      insets.top = env->GetIntField(jinsets, gInsetsClassInfo.top);
+      insets.bottom = env->GetIntField(jinsets, gInsetsClassInfo.bottom);
+    }
+  }
+  GameTextInput_processImeInsets(
+      code->gameTextInput, &code->insetsState[GAMECOMMON_INSETS_TYPE_IME]);
+  code->callbacks.onWindowInsetsChanged(code);
+}
+
+static void setInputConnection_native(JNIEnv *env, jobject activity,
+                                      jlong handle, jobject inputConnection) {
+  NativeCode *code = (NativeCode *)handle;
+  GameTextInput_setInputConnection(code->gameTextInput, inputConnection);
+}
+
+static void onContentRectChangedNative_native(JNIEnv *env, jobject activity,
+                                              jlong handle, jint x, jint y,
+                                              jint w, jint h) {
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+
+    if (code->callbacks.onContentRectChanged != nullptr) {
+      ARect rect;
+      rect.left = x;
+      rect.top = y;
+      rect.right = x + w;
+      rect.bottom = y + h;
+      code->callbacks.onContentRectChanged(code, &rect);
+    }
+  }
+}
+
+static void onSoftwareKeyboardVisibilityChangedNative_native(JNIEnv *env,
+                                                             jobject activity,
+                                                             jlong handle,
+                                                             bool visible) {
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+    code->softwareKeyboardVisible = visible;
+
+    if (code->callbacks.onSoftwareKeyboardVisibilityChanged != nullptr) {
+      code->callbacks.onSoftwareKeyboardVisibilityChanged(code, visible);
+    }
+  }
+}
+
+static void onEditorActionNative_native(JNIEnv *env, jobject activity,
+                                        jlong handle, int action) {
+  if (handle != 0) {
+    NativeCode *code = (NativeCode *)handle;
+
+    if (code->callbacks.onEditorAction != nullptr) {
+      code->callbacks.onEditorAction(code, action);
+    }
+  }
+}
+
+static const JNINativeMethod g_methods[] = {
+    {"initializeNativeCode",
+     "(Ljava/lang/String;Ljava/lang/String;"
+     "Ljava/lang/String;Landroid/content/res/AssetManager;"
+     "[BLandroid/content/res/Configuration;)J",
+     (void *)initializeNativeCode_native},
+    {"getDlError", "()Ljava/lang/String;", (void *)getDlError_native},
+    {"terminateNativeCode", "(J)V", (void *)terminateNativeCode_native},
+    {"onStartNative", "(J)V", (void *)onStart_native},
+    {"onResumeNative", "(J)V", (void *)onResume_native},
+    {"onSaveInstanceStateNative", "(J)[B", (void *)onSaveInstanceState_native},
+    {"onPauseNative", "(J)V", (void *)onPause_native},
+    {"onStopNative", "(J)V", (void *)onStop_native},
+    {"onConfigurationChangedNative", "(JLandroid/content/res/Configuration;)V",
+     (void *)onConfigurationChanged_native},
+    {"onTrimMemoryNative", "(JI)V", (void *)onTrimMemory_native},
+    {"onWindowFocusChangedNative", "(JZ)V",
+     (void *)onWindowFocusChanged_native},
+    {"onSurfaceCreatedNative", "(JLandroid/view/Surface;)V",
+     (void *)onSurfaceCreated_native},
+    {"onSurfaceChangedNative", "(JLandroid/view/Surface;III)V",
+     (void *)onSurfaceChanged_native},
+    {"onSurfaceRedrawNeededNative", "(JLandroid/view/Surface;)V",
+     (void *)onSurfaceRedrawNeeded_native},
+    {"onSurfaceDestroyedNative", "(J)V", (void *)onSurfaceDestroyed_native},
+    {"onTouchEventNative", "(JLandroid/view/MotionEvent;IIIIIJJIIIIIIFF)Z",
+     (void *)onTouchEvent_native},
+    {"onKeyDownNative", "(JLandroid/view/KeyEvent;)Z",
+     (void *)onKeyDown_native},
+    {"onKeyUpNative", "(JLandroid/view/KeyEvent;)Z", (void *)onKeyUp_native},
+    {"onTextInputEventNative",
+     "(JLcom/google/androidgamesdk/gametextinput/State;)V",
+     (void *)onTextInput_native},
+    {"onWindowInsetsChangedNative", "(J)V",
+     (void *)onWindowInsetsChanged_native},
+    {"setInputConnectionNative",
+     "(JLcom/google/androidgamesdk/gametextinput/InputConnection;)V",
+     (void *)setInputConnection_native},
+    {"onContentRectChangedNative", "(JIIII)V",
+     (void *)onContentRectChangedNative_native},
+    {"onSoftwareKeyboardVisibilityChangedNative", "(JZ)V",
+     (void *)onSoftwareKeyboardVisibilityChangedNative_native},
+    {"onEditorActionNative", "(JI)V", (void *)onEditorActionNative_native},
+};
+
+static const char *const kGameActivityPathName =
+    "com/google/androidgamesdk/GameActivity";
+
+static const char *const kInsetsPathName = "androidx/core/graphics/Insets";
+static const char *const kConfigurationPathName =
+    "android/content/res/Configuration";
+static const char *const kWindowInsetsCompatTypePathName =
+    "androidx/core/view/WindowInsetsCompat$Type";
+static const char *const kLocaleListPathName = "android/os/LocaleList";
+static const char *const kLocalePathName = "java/util/Locale";
+
+#define FIND_CLASS(var, className) \
+  var = env->FindClass(className); \
+  LOG_FATAL_IF(!var, "Unable to find class %s", className);
+
+#define GET_METHOD_ID(var, clazz, methodName, fieldDescriptor) \
+  var = env->GetMethodID(clazz, methodName, fieldDescriptor);  \
+  LOG_FATAL_IF(!var, "Unable to find method %s", methodName);
+
+#define GET_STATIC_METHOD_ID(var, clazz, methodName, fieldDescriptor) \
+  var = env->GetStaticMethodID(clazz, methodName, fieldDescriptor);   \
+  LOG_FATAL_IF(!var, "Unable to find static method %s", methodName);
+
+#define GET_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \
+  var = env->GetFieldID(clazz, fieldName, fieldDescriptor);  \
+  LOG_FATAL_IF(!var, "Unable to find field %s", fieldName);
+
+static int jniRegisterNativeMethods(JNIEnv *env, const char *className,
+                                    const JNINativeMethod *methods,
+                                    int numMethods) {
+  ALOGV("Registering %s's %d native methods...", className, numMethods);
+  jclass clazz = env->FindClass(className);
+  LOG_FATAL_IF(clazz == nullptr,
+               "Native registration unable to find class '%s'; aborting...",
+               className);
+  int result = env->RegisterNatives(clazz, methods, numMethods);
+  env->DeleteLocalRef(clazz);
+  if (result == 0) {
+    return 0;
+  }
+
+  // Failure to register natives is fatal. Try to report the corresponding
+  // exception, otherwise abort with generic failure message.
+  jthrowable thrown = env->ExceptionOccurred();
+  if (thrown != NULL) {
+    env->ExceptionDescribe();
+    env->DeleteLocalRef(thrown);
+  }
+  LOG_FATAL("RegisterNatives failed for '%s'; aborting...", className);
+}
+
+extern "C" int GameActivity_register(JNIEnv *env) {
+  ALOGD("GameActivity_register");
+  jclass activity_class;
+  FIND_CLASS(activity_class, kGameActivityPathName);
+  GET_METHOD_ID(gGameActivityClassInfo.finish, activity_class, "finish", "()V");
+  GET_METHOD_ID(gGameActivityClassInfo.setWindowFlags, activity_class,
+                "setWindowFlags", "(II)V");
+  GET_METHOD_ID(gGameActivityClassInfo.getWindowInsets, activity_class,
+                "getWindowInsets", "(I)Landroidx/core/graphics/Insets;");
+  GET_METHOD_ID(gGameActivityClassInfo.getWaterfallInsets, activity_class,
+                "getWaterfallInsets", "()Landroidx/core/graphics/Insets;");
+  GET_METHOD_ID(gGameActivityClassInfo.setImeEditorInfoFields, activity_class,
+                "setImeEditorInfoFields", "(III)V");
+
+  jclass insets_class;
+  FIND_CLASS(insets_class, kInsetsPathName);
+  GET_FIELD_ID(gInsetsClassInfo.left, insets_class, "left", "I");
+  GET_FIELD_ID(gInsetsClassInfo.right, insets_class, "right", "I");
+  GET_FIELD_ID(gInsetsClassInfo.top, insets_class, "top", "I");
+  GET_FIELD_ID(gInsetsClassInfo.bottom, insets_class, "bottom", "I");
+
+  jclass configuration_class;
+  FIND_CLASS(configuration_class, kConfigurationPathName);
+
+  if (android_get_device_api_level() >= 26) {
+    GET_FIELD_ID(gConfigurationClassInfo.colorMode, configuration_class,
+                 "colorMode", "I");
+  }
+
+  GET_FIELD_ID(gConfigurationClassInfo.densityDpi, configuration_class,
+               "densityDpi", "I");
+  GET_FIELD_ID(gConfigurationClassInfo.fontScale, configuration_class,
+               "fontScale", "F");
+
+  if (android_get_device_api_level() >= 31) {
+    GET_FIELD_ID(gConfigurationClassInfo.fontWeightAdjustment,
+                 configuration_class, "fontWeightAdjustment", "I");
+  }
+
+  GET_FIELD_ID(gConfigurationClassInfo.hardKeyboardHidden, configuration_class,
+               "hardKeyboardHidden", "I");
+  GET_FIELD_ID(gConfigurationClassInfo.keyboard, configuration_class,
+               "keyboard", "I");
+  GET_FIELD_ID(gConfigurationClassInfo.keyboardHidden, configuration_class,
+               "keyboardHidden", "I");
+  GET_FIELD_ID(gConfigurationClassInfo.mcc, configuration_class, "mcc", "I");
+  GET_FIELD_ID(gConfigurationClassInfo.mnc, configuration_class, "mnc", "I");
+  GET_FIELD_ID(gConfigurationClassInfo.navigation, configuration_class,
+               "navigation", "I");
+  GET_FIELD_ID(gConfigurationClassInfo.navigationHidden, configuration_class,
+               "navigationHidden", "I");
+  GET_FIELD_ID(gConfigurationClassInfo.orientation, configuration_class,
+               "orientation", "I");
+  GET_FIELD_ID(gConfigurationClassInfo.screenHeightDp, configuration_class,
+               "screenHeightDp", "I");
+  GET_FIELD_ID(gConfigurationClassInfo.screenLayout, configuration_class,
+               "screenLayout", "I");
+  GET_FIELD_ID(gConfigurationClassInfo.screenWidthDp, configuration_class,
+               "screenWidthDp", "I");
+  GET_FIELD_ID(gConfigurationClassInfo.smallestScreenWidthDp,
+               configuration_class, "smallestScreenWidthDp", "I");
+  GET_FIELD_ID(gConfigurationClassInfo.touchscreen, configuration_class,
+               "touchscreen", "I");
+  GET_FIELD_ID(gConfigurationClassInfo.uiMode, configuration_class, "uiMode",
+               "I");
+
+  GET_METHOD_ID(gConfigurationClassInfo.getLocales, configuration_class,
+                "getLocales", "()Landroid/os/LocaleList;");
+
+  jclass localeListClass;
+  FIND_CLASS(localeListClass, kLocaleListPathName);
+  GET_METHOD_ID(gLocaleListClassInfo.size, localeListClass, "size", "()I");
+  GET_METHOD_ID(gLocaleListClassInfo.get, localeListClass, "get",
+                "(I)Ljava/util/Locale;");
+
+  jclass localeClass;
+  FIND_CLASS(localeClass, kLocalePathName);
+  GET_METHOD_ID(gLocaleClassInfo.getLanguage, localeClass, "getLanguage",
+                "()Ljava/lang/String;");
+  GET_METHOD_ID(gLocaleClassInfo.getScript, localeClass, "getScript",
+                "()Ljava/lang/String;");
+  GET_METHOD_ID(gLocaleClassInfo.getCountry, localeClass, "getCountry",
+                "()Ljava/lang/String;");
+  GET_METHOD_ID(gLocaleClassInfo.getVariant, localeClass, "getVariant",
+                "()Ljava/lang/String;");
+
+  jclass windowInsetsCompatType_class;
+  FIND_CLASS(windowInsetsCompatType_class, kWindowInsetsCompatTypePathName);
+  gWindowInsetsCompatTypeClassInfo.clazz =
+      (jclass)env->NewGlobalRef(windowInsetsCompatType_class);
+  // These names must match, in order, the GameCommonInsetsType enum fields
+  // Note that waterfall is handled differently by the insets API, so we
+  // exclude it here.
+  const char *methodNames[GAMECOMMON_INSETS_TYPE_WATERFALL] = {
+      "captionBar",
+      "displayCutout",
+      "ime",
+      "mandatorySystemGestures",
+      "navigationBars",
+      "statusBars",
+      "systemBars",
+      "systemGestures",
+      "tappableElement"};
+  for (int i = 0; i < GAMECOMMON_INSETS_TYPE_WATERFALL; ++i) {
+    GET_STATIC_METHOD_ID(gWindowInsetsCompatTypeClassInfo.methods[i],
+                         windowInsetsCompatType_class, methodNames[i], "()I");
+  }
+
+  GameActivityEventsInit(env);
+
+  return jniRegisterNativeMethods(env, kGameActivityPathName, g_methods,
+                                  NELEM(g_methods));
+}
+
+// XXX: This symbol is renamed with a _C suffix and then re-exported from
+// Rust because Rust/Cargo don't give us a way to directly export symbols
+// from C/C++ code: https://github.com/rust-lang/rfcs/issues/2771
+//
+extern "C" JNIEXPORT jlong JNICALL
+Java_com_google_androidgamesdk_GameActivity_initializeNativeCode_C(
+    JNIEnv *env, jobject javaGameActivity, jstring internalDataDir,
+    jstring obbDir, jstring externalDataDir, jobject jAssetMgr,
+    jbyteArray savedState, jobject javaConfig) {
+  GameActivity_register(env);
+  jlong nativeCode = initializeNativeCode_native(
+      env, javaGameActivity, internalDataDir, obbDir, externalDataDir,
+      jAssetMgr, savedState, javaConfig);
+  return nativeCode;
+}
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/GameActivityEvents.cpp b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/GameActivityEvents.cpp
new file mode 100644
index 0000000..5e238c6
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/GameActivityEvents.cpp
@@ -0,0 +1,335 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <game-activity/GameActivityEvents.h>
+#include <game-activity/GameActivityLog.h>
+#include <sys/system_properties.h>
+
+#include <string>
+
+#include "GameActivityEvents_internal.h"
+#include "system_utils.h"
+
+static bool enabledAxes[GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT] = {
+    /* AMOTION_EVENT_AXIS_X */ true,
+    /* AMOTION_EVENT_AXIS_Y */ true,
+    // Disable all other axes by default (they can be enabled using
+    // `GameActivityPointerAxes_enableAxis`).
+    false};
+
+extern "C" void GameActivityPointerAxes_enableAxis(int32_t axis) {
+  if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
+    return;
+  }
+
+  enabledAxes[axis] = true;
+}
+
+float GameActivityPointerAxes_getAxisValue(
+    const GameActivityPointerAxes *pointerInfo, int32_t axis) {
+  if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
+    return 0;
+  }
+
+  if (!enabledAxes[axis]) {
+    ALOGW("Axis %d must be enabled before it can be accessed.", axis);
+    return 0;
+  }
+
+  return pointerInfo->axisValues[axis];
+}
+
+extern "C" void GameActivityPointerAxes_disableAxis(int32_t axis) {
+  if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
+    return;
+  }
+
+  enabledAxes[axis] = false;
+}
+
+float GameActivityMotionEvent_getHistoricalAxisValue(
+    const GameActivityMotionEvent *event, int axis, int pointerIndex,
+    int historyPos) {
+  if (axis < 0 || axis >= GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT) {
+    ALOGE("Invalid axis %d", axis);
+    return -1;
+  }
+  if (pointerIndex < 0 || pointerIndex >= event->pointerCount) {
+    ALOGE("Invalid pointer index %d", pointerIndex);
+    return -1;
+  }
+  if (historyPos < 0 || historyPos >= event->historySize) {
+    ALOGE("Invalid history index %d", historyPos);
+    return -1;
+  }
+  if (!enabledAxes[axis]) {
+    ALOGW("Axis %d must be enabled before it can be accessed.", axis);
+    return 0;
+  }
+
+  int pointerOffset = pointerIndex * GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+  int historyValuesOffset =
+      historyPos * event->pointerCount * GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+  return event
+      ->historicalAxisValues[historyValuesOffset + pointerOffset + axis];
+}
+
+static struct {
+  jmethodID getDeviceId;
+  jmethodID getSource;
+  jmethodID getAction;
+
+  jmethodID getEventTime;
+  jmethodID getDownTime;
+
+  jmethodID getFlags;
+  jmethodID getMetaState;
+
+  jmethodID getActionButton;
+  jmethodID getButtonState;
+  jmethodID getClassification;
+  jmethodID getEdgeFlags;
+
+  jmethodID getHistorySize;
+  jmethodID getHistoricalEventTime;
+
+  jmethodID getPointerCount;
+  jmethodID getPointerId;
+
+  jmethodID getToolType;
+
+  jmethodID getRawX;
+  jmethodID getRawY;
+  jmethodID getXPrecision;
+  jmethodID getYPrecision;
+  jmethodID getAxisValue;
+
+  jmethodID getHistoricalAxisValue;
+} gMotionEventClassInfo;
+
+extern "C" void GameActivityMotionEvent_destroy(
+    GameActivityMotionEvent *c_event) {
+  delete c_event->historicalAxisValues;
+  delete c_event->historicalEventTimesMillis;
+  delete c_event->historicalEventTimesNanos;
+}
+
+static void initMotionEvents(JNIEnv *env) {
+  int sdkVersion = gamesdk::GetSystemPropAsInt("ro.build.version.sdk");
+  gMotionEventClassInfo = {0};
+  jclass motionEventClass = env->FindClass("android/view/MotionEvent");
+  gMotionEventClassInfo.getDeviceId =
+      env->GetMethodID(motionEventClass, "getDeviceId", "()I");
+  gMotionEventClassInfo.getSource =
+      env->GetMethodID(motionEventClass, "getSource", "()I");
+  gMotionEventClassInfo.getAction =
+      env->GetMethodID(motionEventClass, "getAction", "()I");
+  gMotionEventClassInfo.getEventTime =
+      env->GetMethodID(motionEventClass, "getEventTime", "()J");
+  gMotionEventClassInfo.getDownTime =
+      env->GetMethodID(motionEventClass, "getDownTime", "()J");
+  gMotionEventClassInfo.getFlags =
+      env->GetMethodID(motionEventClass, "getFlags", "()I");
+  gMotionEventClassInfo.getMetaState =
+      env->GetMethodID(motionEventClass, "getMetaState", "()I");
+  if (sdkVersion >= 23) {
+    gMotionEventClassInfo.getActionButton =
+        env->GetMethodID(motionEventClass, "getActionButton", "()I");
+  }
+  if (sdkVersion >= 14) {
+    gMotionEventClassInfo.getButtonState =
+        env->GetMethodID(motionEventClass, "getButtonState", "()I");
+  }
+  if (sdkVersion >= 29) {
+    gMotionEventClassInfo.getClassification =
+        env->GetMethodID(motionEventClass, "getClassification", "()I");
+  }
+  gMotionEventClassInfo.getEdgeFlags =
+      env->GetMethodID(motionEventClass, "getEdgeFlags", "()I");
+
+  gMotionEventClassInfo.getHistorySize =
+      env->GetMethodID(motionEventClass, "getHistorySize", "()I");
+  gMotionEventClassInfo.getHistoricalEventTime =
+      env->GetMethodID(motionEventClass, "getHistoricalEventTime", "(I)J");
+
+  gMotionEventClassInfo.getPointerCount =
+      env->GetMethodID(motionEventClass, "getPointerCount", "()I");
+  gMotionEventClassInfo.getPointerId =
+      env->GetMethodID(motionEventClass, "getPointerId", "(I)I");
+  gMotionEventClassInfo.getToolType =
+      env->GetMethodID(motionEventClass, "getToolType", "(I)I");
+  if (sdkVersion >= 29) {
+    gMotionEventClassInfo.getRawX =
+        env->GetMethodID(motionEventClass, "getRawX", "(I)F");
+    gMotionEventClassInfo.getRawY =
+        env->GetMethodID(motionEventClass, "getRawY", "(I)F");
+  }
+  gMotionEventClassInfo.getXPrecision =
+      env->GetMethodID(motionEventClass, "getXPrecision", "()F");
+  gMotionEventClassInfo.getYPrecision =
+      env->GetMethodID(motionEventClass, "getYPrecision", "()F");
+  gMotionEventClassInfo.getAxisValue =
+      env->GetMethodID(motionEventClass, "getAxisValue", "(II)F");
+
+  gMotionEventClassInfo.getHistoricalAxisValue =
+      env->GetMethodID(motionEventClass, "getHistoricalAxisValue", "(III)F");
+}
+
+extern "C" void GameActivityMotionEvent_fromJava(
+    JNIEnv *env, jobject motionEvent, GameActivityMotionEvent *out_event,
+    int pointerCount, int historySize) {
+  pointerCount =
+      std::min(pointerCount, GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT);
+  out_event->pointerCount = pointerCount;
+  for (int i = 0; i < pointerCount; ++i) {
+    out_event->pointers[i] = {
+        /*id=*/env->CallIntMethod(motionEvent,
+                                  gMotionEventClassInfo.getPointerId, i),
+        /*toolType=*/
+        env->CallIntMethod(motionEvent, gMotionEventClassInfo.getToolType, i),
+        /*axisValues=*/{0},
+        /*rawX=*/gMotionEventClassInfo.getRawX
+            ? env->CallFloatMethod(motionEvent, gMotionEventClassInfo.getRawX,
+                                   i)
+            : 0,
+        /*rawY=*/gMotionEventClassInfo.getRawY
+            ? env->CallFloatMethod(motionEvent, gMotionEventClassInfo.getRawY,
+                                   i)
+            : 0,
+    };
+
+    for (int axisIndex = 0; axisIndex < GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+         ++axisIndex) {
+      if (enabledAxes[axisIndex]) {
+        out_event->pointers[i].axisValues[axisIndex] = env->CallFloatMethod(
+            motionEvent, gMotionEventClassInfo.getAxisValue, axisIndex, i);
+      }
+    }
+  }
+
+  out_event->historySize = historySize;
+  out_event->historicalAxisValues =
+      new float[historySize * pointerCount *
+                GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT];
+  out_event->historicalEventTimesMillis = new int64_t[historySize];
+  out_event->historicalEventTimesNanos = new int64_t[historySize];
+
+  for (int historyIndex = 0; historyIndex < historySize; historyIndex++) {
+    out_event->historicalEventTimesMillis[historyIndex] = env->CallLongMethod(
+        motionEvent, gMotionEventClassInfo.getHistoricalEventTime,
+        historyIndex);
+    out_event->historicalEventTimesNanos[historyIndex] =
+        out_event->historicalEventTimesMillis[historyIndex] * 1000000;
+    for (int i = 0; i < pointerCount; ++i) {
+      int pointerOffset = i * GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+      int historyAxisOffset =
+          historyIndex * pointerCount * GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+      float *axisValues =
+          &out_event->historicalAxisValues[historyAxisOffset + pointerOffset];
+      for (int axisIndex = 0; axisIndex < GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT;
+           ++axisIndex) {
+        if (enabledAxes[axisIndex]) {
+          axisValues[axisIndex] = env->CallFloatMethod(
+              motionEvent, gMotionEventClassInfo.getHistoricalAxisValue,
+              axisIndex, i, historyIndex);
+        }
+      }
+    }
+  }
+}
+
+static struct {
+  jmethodID getDeviceId;
+  jmethodID getSource;
+  jmethodID getAction;
+
+  jmethodID getEventTime;
+  jmethodID getDownTime;
+
+  jmethodID getFlags;
+  jmethodID getMetaState;
+
+  jmethodID getModifiers;
+  jmethodID getRepeatCount;
+  jmethodID getKeyCode;
+  jmethodID getScanCode;
+  // jmethodID getUnicodeChar;
+} gKeyEventClassInfo;
+
+static void initKeyEvents(JNIEnv *env) {
+  int sdkVersion = gamesdk::GetSystemPropAsInt("ro.build.version.sdk");
+  gKeyEventClassInfo = {0};
+  jclass keyEventClass = env->FindClass("android/view/KeyEvent");
+  gKeyEventClassInfo.getDeviceId =
+      env->GetMethodID(keyEventClass, "getDeviceId", "()I");
+  gKeyEventClassInfo.getSource =
+      env->GetMethodID(keyEventClass, "getSource", "()I");
+  gKeyEventClassInfo.getAction =
+      env->GetMethodID(keyEventClass, "getAction", "()I");
+  gKeyEventClassInfo.getEventTime =
+      env->GetMethodID(keyEventClass, "getEventTime", "()J");
+  gKeyEventClassInfo.getDownTime =
+      env->GetMethodID(keyEventClass, "getDownTime", "()J");
+  gKeyEventClassInfo.getFlags =
+      env->GetMethodID(keyEventClass, "getFlags", "()I");
+  gKeyEventClassInfo.getMetaState =
+      env->GetMethodID(keyEventClass, "getMetaState", "()I");
+  if (sdkVersion >= 13) {
+    gKeyEventClassInfo.getModifiers =
+        env->GetMethodID(keyEventClass, "getModifiers", "()I");
+  }
+  gKeyEventClassInfo.getRepeatCount =
+      env->GetMethodID(keyEventClass, "getRepeatCount", "()I");
+  gKeyEventClassInfo.getKeyCode =
+      env->GetMethodID(keyEventClass, "getKeyCode", "()I");
+  gKeyEventClassInfo.getScanCode =
+      env->GetMethodID(keyEventClass, "getScanCode", "()I");
+  //gKeyEventClassInfo.getUnicodeChar =
+      //env->GetMethodID(keyEventClass, "getUnicodeChar", "()I");
+}
+
+extern "C" void GameActivityKeyEvent_fromJava(JNIEnv *env, jobject keyEvent,
+                                              GameActivityKeyEvent *out_event) {
+  *out_event = {
+      /*deviceId=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getDeviceId),
+      /*source=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getSource),
+      /*action=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getAction),
+      // TODO: introduce a millisecondsToNanoseconds helper:
+      /*eventTime=*/
+      env->CallLongMethod(keyEvent, gKeyEventClassInfo.getEventTime) * 1000000,
+      /*downTime=*/
+      env->CallLongMethod(keyEvent, gKeyEventClassInfo.getDownTime) * 1000000,
+      /*flags=*/env->CallIntMethod(keyEvent, gKeyEventClassInfo.getFlags),
+      /*metaState=*/
+      env->CallIntMethod(keyEvent, gKeyEventClassInfo.getMetaState),
+      /*modifiers=*/gKeyEventClassInfo.getModifiers
+          ? env->CallIntMethod(keyEvent, gKeyEventClassInfo.getModifiers)
+          : 0,
+      /*repeatCount=*/
+      env->CallIntMethod(keyEvent, gKeyEventClassInfo.getRepeatCount),
+      /*keyCode=*/
+      env->CallIntMethod(keyEvent, gKeyEventClassInfo.getKeyCode),
+      /*scanCode=*/
+      env->CallIntMethod(keyEvent, gKeyEventClassInfo.getScanCode)
+      /*unicodeChar=*/
+      // env->CallIntMethod(keyEvent, gKeyEventClassInfo.getUnicodeChar)
+  };
+}
+
+extern "C" void GameActivityEventsInit(JNIEnv *env) {
+  initMotionEvents(env);
+  initKeyEvents(env);
+}
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/GameActivityEvents_internal.h b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/GameActivityEvents_internal.h
new file mode 100644
index 0000000..202be8b
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/GameActivityEvents_internal.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @addtogroup GameActivity Game Activity Events Internal
+ * These functions are internal details of Game Activity Events.
+ * Please do not rely on anything in this file as this can be changed
+ * without notice.
+ * @{
+ */
+
+/**
+ * @file GameActivityEvents_internal.h
+ */
+#ifndef ANDROID_GAME_SDK_GAME_ACTIVITY_EVENTS_INTERNAL_H
+#define ANDROID_GAME_SDK_GAME_ACTIVITY_EVENTS_INTERNAL_H
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \brief Performs necessary initialization steps for GameActivityEvents.
+ *
+ * User must call this function before calling any other functions of this unit.
+ * If you use GameActivity it will call this function for you.
+ */
+void GameActivityEventsInit(JNIEnv* env);
+
+/**
+ * \brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`.
+ *
+ * This is done automatically by the GameActivity: see `onTouchEvent` to set
+ * a callback to consume the received events.
+ * This function can be used if you re-implement events handling in your own
+ * activity.
+ * Ownership of out_event is maintained by the caller.
+ * Note that we pass as much information from Java Activity as possible
+ * to avoid extra JNI calls.
+ */
+void GameActivityMotionEvent_fromJava(JNIEnv* env, jobject motionEvent,
+                                      GameActivityMotionEvent* out_event,
+                                      int pointerCount, int historySize);
+
+/**
+ * \brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.
+ *
+ * This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`
+ * to set a callback to consume the received events.
+ * This function can be used if you re-implement events handling in your own
+ * activity.
+ * Ownership of out_event is maintained by the caller.
+ */
+void GameActivityKeyEvent_fromJava(JNIEnv* env, jobject motionEvent,
+                                   GameActivityKeyEvent* out_event);
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @} */
+
+#endif  // ANDROID_GAME_SDK_GAME_ACTIVITY_EVENTS_INTERNAL_H
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/native_app_glue/android_native_app_glue.c b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/native_app_glue/android_native_app_glue.c
new file mode 100644
index 0000000..48069d9
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/native_app_glue/android_native_app_glue.c
@@ -0,0 +1,765 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "game-activity/native_app_glue/android_native_app_glue.h"
+
+#include <android/log.h>
+#include <assert.h>
+#include <errno.h>
+#include <jni.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+#define NATIVE_APP_GLUE_MOTION_EVENTS_DEFAULT_BUF_SIZE 16
+#define NATIVE_APP_GLUE_KEY_EVENTS_DEFAULT_BUF_SIZE 4
+
+#define LOGI(...) \
+  ((void)__android_log_print(ANDROID_LOG_INFO, "threaded_app", __VA_ARGS__))
+#define LOGE(...) \
+  ((void)__android_log_print(ANDROID_LOG_ERROR, "threaded_app", __VA_ARGS__))
+#define LOGW(...) \
+  ((void)__android_log_print(ANDROID_LOG_WARN, "threaded_app", __VA_ARGS__))
+#define LOGW_ONCE(...)                                     \
+  do {                                                     \
+    static bool alogw_once##__FILE__##__LINE__##__ = true; \
+    if (alogw_once##__FILE__##__LINE__##__) {              \
+      alogw_once##__FILE__##__LINE__##__ = false;          \
+      LOGW(__VA_ARGS__);                                   \
+    }                                                      \
+  } while (0)
+
+/* For debug builds, always enable the debug traces in this library */
+#ifndef NDEBUG
+#define LOGV(...) \
+  ((void)__android_log_print(ANDROID_LOG_VERBOSE, "threaded_app", __VA_ARGS__))
+#else
+#define LOGV(...) ((void)0)
+#endif
+
+static void free_saved_state(struct android_app* android_app) {
+  pthread_mutex_lock(&android_app->mutex);
+  if (android_app->savedState != NULL) {
+    free(android_app->savedState);
+    android_app->savedState = NULL;
+    android_app->savedStateSize = 0;
+  }
+  pthread_mutex_unlock(&android_app->mutex);
+}
+
+int8_t android_app_read_cmd(struct android_app* android_app) {
+  int8_t cmd;
+  if (read(android_app->msgread, &cmd, sizeof(cmd)) != sizeof(cmd)) {
+    LOGE("No data on command pipe!");
+    return -1;
+  }
+  if (cmd == APP_CMD_SAVE_STATE) free_saved_state(android_app);
+  return cmd;
+}
+
+static void print_cur_config(struct android_app* android_app) {
+  char lang[2], country[2];
+  AConfiguration_getLanguage(android_app->config, lang);
+  AConfiguration_getCountry(android_app->config, country);
+
+  LOGV(
+      "Config: mcc=%d mnc=%d lang=%c%c cnt=%c%c orien=%d touch=%d dens=%d "
+      "keys=%d nav=%d keysHid=%d navHid=%d sdk=%d size=%d long=%d "
+      "modetype=%d modenight=%d",
+      AConfiguration_getMcc(android_app->config),
+      AConfiguration_getMnc(android_app->config), lang[0], lang[1], country[0],
+      country[1], AConfiguration_getOrientation(android_app->config),
+      AConfiguration_getTouchscreen(android_app->config),
+      AConfiguration_getDensity(android_app->config),
+      AConfiguration_getKeyboard(android_app->config),
+      AConfiguration_getNavigation(android_app->config),
+      AConfiguration_getKeysHidden(android_app->config),
+      AConfiguration_getNavHidden(android_app->config),
+      AConfiguration_getSdkVersion(android_app->config),
+      AConfiguration_getScreenSize(android_app->config),
+      AConfiguration_getScreenLong(android_app->config),
+      AConfiguration_getUiModeType(android_app->config),
+      AConfiguration_getUiModeNight(android_app->config));
+}
+
+void android_app_pre_exec_cmd(struct android_app* android_app, int8_t cmd) {
+  switch (cmd) {
+    case UNUSED_APP_CMD_INPUT_CHANGED:
+      LOGV("UNUSED_APP_CMD_INPUT_CHANGED");
+      // Do nothing. This can be used in the future to handle AInputQueue
+      // natively, like done in NativeActivity.
+      break;
+
+    case APP_CMD_INIT_WINDOW:
+      LOGV("APP_CMD_INIT_WINDOW");
+      pthread_mutex_lock(&android_app->mutex);
+      android_app->window = android_app->pendingWindow;
+      pthread_cond_broadcast(&android_app->cond);
+      pthread_mutex_unlock(&android_app->mutex);
+      break;
+
+    case APP_CMD_TERM_WINDOW:
+      LOGV("APP_CMD_TERM_WINDOW");
+      pthread_cond_broadcast(&android_app->cond);
+      break;
+
+    case APP_CMD_RESUME:
+    case APP_CMD_START:
+    case APP_CMD_PAUSE:
+    case APP_CMD_STOP:
+      LOGV("activityState=%d", cmd);
+      pthread_mutex_lock(&android_app->mutex);
+      android_app->activityState = cmd;
+      pthread_cond_broadcast(&android_app->cond);
+      pthread_mutex_unlock(&android_app->mutex);
+      break;
+
+    case APP_CMD_CONFIG_CHANGED:
+      LOGV("APP_CMD_CONFIG_CHANGED");
+      AConfiguration_fromAssetManager(android_app->config,
+                                      android_app->activity->assetManager);
+      print_cur_config(android_app);
+      break;
+
+    case APP_CMD_DESTROY:
+      LOGV("APP_CMD_DESTROY");
+      android_app->destroyRequested = 1;
+      break;
+  }
+}
+
+void android_app_post_exec_cmd(struct android_app* android_app, int8_t cmd) {
+  switch (cmd) {
+    case APP_CMD_TERM_WINDOW:
+      LOGV("APP_CMD_TERM_WINDOW");
+      pthread_mutex_lock(&android_app->mutex);
+      android_app->window = NULL;
+      pthread_cond_broadcast(&android_app->cond);
+      pthread_mutex_unlock(&android_app->mutex);
+      break;
+
+    case APP_CMD_SAVE_STATE:
+      LOGV("APP_CMD_SAVE_STATE");
+      pthread_mutex_lock(&android_app->mutex);
+      android_app->stateSaved = 1;
+      pthread_cond_broadcast(&android_app->cond);
+      pthread_mutex_unlock(&android_app->mutex);
+      break;
+
+    case APP_CMD_RESUME:
+      free_saved_state(android_app);
+      break;
+  }
+}
+
+void app_dummy() {}
+
+static void android_app_destroy(struct android_app* android_app) {
+  LOGV("android_app_destroy!");
+  free_saved_state(android_app);
+  pthread_mutex_lock(&android_app->mutex);
+
+  AConfiguration_delete(android_app->config);
+  android_app->destroyed = 1;
+  pthread_cond_broadcast(&android_app->cond);
+  pthread_mutex_unlock(&android_app->mutex);
+  // Can't touch android_app object after this.
+}
+
+static void process_cmd(struct android_app* app,
+                        struct android_poll_source* source) {
+  int8_t cmd = android_app_read_cmd(app);
+  android_app_pre_exec_cmd(app, cmd);
+  if (app->onAppCmd != NULL) app->onAppCmd(app, cmd);
+  android_app_post_exec_cmd(app, cmd);
+}
+
+// This is run on a separate thread (i.e: not the main thread).
+static void* android_app_entry(void* param) {
+  struct android_app* android_app = (struct android_app*)param;
+  int input_buf_idx = 0;
+
+  LOGV("android_app_entry called");
+  android_app->config = AConfiguration_new();
+  LOGV("android_app = %p", android_app);
+  LOGV("config = %p", android_app->config);
+  LOGV("activity = %p", android_app->activity);
+  LOGV("assetmanager = %p", android_app->activity->assetManager);
+  AConfiguration_fromAssetManager(android_app->config,
+                                  android_app->activity->assetManager);
+
+  print_cur_config(android_app);
+
+  /* initialize event buffers */
+  for (input_buf_idx = 0; input_buf_idx < NATIVE_APP_GLUE_MAX_INPUT_BUFFERS;
+       input_buf_idx++) {
+    struct android_input_buffer* buf =
+        &android_app->inputBuffers[input_buf_idx];
+
+    buf->motionEventsBufferSize =
+        NATIVE_APP_GLUE_MOTION_EVENTS_DEFAULT_BUF_SIZE;
+    buf->motionEvents = (GameActivityMotionEvent*)malloc(
+        sizeof(GameActivityMotionEvent) * buf->motionEventsBufferSize);
+
+    buf->keyEventsBufferSize = NATIVE_APP_GLUE_KEY_EVENTS_DEFAULT_BUF_SIZE;
+    buf->keyEvents = (GameActivityKeyEvent*)malloc(
+        sizeof(GameActivityKeyEvent) * buf->keyEventsBufferSize);
+  }
+
+  android_app->cmdPollSource.id = LOOPER_ID_MAIN;
+  android_app->cmdPollSource.app = android_app;
+  android_app->cmdPollSource.process = process_cmd;
+
+  ALooper* looper = ALooper_prepare(ALOOPER_PREPARE_ALLOW_NON_CALLBACKS);
+  ALooper_addFd(looper, android_app->msgread, LOOPER_ID_MAIN,
+                ALOOPER_EVENT_INPUT, NULL, &android_app->cmdPollSource);
+  android_app->looper = looper;
+
+  pthread_mutex_lock(&android_app->mutex);
+  android_app->running = 1;
+  pthread_cond_broadcast(&android_app->cond);
+  pthread_mutex_unlock(&android_app->mutex);
+
+  _rust_glue_entry(android_app);
+
+  android_app_destroy(android_app);
+  return NULL;
+}
+
+// Codes from https://developer.android.com/reference/android/view/KeyEvent
+#define KEY_EVENT_KEYCODE_VOLUME_DOWN 25
+#define KEY_EVENT_KEYCODE_VOLUME_MUTE 164
+#define KEY_EVENT_KEYCODE_VOLUME_UP 24
+#define KEY_EVENT_KEYCODE_CAMERA 27
+#define KEY_EVENT_KEYCODE_ZOOM_IN 168
+#define KEY_EVENT_KEYCODE_ZOOM_OUT 169
+
+// Double-buffer the key event filter to avoid race condition.
+static bool default_key_filter(const GameActivityKeyEvent* event) {
+  // Ignore camera, volume, etc. buttons
+  return !(event->keyCode == KEY_EVENT_KEYCODE_VOLUME_DOWN ||
+           event->keyCode == KEY_EVENT_KEYCODE_VOLUME_MUTE ||
+           event->keyCode == KEY_EVENT_KEYCODE_VOLUME_UP ||
+           event->keyCode == KEY_EVENT_KEYCODE_CAMERA ||
+           event->keyCode == KEY_EVENT_KEYCODE_ZOOM_IN ||
+           event->keyCode == KEY_EVENT_KEYCODE_ZOOM_OUT);
+}
+
+// See
+// https://developer.android.com/reference/android/view/InputDevice#SOURCE_TOUCHSCREEN
+#define SOURCE_TOUCHSCREEN 0x00001002
+
+static bool default_motion_filter(const GameActivityMotionEvent* event) {
+  // Ignore any non-touch events.
+  return (event->source & SOURCE_TOUCHSCREEN) != 0;
+}
+
+// --------------------------------------------------------------------
+// Native activity interaction (called from main thread)
+// --------------------------------------------------------------------
+
+static struct android_app* android_app_create(GameActivity* activity,
+                                              void* savedState,
+                                              size_t savedStateSize) {
+  //  struct android_app* android_app = calloc(1, sizeof(struct android_app));
+  struct android_app* android_app =
+      (struct android_app*)malloc(sizeof(struct android_app));
+  memset(android_app, 0, sizeof(struct android_app));
+  android_app->activity = activity;
+
+  pthread_mutex_init(&android_app->mutex, NULL);
+  pthread_cond_init(&android_app->cond, NULL);
+
+  if (savedState != NULL) {
+    android_app->savedState = malloc(savedStateSize);
+    android_app->savedStateSize = savedStateSize;
+    memcpy(android_app->savedState, savedState, savedStateSize);
+  }
+
+  int msgpipe[2];
+  if (pipe(msgpipe)) {
+    LOGE("could not create pipe: %s", strerror(errno));
+    return NULL;
+  }
+  android_app->msgread = msgpipe[0];
+  android_app->msgwrite = msgpipe[1];
+
+  android_app->keyEventFilter = default_key_filter;
+  android_app->motionEventFilter = default_motion_filter;
+
+  LOGV("Launching android_app_entry in a thread");
+  pthread_attr_t attr;
+  pthread_attr_init(&attr);
+  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+  pthread_create(&android_app->thread, &attr, android_app_entry, android_app);
+
+  // Wait for thread to start.
+  pthread_mutex_lock(&android_app->mutex);
+  while (!android_app->running) {
+    pthread_cond_wait(&android_app->cond, &android_app->mutex);
+  }
+  pthread_mutex_unlock(&android_app->mutex);
+
+  return android_app;
+}
+
+void android_app_write_cmd(struct android_app* android_app, int8_t cmd) {
+  if (write(android_app->msgwrite, &cmd, sizeof(cmd)) != sizeof(cmd)) {
+    LOGE("Failure writing android_app cmd: %s", strerror(errno));
+  }
+}
+
+static void android_app_set_window(struct android_app* android_app,
+                                   ANativeWindow* window) {
+  LOGV("android_app_set_window called");
+  pthread_mutex_lock(&android_app->mutex);
+
+  // NB: we have to consider that the native thread could have already
+  // (gracefully) exit (setting android_app->destroyed) and so we need
+  // to be careful to avoid a deadlock waiting for a thread that's
+  // already exit.
+  if (android_app->destroyed) {
+    pthread_mutex_unlock(&android_app->mutex);
+    return;
+  }
+  if (android_app->pendingWindow != NULL) {
+    android_app_write_cmd(android_app, APP_CMD_TERM_WINDOW);
+  }
+  android_app->pendingWindow = window;
+  if (window != NULL) {
+    android_app_write_cmd(android_app, APP_CMD_INIT_WINDOW);
+  }
+  while (android_app->window != android_app->pendingWindow) {
+    pthread_cond_wait(&android_app->cond, &android_app->mutex);
+  }
+  pthread_mutex_unlock(&android_app->mutex);
+}
+
+static void android_app_set_activity_state(struct android_app* android_app,
+                                           int8_t cmd) {
+  pthread_mutex_lock(&android_app->mutex);
+
+  // NB: we have to consider that the native thread could have already
+  // (gracefully) exit (setting android_app->destroyed) and so we need
+  // to be careful to avoid a deadlock waiting for a thread that's
+  // already exit.
+  if (!android_app->destroyed) {
+    android_app_write_cmd(android_app, cmd);
+    while (android_app->activityState != cmd) {
+      pthread_cond_wait(&android_app->cond, &android_app->mutex);
+    }
+  }
+  pthread_mutex_unlock(&android_app->mutex);
+}
+
+static void android_app_free(struct android_app* android_app) {
+  int input_buf_idx = 0;
+
+  pthread_mutex_lock(&android_app->mutex);
+
+  // It's possible that onDestroy is called after we have already 'destroyed'
+  // the app (via `android_app_destroy` due to `android_main` returning.
+  //
+  // In this case `->destroyed` will already be set (so we won't deadlock in
+  // the loop below) but we still need to close the messaging fds and finish
+  // freeing the android_app
+
+  android_app_write_cmd(android_app, APP_CMD_DESTROY);
+  while (!android_app->destroyed) {
+    pthread_cond_wait(&android_app->cond, &android_app->mutex);
+  }
+  pthread_mutex_unlock(&android_app->mutex);
+
+  for (input_buf_idx = 0; input_buf_idx < NATIVE_APP_GLUE_MAX_INPUT_BUFFERS;
+       input_buf_idx++) {
+    struct android_input_buffer* buf =
+        &android_app->inputBuffers[input_buf_idx];
+
+    android_app_clear_motion_events(buf);
+    free(buf->motionEvents);
+    free(buf->keyEvents);
+  }
+
+  close(android_app->msgread);
+  close(android_app->msgwrite);
+  pthread_cond_destroy(&android_app->cond);
+  pthread_mutex_destroy(&android_app->mutex);
+  free(android_app);
+}
+
+static inline struct android_app* ToApp(GameActivity* activity) {
+  return (struct android_app*)activity->instance;
+}
+
+static void onDestroy(GameActivity* activity) {
+  LOGV("Destroy: %p", activity);
+  android_app_free(ToApp(activity));
+}
+
+static void onStart(GameActivity* activity) {
+  LOGV("Start: %p", activity);
+  android_app_set_activity_state(ToApp(activity), APP_CMD_START);
+}
+
+static void onResume(GameActivity* activity) {
+  LOGV("Resume: %p", activity);
+  android_app_set_activity_state(ToApp(activity), APP_CMD_RESUME);
+}
+
+static void onSaveInstanceState(GameActivity* activity,
+                                SaveInstanceStateRecallback recallback,
+                                void* context) {
+  LOGV("SaveInstanceState: %p", activity);
+
+  struct android_app* android_app = ToApp(activity);
+  pthread_mutex_lock(&android_app->mutex);
+
+  // NB: we have to consider that the native thread could have already
+  // (gracefully) exit (setting android_app->destroyed) and so we need
+  // to be careful to avoid a deadlock waiting for a thread that's
+  // already exit.
+  if (android_app->destroyed) {
+    pthread_mutex_unlock(&android_app->mutex);
+    return;
+  }
+
+  android_app->stateSaved = 0;
+  android_app_write_cmd(android_app, APP_CMD_SAVE_STATE);
+  while (!android_app->stateSaved) {
+    pthread_cond_wait(&android_app->cond, &android_app->mutex);
+  }
+
+  if (android_app->savedState != NULL) {
+    // Tell the Java side about our state.
+    recallback((const char*)android_app->savedState,
+               android_app->savedStateSize, context);
+    // Now we can free it.
+    free(android_app->savedState);
+    android_app->savedState = NULL;
+    android_app->savedStateSize = 0;
+  }
+
+  pthread_mutex_unlock(&android_app->mutex);
+}
+
+static void onPause(GameActivity* activity) {
+  LOGV("Pause: %p", activity);
+  android_app_set_activity_state(ToApp(activity), APP_CMD_PAUSE);
+}
+
+static void onStop(GameActivity* activity) {
+  LOGV("Stop: %p", activity);
+  android_app_set_activity_state(ToApp(activity), APP_CMD_STOP);
+}
+
+static void onConfigurationChanged(GameActivity* activity) {
+  LOGV("ConfigurationChanged: %p", activity);
+  android_app_write_cmd(ToApp(activity), APP_CMD_CONFIG_CHANGED);
+}
+
+static void onTrimMemory(GameActivity* activity, int level) {
+  LOGV("TrimMemory: %p %d", activity, level);
+  android_app_write_cmd(ToApp(activity), APP_CMD_LOW_MEMORY);
+}
+
+static void onWindowFocusChanged(GameActivity* activity, bool focused) {
+  LOGV("WindowFocusChanged: %p -- %d", activity, focused);
+  android_app_write_cmd(ToApp(activity),
+                        focused ? APP_CMD_GAINED_FOCUS : APP_CMD_LOST_FOCUS);
+}
+
+static void onNativeWindowCreated(GameActivity* activity,
+                                  ANativeWindow* window) {
+  LOGV("NativeWindowCreated: %p -- %p", activity, window);
+  android_app_set_window(ToApp(activity), window);
+}
+
+static void onNativeWindowDestroyed(GameActivity* activity,
+                                    ANativeWindow* window) {
+  LOGV("NativeWindowDestroyed: %p -- %p", activity, window);
+  android_app_set_window(ToApp(activity), NULL);
+}
+
+static void onNativeWindowRedrawNeeded(GameActivity* activity,
+                                       ANativeWindow* window) {
+  LOGV("NativeWindowRedrawNeeded: %p -- %p", activity, window);
+  android_app_write_cmd(ToApp(activity), APP_CMD_WINDOW_REDRAW_NEEDED);
+}
+
+static void onNativeWindowResized(GameActivity* activity, ANativeWindow* window,
+                                  int32_t width, int32_t height) {
+  LOGV("NativeWindowResized: %p -- %p ( %d x %d )", activity, window, width,
+       height);
+  android_app_write_cmd(ToApp(activity), APP_CMD_WINDOW_RESIZED);
+}
+
+void android_app_set_motion_event_filter(struct android_app* app,
+                                         android_motion_event_filter filter) {
+  pthread_mutex_lock(&app->mutex);
+  app->motionEventFilter = filter;
+  pthread_mutex_unlock(&app->mutex);
+}
+
+bool android_app_input_available_wake_up(struct android_app* app) {
+  pthread_mutex_lock(&app->mutex);
+  bool available = app->inputAvailableWakeUp;
+  app->inputAvailableWakeUp = false;
+  pthread_mutex_unlock(&app->mutex);
+  return available;
+}
+
+// NB: should be called with the android_app->mutex held already
+static void notifyInput(struct android_app* android_app) {
+  // Don't spam the mainloop with wake ups if we've already sent one
+  if (android_app->inputSwapPending) {
+    return;
+  }
+
+  if (android_app->looper != NULL) {
+    // for the app thread to know why it received the wake() up
+    android_app->inputAvailableWakeUp = true;
+    android_app->inputSwapPending = true;
+    ALooper_wake(android_app->looper);
+  }
+}
+
+static bool onTouchEvent(GameActivity* activity,
+                         const GameActivityMotionEvent* event) {
+  struct android_app* android_app = ToApp(activity);
+  pthread_mutex_lock(&android_app->mutex);
+
+  // NB: we have to consider that the native thread could have already
+  // (gracefully) exit (setting android_app->destroyed) and so we need
+  // to be careful to avoid a deadlock waiting for a thread that's
+  // already exit.
+  if (android_app->destroyed) {
+    pthread_mutex_unlock(&android_app->mutex);
+    return false;
+  }
+
+  if (android_app->motionEventFilter != NULL &&
+      !android_app->motionEventFilter(event)) {
+    pthread_mutex_unlock(&android_app->mutex);
+    return false;
+  }
+
+  struct android_input_buffer* inputBuffer =
+      &android_app->inputBuffers[android_app->currentInputBuffer];
+
+  // Add to the list of active motion events
+  if (inputBuffer->motionEventsCount >= inputBuffer->motionEventsBufferSize) {
+    inputBuffer->motionEventsBufferSize *= 2;
+    inputBuffer->motionEvents = (GameActivityMotionEvent*)realloc(
+        inputBuffer->motionEvents,
+        sizeof(GameActivityMotionEvent) * inputBuffer->motionEventsBufferSize);
+
+    if (inputBuffer->motionEvents == NULL) {
+      LOGE("onTouchEvent: out of memory");
+      abort();
+    }
+  }
+
+  int new_ix = inputBuffer->motionEventsCount;
+  memcpy(&inputBuffer->motionEvents[new_ix], event,
+         sizeof(GameActivityMotionEvent));
+  ++inputBuffer->motionEventsCount;
+  notifyInput(android_app);
+
+  android_app_write_cmd(android_app, APP_CMD_TOUCH_EVENT);
+  pthread_mutex_unlock(&android_app->mutex);
+  return true;
+}
+
+struct android_input_buffer* android_app_swap_input_buffers(
+    struct android_app* android_app) {
+  pthread_mutex_lock(&android_app->mutex);
+
+  struct android_input_buffer* inputBuffer =
+      &android_app->inputBuffers[android_app->currentInputBuffer];
+
+  if (inputBuffer->motionEventsCount == 0 && inputBuffer->keyEventsCount == 0) {
+    inputBuffer = NULL;
+  } else {
+    android_app->currentInputBuffer = (android_app->currentInputBuffer + 1) %
+                                      NATIVE_APP_GLUE_MAX_INPUT_BUFFERS;
+  }
+
+  android_app->inputSwapPending = false;
+  android_app->inputAvailableWakeUp = false;
+
+  pthread_mutex_unlock(&android_app->mutex);
+
+  return inputBuffer;
+}
+
+void android_app_clear_motion_events(struct android_input_buffer* inputBuffer) {
+  // We do not need to lock here if the inputBuffer has already been swapped
+  // as is handled by the game loop thread
+  while (inputBuffer->motionEventsCount > 0) {
+    GameActivityMotionEvent_destroy(
+        &inputBuffer->motionEvents[inputBuffer->motionEventsCount - 1]);
+
+    inputBuffer->motionEventsCount--;
+  }
+  assert(inputBuffer->motionEventsCount == 0);
+}
+
+void android_app_set_key_event_filter(struct android_app* app,
+                                      android_key_event_filter filter) {
+  pthread_mutex_lock(&app->mutex);
+  app->keyEventFilter = filter;
+  pthread_mutex_unlock(&app->mutex);
+}
+
+static bool onKey(GameActivity* activity, const GameActivityKeyEvent* event) {
+  struct android_app* android_app = ToApp(activity);
+  pthread_mutex_lock(&android_app->mutex);
+
+  // NB: we have to consider that the native thread could have already
+  // (gracefully) exit (setting android_app->destroyed) and so we need
+  // to be careful to avoid a deadlock waiting for a thread that's
+  // already exit.
+  if (android_app->destroyed) {
+    pthread_mutex_unlock(&android_app->mutex);
+    return false;
+  }
+
+  if (android_app->keyEventFilter != NULL &&
+      !android_app->keyEventFilter(event)) {
+    pthread_mutex_unlock(&android_app->mutex);
+    return false;
+  }
+
+  struct android_input_buffer* inputBuffer =
+      &android_app->inputBuffers[android_app->currentInputBuffer];
+
+  // Add to the list of active key down events
+  if (inputBuffer->keyEventsCount >= inputBuffer->keyEventsBufferSize) {
+    inputBuffer->keyEventsBufferSize = inputBuffer->keyEventsBufferSize * 2;
+    inputBuffer->keyEvents = (GameActivityKeyEvent*)realloc(
+        inputBuffer->keyEvents,
+        sizeof(GameActivityKeyEvent) * inputBuffer->keyEventsBufferSize);
+
+    if (inputBuffer->keyEvents == NULL) {
+      LOGE("onKey: out of memory");
+      abort();
+    }
+  }
+
+  int new_ix = inputBuffer->keyEventsCount;
+  memcpy(&inputBuffer->keyEvents[new_ix], event, sizeof(GameActivityKeyEvent));
+  ++inputBuffer->keyEventsCount;
+  notifyInput(android_app);
+
+  android_app_write_cmd(android_app, APP_CMD_KEY_EVENT);
+  pthread_mutex_unlock(&android_app->mutex);
+  return true;
+}
+
+void android_app_clear_key_events(struct android_input_buffer* inputBuffer) {
+  inputBuffer->keyEventsCount = 0;
+}
+
+static void onTextInputEvent(GameActivity* activity,
+                             const GameTextInputState* state) {
+  struct android_app* android_app = ToApp(activity);
+  pthread_mutex_lock(&android_app->mutex);
+  if (!android_app->destroyed) {
+    android_app->textInputState = 1;
+    notifyInput(android_app);
+  }
+  pthread_mutex_unlock(&android_app->mutex);
+}
+
+static void onWindowInsetsChanged(GameActivity* activity) {
+  LOGV("WindowInsetsChanged: %p", activity);
+  android_app_write_cmd(ToApp(activity), APP_CMD_WINDOW_INSETS_CHANGED);
+}
+
+static void onContentRectChanged(GameActivity* activity, const ARect* rect) {
+  LOGV("ContentRectChanged: %p -- (%d %d) (%d %d)", activity, rect->left,
+       rect->top, rect->right, rect->bottom);
+
+  struct android_app* android_app = ToApp(activity);
+
+  pthread_mutex_lock(&android_app->mutex);
+  android_app->contentRect = *rect;
+
+  android_app_write_cmd(android_app, APP_CMD_CONTENT_RECT_CHANGED);
+  pthread_mutex_unlock(&android_app->mutex);
+}
+
+static void onSoftwareKeyboardVisibilityChanged(GameActivity* activity,
+                                                bool visible) {
+  LOGV("SoftwareKeyboardVisibilityChanged: %p -- %d", activity, (int)visible);
+
+  struct android_app* android_app = ToApp(activity);
+
+  pthread_mutex_lock(&android_app->mutex);
+  android_app->softwareKeyboardVisible = visible;
+
+  android_app_write_cmd(android_app, APP_CMD_SOFTWARE_KB_VIS_CHANGED);
+  pthread_mutex_unlock(&android_app->mutex);
+}
+
+static bool onEditorAction(GameActivity* activity, int action) {
+  LOGV("EditorAction: %p -- %d", activity, action);
+
+  struct android_app* android_app = ToApp(activity);
+
+  pthread_mutex_lock(&android_app->mutex);
+  android_app->editorAction = action;
+
+  android_app_write_cmd(android_app, APP_CMD_EDITOR_ACTION);
+  pthread_mutex_unlock(&android_app->mutex);
+  return true;
+}
+
+// XXX: This symbol is renamed with a _C suffix and then re-exported from
+// Rust because Rust/Cargo don't give us a way to directly export symbols
+// from C/C++ code: https://github.com/rust-lang/rfcs/issues/2771
+//
+JNIEXPORT
+void GameActivity_onCreate_C(GameActivity* activity, void* savedState,
+                             size_t savedStateSize) {
+  LOGV("Creating: %p", activity);
+  activity->callbacks->onDestroy = onDestroy;
+  activity->callbacks->onStart = onStart;
+  activity->callbacks->onResume = onResume;
+  activity->callbacks->onSaveInstanceState = onSaveInstanceState;
+  activity->callbacks->onPause = onPause;
+  activity->callbacks->onStop = onStop;
+  activity->callbacks->onTouchEvent = onTouchEvent;
+  activity->callbacks->onKeyDown = onKey;
+  activity->callbacks->onKeyUp = onKey;
+  activity->callbacks->onTextInputEvent = onTextInputEvent;
+  activity->callbacks->onConfigurationChanged = onConfigurationChanged;
+  activity->callbacks->onTrimMemory = onTrimMemory;
+  activity->callbacks->onWindowFocusChanged = onWindowFocusChanged;
+  activity->callbacks->onNativeWindowCreated = onNativeWindowCreated;
+  activity->callbacks->onNativeWindowDestroyed = onNativeWindowDestroyed;
+  activity->callbacks->onNativeWindowRedrawNeeded = onNativeWindowRedrawNeeded;
+  activity->callbacks->onNativeWindowResized = onNativeWindowResized;
+  activity->callbacks->onWindowInsetsChanged = onWindowInsetsChanged;
+  activity->callbacks->onContentRectChanged = onContentRectChanged;
+  activity->callbacks->onSoftwareKeyboardVisibilityChanged =
+      onSoftwareKeyboardVisibilityChanged;
+  activity->callbacks->onEditorAction = onEditorAction;
+  LOGV("Callbacks set: %p", activity->callbacks);
+
+  activity->instance = android_app_create(activity, savedState, savedStateSize);
+}
diff --git a/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gamecommon.h b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gamecommon.h
deleted file mode 100644
index 38bffff..0000000
--- a/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gamecommon.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @defgroup game_common Game Common
- * Common structures and functions used within AGDK
- * @{
- */
-
-#pragma once
-
-/**
- * The type of a component for which to retrieve insets. See
- * https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type
- */
-typedef enum GameCommonInsetsType {
-    GAMECOMMON_INSETS_TYPE_CAPTION_BAR = 0,
-    GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT,
-    GAMECOMMON_INSETS_TYPE_IME,
-    GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES,
-    GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS,
-    GAMECOMMON_INSETS_TYPE_STATUS_BARS,
-    GAMECOMMON_INSETS_TYPE_SYSTEM_BARS,
-    GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES,
-    GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT,
-    GAMECOMMON_INSETS_TYPE_WATERFALL,
-    GAMECOMMON_INSETS_TYPE_COUNT
-} GameCommonInsetsType;
diff --git a/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.cpp b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.cpp
deleted file mode 100644
index b8244fb..0000000
--- a/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.cpp
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "game-text-input/gametextinput.h"
-
-#include <android/log.h>
-#include <jni.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <algorithm>
-#include <memory>
-#include <vector>
-
-#define LOG_TAG "GameTextInput"
-
-static constexpr int32_t DEFAULT_MAX_STRING_SIZE = 1 << 16;
-
-// Cache of field ids in the Java GameTextInputState class
-struct StateClassInfo {
-    jfieldID text;
-    jfieldID selectionStart;
-    jfieldID selectionEnd;
-    jfieldID composingRegionStart;
-    jfieldID composingRegionEnd;
-};
-
-// Main GameTextInput object.
-struct GameTextInput {
-   public:
-    GameTextInput(JNIEnv *env, uint32_t max_string_size);
-    ~GameTextInput();
-    void setState(const GameTextInputState &state);
-    const GameTextInputState &getState() const { return currentState_; }
-    void setInputConnection(jobject inputConnection);
-    void processEvent(jobject textInputEvent);
-    void showIme(uint32_t flags);
-    void hideIme(uint32_t flags);
-    void restartInput();
-    void setEventCallback(GameTextInputEventCallback callback, void *context);
-    jobject stateToJava(const GameTextInputState &state) const;
-    void stateFromJava(jobject textInputEvent,
-                       GameTextInputGetStateCallback callback,
-                       void *context) const;
-    void setImeInsetsCallback(GameTextInputImeInsetsCallback callback,
-                              void *context);
-    void processImeInsets(const ARect *insets);
-    const ARect &getImeInsets() const { return currentInsets_; }
-
-   private:
-    // Copy string and set other fields
-    void setStateInner(const GameTextInputState &state);
-    static void processCallback(void *context, const GameTextInputState *state);
-    JNIEnv *env_ = nullptr;
-    // Cached at initialization from
-    // com/google/androidgamesdk/gametextinput/State.
-    jclass stateJavaClass_ = nullptr;
-    // The latest text input update.
-    GameTextInputState currentState_ = {};
-    // An instance of gametextinput.InputConnection.
-    jclass inputConnectionClass_ = nullptr;
-    jobject inputConnection_ = nullptr;
-    jmethodID inputConnectionSetStateMethod_;
-    jmethodID setSoftKeyboardActiveMethod_;
-    jmethodID restartInputMethod_;
-    void (*eventCallback_)(void *context,
-                           const struct GameTextInputState *state) = nullptr;
-    void *eventCallbackContext_ = nullptr;
-    void (*insetsCallback_)(void *context,
-                            const struct ARect *insets) = nullptr;
-    ARect currentInsets_ = {};
-    void *insetsCallbackContext_ = nullptr;
-    StateClassInfo stateClassInfo_ = {};
-    // Constant-sized buffer used to store state text.
-    std::vector<char> stateStringBuffer_;
-};
-
-std::unique_ptr<GameTextInput> s_gameTextInput;
-
-extern "C" {
-
-///////////////////////////////////////////////////////////
-/// GameTextInputState C Functions
-///////////////////////////////////////////////////////////
-
-// Convert to a Java structure.
-jobject currentState_toJava(const GameTextInput *gameTextInput,
-                            const GameTextInputState *state) {
-    if (state == nullptr) return NULL;
-    return gameTextInput->stateToJava(*state);
-}
-
-// Convert from Java structure.
-void currentState_fromJava(const GameTextInput *gameTextInput,
-                           jobject textInputEvent,
-                           GameTextInputGetStateCallback callback,
-                           void *context) {
-    gameTextInput->stateFromJava(textInputEvent, callback, context);
-}
-
-///////////////////////////////////////////////////////////
-/// GameTextInput C Functions
-///////////////////////////////////////////////////////////
-
-struct GameTextInput *GameTextInput_init(JNIEnv *env,
-                                         uint32_t max_string_size) {
-    if (s_gameTextInput.get() != nullptr) {
-        __android_log_print(ANDROID_LOG_WARN, LOG_TAG,
-                            "Warning: called GameTextInput_init twice without "
-                            "calling GameTextInput_destroy");
-        return s_gameTextInput.get();
-    }
-    // Don't use make_unique, for C++11 compatibility
-    s_gameTextInput =
-        std::unique_ptr<GameTextInput>(new GameTextInput(env, max_string_size));
-    return s_gameTextInput.get();
-}
-
-void GameTextInput_destroy(GameTextInput *input) {
-    if (input == nullptr || s_gameTextInput.get() == nullptr) return;
-    s_gameTextInput.reset();
-}
-
-void GameTextInput_setState(GameTextInput *input,
-                            const GameTextInputState *state) {
-    if (state == nullptr) return;
-    input->setState(*state);
-}
-
-void GameTextInput_getState(GameTextInput *input,
-                            GameTextInputGetStateCallback callback,
-                            void *context) {
-    callback(context, &input->getState());
-}
-
-void GameTextInput_setInputConnection(GameTextInput *input,
-                                      jobject inputConnection) {
-    input->setInputConnection(inputConnection);
-}
-
-void GameTextInput_processEvent(GameTextInput *input, jobject textInputEvent) {
-    input->processEvent(textInputEvent);
-}
-
-void GameTextInput_processImeInsets(GameTextInput *input, const ARect *insets) {
-    input->processImeInsets(insets);
-}
-
-void GameTextInput_showIme(struct GameTextInput *input, uint32_t flags) {
-    input->showIme(flags);
-}
-
-void GameTextInput_hideIme(struct GameTextInput *input, uint32_t flags) {
-    input->hideIme(flags);
-}
-
-void GameTextInput_restartInput(struct GameTextInput *input) {
-    input->restartInput();
-}
-
-void GameTextInput_setEventCallback(struct GameTextInput *input,
-                                    GameTextInputEventCallback callback,
-                                    void *context) {
-    input->setEventCallback(callback, context);
-}
-
-void GameTextInput_setImeInsetsCallback(struct GameTextInput *input,
-                                        GameTextInputImeInsetsCallback callback,
-                                        void *context) {
-    input->setImeInsetsCallback(callback, context);
-}
-
-void GameTextInput_getImeInsets(const GameTextInput *input, ARect *insets) {
-    *insets = input->getImeInsets();
-}
-
-}  // extern "C"
-
-///////////////////////////////////////////////////////////
-/// GameTextInput C++ class Implementation
-///////////////////////////////////////////////////////////
-
-GameTextInput::GameTextInput(JNIEnv *env, uint32_t max_string_size)
-    : env_(env),
-      stateStringBuffer_(max_string_size == 0 ? DEFAULT_MAX_STRING_SIZE
-                                              : max_string_size) {
-    stateJavaClass_ = (jclass)env_->NewGlobalRef(
-        env_->FindClass("com/google/androidgamesdk/gametextinput/State"));
-    inputConnectionClass_ = (jclass)env_->NewGlobalRef(env_->FindClass(
-        "com/google/androidgamesdk/gametextinput/InputConnection"));
-    inputConnectionSetStateMethod_ =
-        env_->GetMethodID(inputConnectionClass_, "setState",
-                          "(Lcom/google/androidgamesdk/gametextinput/State;)V");
-    setSoftKeyboardActiveMethod_ = env_->GetMethodID(
-        inputConnectionClass_, "setSoftKeyboardActive", "(ZI)V");
-    restartInputMethod_ =
-        env_->GetMethodID(inputConnectionClass_, "restartInput", "()V");
-
-    stateClassInfo_.text =
-        env_->GetFieldID(stateJavaClass_, "text", "Ljava/lang/String;");
-    stateClassInfo_.selectionStart =
-        env_->GetFieldID(stateJavaClass_, "selectionStart", "I");
-    stateClassInfo_.selectionEnd =
-        env_->GetFieldID(stateJavaClass_, "selectionEnd", "I");
-    stateClassInfo_.composingRegionStart =
-        env_->GetFieldID(stateJavaClass_, "composingRegionStart", "I");
-    stateClassInfo_.composingRegionEnd =
-        env_->GetFieldID(stateJavaClass_, "composingRegionEnd", "I");
-}
-
-GameTextInput::~GameTextInput() {
-    if (stateJavaClass_ != NULL) {
-        env_->DeleteGlobalRef(stateJavaClass_);
-        stateJavaClass_ = NULL;
-    }
-    if (inputConnectionClass_ != NULL) {
-        env_->DeleteGlobalRef(inputConnectionClass_);
-        inputConnectionClass_ = NULL;
-    }
-    if (inputConnection_ != NULL) {
-        env_->DeleteGlobalRef(inputConnection_);
-        inputConnection_ = NULL;
-    }
-}
-
-void GameTextInput::setState(const GameTextInputState &state) {
-    if (inputConnection_ == nullptr) return;
-    jobject jstate = stateToJava(state);
-    env_->CallVoidMethod(inputConnection_, inputConnectionSetStateMethod_,
-                         jstate);
-    env_->DeleteLocalRef(jstate);
-    setStateInner(state);
-}
-
-void GameTextInput::setStateInner(const GameTextInputState &state) {
-    // Check if we're setting using our own string (other parts may be
-    // different)
-    if (state.text_UTF8 == currentState_.text_UTF8) {
-        currentState_ = state;
-        return;
-    }
-    // Otherwise, copy across the string.
-    auto bytes_needed =
-        std::min(static_cast<uint32_t>(state.text_length + 1),
-                 static_cast<uint32_t>(stateStringBuffer_.size()));
-    currentState_.text_UTF8 = stateStringBuffer_.data();
-    std::copy(state.text_UTF8, state.text_UTF8 + bytes_needed - 1,
-              stateStringBuffer_.data());
-    currentState_.text_length = state.text_length;
-    currentState_.selection = state.selection;
-    currentState_.composingRegion = state.composingRegion;
-    stateStringBuffer_[bytes_needed - 1] = 0;
-}
-
-void GameTextInput::setInputConnection(jobject inputConnection) {
-    if (inputConnection_ != NULL) {
-        env_->DeleteGlobalRef(inputConnection_);
-    }
-    inputConnection_ = env_->NewGlobalRef(inputConnection);
-}
-
-/*static*/ void GameTextInput::processCallback(
-    void *context, const GameTextInputState *state) {
-    auto thiz = static_cast<GameTextInput *>(context);
-    if (state != nullptr) thiz->setStateInner(*state);
-}
-
-void GameTextInput::processEvent(jobject textInputEvent) {
-    stateFromJava(textInputEvent, processCallback, this);
-    if (eventCallback_) {
-        eventCallback_(eventCallbackContext_, &currentState_);
-    }
-}
-
-void GameTextInput::showIme(uint32_t flags) {
-    if (inputConnection_ == nullptr) return;
-    env_->CallVoidMethod(inputConnection_, setSoftKeyboardActiveMethod_, true,
-                         flags);
-}
-
-void GameTextInput::setEventCallback(GameTextInputEventCallback callback,
-                                     void *context) {
-    eventCallback_ = callback;
-    eventCallbackContext_ = context;
-}
-
-void GameTextInput::setImeInsetsCallback(
-    GameTextInputImeInsetsCallback callback, void *context) {
-    insetsCallback_ = callback;
-    insetsCallbackContext_ = context;
-}
-
-void GameTextInput::processImeInsets(const ARect *insets) {
-    currentInsets_ = *insets;
-    if (insetsCallback_) {
-        insetsCallback_(insetsCallbackContext_, &currentInsets_);
-    }
-}
-
-void GameTextInput::hideIme(uint32_t flags) {
-    if (inputConnection_ == nullptr) return;
-    env_->CallVoidMethod(inputConnection_, setSoftKeyboardActiveMethod_, false,
-                         flags);
-}
-
-void GameTextInput::restartInput() {
-    if (inputConnection_ == nullptr) return;
-    env_->CallVoidMethod(inputConnection_, restartInputMethod_, false);
-}
-
-jobject GameTextInput::stateToJava(const GameTextInputState &state) const {
-    static jmethodID constructor = nullptr;
-    if (constructor == nullptr) {
-        constructor = env_->GetMethodID(stateJavaClass_, "<init>",
-                                        "(Ljava/lang/String;IIII)V");
-        if (constructor == nullptr) {
-            __android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
-                                "Can't find gametextinput.State constructor");
-            return nullptr;
-        }
-    }
-    const char *text = state.text_UTF8;
-    if (text == nullptr) {
-        static char empty_string[] = "";
-        text = empty_string;
-    }
-    // Note that this expects 'modified' UTF-8 which is not the same as UTF-8
-    // https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8
-    jstring jtext = env_->NewStringUTF(text);
-    jobject jobj =
-        env_->NewObject(stateJavaClass_, constructor, jtext,
-                        state.selection.start, state.selection.end,
-                        state.composingRegion.start, state.composingRegion.end);
-    env_->DeleteLocalRef(jtext);
-    return jobj;
-}
-
-void GameTextInput::stateFromJava(jobject textInputEvent,
-                                  GameTextInputGetStateCallback callback,
-                                  void *context) const {
-    jstring text =
-        (jstring)env_->GetObjectField(textInputEvent, stateClassInfo_.text);
-    // Note this is 'modified' UTF-8, not true UTF-8. It has no NULLs in it,
-    // except at the end. It's actually not specified whether the value returned
-    // by GetStringUTFChars includes a null at the end, but it *seems to* on
-    // Android.
-    const char *text_chars = env_->GetStringUTFChars(text, NULL);
-    int text_len = env_->GetStringUTFLength(
-        text);  // Length in bytes, *not* including the null.
-    int selectionStart =
-        env_->GetIntField(textInputEvent, stateClassInfo_.selectionStart);
-    int selectionEnd =
-        env_->GetIntField(textInputEvent, stateClassInfo_.selectionEnd);
-    int composingRegionStart =
-        env_->GetIntField(textInputEvent, stateClassInfo_.composingRegionStart);
-    int composingRegionEnd =
-        env_->GetIntField(textInputEvent, stateClassInfo_.composingRegionEnd);
-    GameTextInputState state{text_chars,
-                             text_len,
-                             {selectionStart, selectionEnd},
-                             {composingRegionStart, composingRegionEnd}};
-    callback(context, &state);
-    env_->ReleaseStringUTFChars(text, text_chars);
-    env_->DeleteLocalRef(text);
-}
diff --git a/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h
index 8c33da5..2864544 100644
--- a/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h
+++ b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h
@@ -27,19 +27,18 @@
 #include <stdint.h>
 
 #include "common/gamesdk_common.h"
-#include "gamecommon.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define GAMETEXTINPUT_MAJOR_VERSION 2
+#define GAMETEXTINPUT_MAJOR_VERSION 4
 #define GAMETEXTINPUT_MINOR_VERSION 0
 #define GAMETEXTINPUT_BUGFIX_VERSION 0
-#define GAMETEXTINPUT_PACKED_VERSION                            \
-    ANDROID_GAMESDK_PACKED_VERSION(GAMETEXTINPUT_MAJOR_VERSION, \
-                                   GAMETEXTINPUT_MINOR_VERSION, \
-                                   GAMETEXTINPUT_BUGFIX_VERSION)
+#define GAMETEXTINPUT_PACKED_VERSION                          \
+  ANDROID_GAMESDK_PACKED_VERSION(GAMETEXTINPUT_MAJOR_VERSION, \
+                                 GAMETEXTINPUT_MINOR_VERSION, \
+                                 GAMETEXTINPUT_BUGFIX_VERSION)
 
 /**
  * This struct holds a span within a region of text from start (inclusive) to
@@ -47,16 +46,16 @@ extern "C" {
  * start==end. An undefined span is specified with start = end = SPAN_UNDEFINED.
  */
 typedef struct GameTextInputSpan {
-    /** The start of the region (inclusive). */
-    int32_t start;
-    /** The end of the region (exclusive). */
-    int32_t end;
+  /** The start of the region (inclusive). */
+  int32_t start;
+  /** The end of the region (exclusive). */
+  int32_t end;
 } GameTextInputSpan;
 
 /**
  * Values with special meaning in a GameTextInputSpan.
  */
-enum GameTextInputSpanFlag { SPAN_UNDEFINED = -1 };
+enum GameTextInputSpanFlag : int32_t { SPAN_UNDEFINED = -1 };
 
 /**
  * This struct holds the state of an editable section of text.
@@ -66,23 +65,23 @@ enum GameTextInputSpanFlag { SPAN_UNDEFINED = -1 };
  * GameTextInput_setState to read and modify the state that an IME is editing.
  */
 typedef struct GameTextInputState {
-    /**
-     * Text owned by the state, as a modified UTF-8 string. Null-terminated.
-     * https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8
-     */
-    const char *text_UTF8;
-    /**
-     * Length in bytes of text_UTF8, *not* including the null at end.
-     */
-    int32_t text_length;
-    /**
-     * A selection defined on the text.
-     */
-    GameTextInputSpan selection;
-    /**
-     * A composing region defined on the text.
-     */
-    GameTextInputSpan composingRegion;
+  /**
+   * Text owned by the state, as a modified UTF-8 string. Null-terminated.
+   * https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8
+   */
+  const char *text_UTF8;
+  /**
+   * Length in bytes of text_UTF8, *not* including the null at end.
+   */
+  int32_t text_length;
+  /**
+   * A selection defined on the text.
+   */
+  GameTextInputSpan selection;
+  /**
+   * A composing region defined on the text.
+   */
+  GameTextInputSpan composingRegion;
 } GameTextInputState;
 
 /**
@@ -143,14 +142,14 @@ void GameTextInput_destroy(GameTextInput *input);
 /**
  * Flags to be passed to GameTextInput_showIme.
  */
-enum ShowImeFlags {
-    SHOW_IME_UNDEFINED = 0,  // Default value.
-    SHOW_IMPLICIT =
-        1,  // Indicates that the user has forced the input method open so it
-            // should not be closed until they explicitly do so.
-    SHOW_FORCED = 2  // Indicates that this is an implicit request to show the
-                     // input window, not as the result of a direct request by
-                     // the user. The window may not be shown in this case.
+enum ShowImeFlags : uint32_t {
+  SHOW_IME_UNDEFINED = 0,  // Default value.
+  SHOW_IMPLICIT =
+      1,  // Indicates that the user has forced the input method open so it
+          // should not be closed until they explicitly do so.
+  SHOW_FORCED = 2  // Indicates that this is an implicit request to show the
+                   // input window, not as the result of a direct request by
+                   // the user. The window may not be shown in this case.
 };
 
 /**
@@ -164,18 +163,18 @@ void GameTextInput_showIme(GameTextInput *input, uint32_t flags);
 /**
  * Flags to be passed to GameTextInput_hideIme.
  */
-enum HideImeFlags {
-    HIDE_IME_UNDEFINED = 0,  // Default value.
-    HIDE_IMPLICIT_ONLY =
-        1,  // Indicates that the soft input window should only be hidden if it
-            // was not explicitly shown by the user.
-    HIDE_NOT_ALWAYS =
-        2,  // Indicates that the soft input window should normally be hidden,
-            // unless it was originally shown with SHOW_FORCED.
+enum HideImeFlags : uint32_t {
+  HIDE_IME_UNDEFINED = 0,  // Default value.
+  HIDE_IMPLICIT_ONLY =
+      1,  // Indicates that the soft input window should only be hidden if it
+          // was not explicitly shown by the user.
+  HIDE_NOT_ALWAYS =
+      2,  // Indicates that the soft input window should normally be hidden,
+          // unless it was originally shown with SHOW_FORCED.
 };
 
 /**
- * Show the IME. Calls InputMethodManager.hideSoftInputFromWindow().
+ * Hide the IME. Calls InputMethodManager.hideSoftInputFromWindow().
  * @param input A valid GameTextInput library handle.
  * @param flags Defined in HideImeFlags above. For more information see:
  * https://developer.android.com/reference/android/view/inputmethod/InputMethodManager
@@ -229,6 +228,9 @@ typedef void (*GameTextInputEventCallback)(
  * @param input A valid GameTextInput library handle.
  * @param callback Called by the library when the IME state changes.
  * @param context Context passed as first argument to the callback.
+ * <b>This function is deprecated. Don't perform any complex processing inside
+ * the callback other than copying the state variable. Using any synchronization
+ * primitives inside this callback may cause a deadlock.</b>
  */
 void GameTextInput_setEventCallback(GameTextInput *input,
                                     GameTextInputEventCallback callback,
@@ -298,6 +300,628 @@ void GameTextInputState_fromJava(const GameTextInput *input, jobject state,
                                  GameTextInputGetStateCallback callback,
                                  void *context);
 
+/**
+ * Definitions for inputType argument of GameActivity_setImeEditorInfo()
+ *
+ * <pre>
+ * |-------|-------|-------|-------|
+ *                              1111 TYPE_MASK_CLASS
+ *                      11111111     TYPE_MASK_VARIATION
+ *          111111111111             TYPE_MASK_FLAGS
+ * |-------|-------|-------|-------|
+ *                                   TYPE_NULL
+ * |-------|-------|-------|-------|
+ *                                 1 TYPE_CLASS_TEXT
+ *                             1     TYPE_TEXT_VARIATION_URI
+ *                            1      TYPE_TEXT_VARIATION_EMAIL_ADDRESS
+ *                            11     TYPE_TEXT_VARIATION_EMAIL_SUBJECT
+ *                           1       TYPE_TEXT_VARIATION_SHORT_MESSAGE
+ *                           1 1     TYPE_TEXT_VARIATION_LONG_MESSAGE
+ *                           11      TYPE_TEXT_VARIATION_PERSON_NAME
+ *                           111     TYPE_TEXT_VARIATION_POSTAL_ADDRESS
+ *                          1        TYPE_TEXT_VARIATION_PASSWORD
+ *                          1  1     TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
+ *                          1 1      TYPE_TEXT_VARIATION_WEB_EDIT_TEXT
+ *                          1 11     TYPE_TEXT_VARIATION_FILTER
+ *                          11       TYPE_TEXT_VARIATION_PHONETIC
+ *                          11 1     TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS
+ *                          111      TYPE_TEXT_VARIATION_WEB_PASSWORD
+ *                     1             TYPE_TEXT_FLAG_CAP_CHARACTERS
+ *                    1              TYPE_TEXT_FLAG_CAP_WORDS
+ *                   1               TYPE_TEXT_FLAG_CAP_SENTENCES
+ *                  1                TYPE_TEXT_FLAG_AUTO_CORRECT
+ *                 1                 TYPE_TEXT_FLAG_AUTO_COMPLETE
+ *                1                  TYPE_TEXT_FLAG_MULTI_LINE
+ *               1                   TYPE_TEXT_FLAG_IME_MULTI_LINE
+ *              1                    TYPE_TEXT_FLAG_NO_SUGGESTIONS
+ *             1 TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS
+ * |-------|-------|-------|-------|
+ *                                1  TYPE_CLASS_NUMBER
+ *                             1     TYPE_NUMBER_VARIATION_PASSWORD
+ *                     1             TYPE_NUMBER_FLAG_SIGNED
+ *                    1              TYPE_NUMBER_FLAG_DECIMAL
+ * |-------|-------|-------|-------|
+ *                                11 TYPE_CLASS_PHONE
+ * |-------|-------|-------|-------|
+ *                               1   TYPE_CLASS_DATETIME
+ *                             1     TYPE_DATETIME_VARIATION_DATE
+ *                            1      TYPE_DATETIME_VARIATION_TIME
+ * |-------|-------|-------|-------|</pre>
+ */
+
+enum GameTextInputType : uint32_t {
+  /**
+   * Mask of bits that determine the overall class
+   * of text being given.  Currently supported classes are:
+   * {@link #TYPE_CLASS_TEXT}, {@link #TYPE_CLASS_NUMBER},
+   * {@link #TYPE_CLASS_PHONE}, {@link #TYPE_CLASS_DATETIME}.
+   * <p>IME authors: If the class is not one you
+   * understand, assume {@link #TYPE_CLASS_TEXT} with NO variation
+   * or flags.<p>
+   */
+  TYPE_MASK_CLASS = 0x0000000f,
+
+  /**
+   * Mask of bits that determine the variation of
+   * the base content class.
+   */
+  TYPE_MASK_VARIATION = 0x00000ff0,
+
+  /**
+   * Mask of bits that provide addition bit flags
+   * of options.
+   */
+  TYPE_MASK_FLAGS = 0x00fff000,
+
+  /**
+   * Special content type for when no explicit type has been specified.
+   * This should be interpreted to mean that the target input connection
+   * is not rich, it can not process and show things like candidate text nor
+   * retrieve the current text, so the input method will need to run in a
+   * limited "generate key events" mode, if it supports it. Note that some
+   * input methods may not support it, for example a voice-based input
+   * method will likely not be able to generate key events even if this
+   * flag is set.
+   */
+  TYPE_NULL = 0x00000000,
+
+  // ----------------------------------------------------------------------
+
+  /**
+   * Class for normal text.  This class supports the following flags (only
+   * one of which should be set):
+   * {@link #TYPE_TEXT_FLAG_CAP_CHARACTERS},
+   * {@link #TYPE_TEXT_FLAG_CAP_WORDS}, and.
+   * {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}.  It also supports the
+   * following variations:
+   * {@link #TYPE_TEXT_VARIATION_NORMAL}, and
+   * {@link #TYPE_TEXT_VARIATION_URI}.  If you do not recognize the
+   * variation, normal should be assumed.
+   */
+  TYPE_CLASS_TEXT = 0x00000001,
+
+  /**
+   * Flag for {@link #TYPE_CLASS_TEXT}: capitalize all characters.  Overrides
+   * {@link #TYPE_TEXT_FLAG_CAP_WORDS} and
+   * {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}.  This value is explicitly defined
+   * to be the same as {@link TextUtils#CAP_MODE_CHARACTERS}. Of course,
+   * this only affects languages where there are upper-case and lower-case
+   * letters.
+   */
+  TYPE_TEXT_FLAG_CAP_CHARACTERS = 0x00001000,
+
+  /**
+   * Flag for {@link #TYPE_CLASS_TEXT}: capitalize the first character of
+   * every word.  Overrides {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}.  This
+   * value is explicitly defined
+   * to be the same as {@link TextUtils#CAP_MODE_WORDS}. Of course,
+   * this only affects languages where there are upper-case and lower-case
+   * letters.
+   */
+  TYPE_TEXT_FLAG_CAP_WORDS = 0x00002000,
+
+  /**
+   * Flag for {@link #TYPE_CLASS_TEXT}: capitalize the first character of
+   * each sentence.  This value is explicitly defined
+   * to be the same as {@link TextUtils#CAP_MODE_SENTENCES}. For example
+   * in English it means to capitalize after a period and a space (note that
+   * other languages may have different characters for period, or not use
+   * spaces, or use different grammatical rules). Of course, this only affects
+   * languages where there are upper-case and lower-case letters.
+   */
+  TYPE_TEXT_FLAG_CAP_SENTENCES = 0x00004000,
+
+  /**
+   * Flag for {@link #TYPE_CLASS_TEXT}: the user is entering free-form
+   * text that should have auto-correction applied to it. Without this flag,
+   * the IME will not try to correct typos. You should always set this flag
+   * unless you really expect users to type non-words in this field, for
+   * example to choose a name for a character in a game.
+   * Contrast this with {@link #TYPE_TEXT_FLAG_AUTO_COMPLETE} and
+   * {@link #TYPE_TEXT_FLAG_NO_SUGGESTIONS}:
+   * {@code TYPE_TEXT_FLAG_AUTO_CORRECT} means that the IME will try to
+   * auto-correct typos as the user is typing, but does not define whether
+   * the IME offers an interface to show suggestions.
+   */
+  TYPE_TEXT_FLAG_AUTO_CORRECT = 0x00008000,
+
+  /**
+   * Flag for {@link #TYPE_CLASS_TEXT}: the text editor (which means
+   * the application) is performing auto-completion of the text being entered
+   * based on its own semantics, which it will present to the user as they type.
+   * This generally means that the input method should not be showing
+   * candidates itself, but can expect the editor to supply its own
+   * completions/candidates from
+   * {@link android.view.inputmethod.InputMethodSession#displayCompletions
+   * InputMethodSession.displayCompletions()} as a result of the editor calling
+   * {@link android.view.inputmethod.InputMethodManager#displayCompletions
+   * InputMethodManager.displayCompletions()}.
+   * Note the contrast with {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} and
+   * {@link #TYPE_TEXT_FLAG_NO_SUGGESTIONS}:
+   * {@code TYPE_TEXT_FLAG_AUTO_COMPLETE} means the editor should show an
+   * interface for displaying suggestions, but instead of supplying its own
+   * it will rely on the Editor to pass completions/corrections.
+   */
+  TYPE_TEXT_FLAG_AUTO_COMPLETE = 0x00010000,
+
+  /**
+   * Flag for {@link #TYPE_CLASS_TEXT}: multiple lines of text can be
+   * entered into the field.  If this flag is not set, the text field
+   * will be constrained to a single line. The IME may also choose not to
+   * display an enter key when this flag is not set, as there should be no
+   * need to create new lines.
+   */
+  TYPE_TEXT_FLAG_MULTI_LINE = 0x00020000,
+
+  /**
+   * Flag for {@link #TYPE_CLASS_TEXT}: the regular text view associated
+   * with this should not be multi-line, but when a fullscreen input method
+   * is providing text it should use multiple lines if it can.
+   */
+  TYPE_TEXT_FLAG_IME_MULTI_LINE = 0x00040000,
+
+  /**
+   * Flag for {@link #TYPE_CLASS_TEXT}: the input method does not need to
+   * display any dictionary-based candidates. This is useful for text views that
+   * do not contain words from the language and do not benefit from any
+   * dictionary-based completions or corrections. It overrides the
+   * {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} value when set.
+   * Please avoid using this unless you are certain this is what you want.
+   * Many input methods need suggestions to work well, for example the ones
+   * based on gesture typing. Consider clearing
+   * {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} instead if you just do not
+   * want the IME to correct typos.
+   * Note the contrast with {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} and
+   * {@link #TYPE_TEXT_FLAG_AUTO_COMPLETE}:
+   * {@code TYPE_TEXT_FLAG_NO_SUGGESTIONS} means the IME does not need to
+   * show an interface to display suggestions. Most IMEs will also take this to
+   * mean they do not need to try to auto-correct what the user is typing.
+   */
+  TYPE_TEXT_FLAG_NO_SUGGESTIONS = 0x00080000,
+
+  /**
+   * Flag for {@link #TYPE_CLASS_TEXT}: Let the IME know the text conversion
+   * suggestions are required by the application. Text conversion suggestion is
+   * for the transliteration languages which has pronunciation characters and
+   * target characters. When the user is typing the pronunciation charactes, the
+   * IME could provide the possible target characters to the user. When this
+   * flag is set, the IME should insert the text conversion suggestions through
+   * {@link Builder#setTextConversionSuggestions(List)} and
+   * the {@link TextAttribute} with initialized with the text conversion
+   * suggestions is provided by the IME to the application. To receive the
+   * additional information, the application needs to implement {@link
+   * InputConnection#setComposingText(CharSequence, int, TextAttribute)},
+   * {@link InputConnection#setComposingRegion(int, int, TextAttribute)}, and
+   * {@link InputConnection#commitText(CharSequence, int, TextAttribute)}.
+   */
+  TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS = 0x00100000,
+
+  // ----------------------------------------------------------------------
+
+  /**
+   * Default variation of {@link #TYPE_CLASS_TEXT}: plain old normal text.
+   */
+  TYPE_TEXT_VARIATION_NORMAL = 0x00000000,
+
+  /**
+   * Variation of {@link #TYPE_CLASS_TEXT}: entering a URI.
+   */
+  TYPE_TEXT_VARIATION_URI = 0x00000010,
+
+  /**
+   * Variation of {@link #TYPE_CLASS_TEXT}: entering an e-mail address.
+   */
+  TYPE_TEXT_VARIATION_EMAIL_ADDRESS = 0x00000020,
+
+  /**
+   * Variation of {@link #TYPE_CLASS_TEXT}: entering the subject line of
+   * an e-mail.
+   */
+  TYPE_TEXT_VARIATION_EMAIL_SUBJECT = 0x00000030,
+
+  /**
+   * Variation of {@link #TYPE_CLASS_TEXT}: entering a short, possibly informal
+   * message such as an instant message or a text message.
+   */
+  TYPE_TEXT_VARIATION_SHORT_MESSAGE = 0x00000040,
+
+  /**
+   * Variation of {@link #TYPE_CLASS_TEXT}: entering the content of a long,
+   * possibly formal message such as the body of an e-mail.
+   */
+  TYPE_TEXT_VARIATION_LONG_MESSAGE = 0x00000050,
+
+  /**
+   * Variation of {@link #TYPE_CLASS_TEXT}: entering the name of a person.
+   */
+  TYPE_TEXT_VARIATION_PERSON_NAME = 0x00000060,
+
+  /**
+   * Variation of {@link #TYPE_CLASS_TEXT}: entering a postal mailing address.
+   */
+  TYPE_TEXT_VARIATION_POSTAL_ADDRESS = 0x00000070,
+
+  /**
+   * Variation of {@link #TYPE_CLASS_TEXT}: entering a password.
+   */
+  TYPE_TEXT_VARIATION_PASSWORD = 0x00000080,
+
+  /**
+   * Variation of {@link #TYPE_CLASS_TEXT}: entering a password, which should
+   * be visible to the user.
+   */
+  TYPE_TEXT_VARIATION_VISIBLE_PASSWORD = 0x00000090,
+
+  /**
+   * Variation of {@link #TYPE_CLASS_TEXT}: entering text inside of a web form.
+   */
+  TYPE_TEXT_VARIATION_WEB_EDIT_TEXT = 0x000000a0,
+
+  /**
+   * Variation of {@link #TYPE_CLASS_TEXT}: entering text to filter contents
+   * of a list etc.
+   */
+  TYPE_TEXT_VARIATION_FILTER = 0x000000b0,
+
+  /**
+   * Variation of {@link #TYPE_CLASS_TEXT}: entering text for phonetic
+   * pronunciation, such as a phonetic name field in contacts. This is mostly
+   * useful for languages where one spelling may have several phonetic
+   * readings, like Japanese.
+   */
+  TYPE_TEXT_VARIATION_PHONETIC = 0x000000c0,
+
+  /**
+   * Variation of {@link #TYPE_CLASS_TEXT}: entering e-mail address inside
+   * of a web form.  This was added in
+   * {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An IME must target
+   * this API version or later to see this input type; if it doesn't, a request
+   * for this type will be seen as {@link #TYPE_TEXT_VARIATION_EMAIL_ADDRESS}
+   * when passed through {@link
+   * android.view.inputmethod.EditorInfo#makeCompatible(int)
+   * EditorInfo.makeCompatible(int)}.
+   */
+  TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS = 0x000000d0,
+
+  /**
+   * Variation of {@link #TYPE_CLASS_TEXT}: entering password inside
+   * of a web form.  This was added in
+   * {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An IME must target
+   * this API version or later to see this input type; if it doesn't, a request
+   * for this type will be seen as {@link #TYPE_TEXT_VARIATION_PASSWORD}
+   * when passed through {@link
+   * android.view.inputmethod.EditorInfo#makeCompatible(int)
+   * EditorInfo.makeCompatible(int)}.
+   */
+  TYPE_TEXT_VARIATION_WEB_PASSWORD = 0x000000e0,
+
+  // ----------------------------------------------------------------------
+
+  /**
+   * Class for numeric text.  This class supports the following flags:
+   * {@link #TYPE_NUMBER_FLAG_SIGNED} and
+   * {@link #TYPE_NUMBER_FLAG_DECIMAL}.  It also supports the following
+   * variations: {@link #TYPE_NUMBER_VARIATION_NORMAL} and
+   * {@link #TYPE_NUMBER_VARIATION_PASSWORD}.
+   * <p>IME authors: If you do not recognize
+   * the variation, normal should be assumed.</p>
+   */
+  TYPE_CLASS_NUMBER = 0x00000002,
+
+  /**
+   * Flag of {@link #TYPE_CLASS_NUMBER}: the number is signed, allowing
+   * a positive or negative sign at the start.
+   */
+  TYPE_NUMBER_FLAG_SIGNED = 0x00001000,
+
+  /**
+   * Flag of {@link #TYPE_CLASS_NUMBER}: the number is decimal, allowing
+   * a decimal point to provide fractional values.
+   */
+  TYPE_NUMBER_FLAG_DECIMAL = 0x00002000,
+
+  // ----------------------------------------------------------------------
+
+  /**
+   * Default variation of {@link #TYPE_CLASS_NUMBER}: plain normal
+   * numeric text.  This was added in
+   * {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An IME must target
+   * this API version or later to see this input type; if it doesn't, a request
+   * for this type will be dropped when passed through
+   * {@link android.view.inputmethod.EditorInfo#makeCompatible(int)
+   * EditorInfo.makeCompatible(int)}.
+   */
+  TYPE_NUMBER_VARIATION_NORMAL = 0x00000000,
+
+  /**
+   * Variation of {@link #TYPE_CLASS_NUMBER}: entering a numeric password.
+   * This was added in {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An
+   * IME must target this API version or later to see this input type; if it
+   * doesn't, a request for this type will be dropped when passed
+   * through {@link android.view.inputmethod.EditorInfo#makeCompatible(int)
+   * EditorInfo.makeCompatible(int)}.
+   */
+  TYPE_NUMBER_VARIATION_PASSWORD = 0x00000010,
+
+  // ----------------------------------------------------------------------
+  /**
+   * Class for a phone number.  This class currently supports no variations
+   * or flags.
+   */
+  TYPE_CLASS_PHONE = 0x00000003,
+
+  // ----------------------------------------------------------------------
+
+  /**
+   * Class for dates and times.  It supports the
+   * following variations:
+   * {@link #TYPE_DATETIME_VARIATION_NORMAL}
+   * {@link #TYPE_DATETIME_VARIATION_DATE}, and
+   * {@link #TYPE_DATETIME_VARIATION_TIME}.
+   */
+  TYPE_CLASS_DATETIME = 0x00000004,
+
+  /**
+   * Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering
+   * both a date and time.
+   */
+  TYPE_DATETIME_VARIATION_NORMAL = 0x00000000,
+
+  /**
+   * Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering
+   * only a date.
+   */
+  TYPE_DATETIME_VARIATION_DATE = 0x00000010,
+
+  /**
+   * Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering
+   * only a time.
+   */
+  TYPE_DATETIME_VARIATION_TIME = 0x00000020,
+};
+
+/**
+ * actionId and imeOptions argument of GameActivity_setImeEditorInfo().
+ *
+ * <pre>
+ * |-------|-------|-------|-------|
+ *                              1111 IME_MASK_ACTION
+ * |-------|-------|-------|-------|
+ *                                   IME_ACTION_UNSPECIFIED
+ *                                 1 IME_ACTION_NONE
+ *                                1  IME_ACTION_GO
+ *                                11 IME_ACTION_SEARCH
+ *                               1   IME_ACTION_SEND
+ *                               1 1 IME_ACTION_NEXT
+ *                               11  IME_ACTION_DONE
+ *                               111 IME_ACTION_PREVIOUS
+ *         1                         IME_FLAG_NO_PERSONALIZED_LEARNING
+ *        1                          IME_FLAG_NO_FULLSCREEN
+ *       1                           IME_FLAG_NAVIGATE_PREVIOUS
+ *      1                            IME_FLAG_NAVIGATE_NEXT
+ *     1                             IME_FLAG_NO_EXTRACT_UI
+ *    1                              IME_FLAG_NO_ACCESSORY_ACTION
+ *   1                               IME_FLAG_NO_ENTER_ACTION
+ *  1                                IME_FLAG_FORCE_ASCII
+ * |-------|-------|-------|-------|</pre>
+ */
+
+enum GameTextInputActionType : uint32_t {
+  /**
+   * Set of bits in {@link #imeOptions} that provide alternative actions
+   * associated with the "enter" key.  This both helps the IME provide
+   * better feedback about what the enter key will do, and also allows it
+   * to provide alternative mechanisms for providing that command.
+   */
+  IME_MASK_ACTION = 0x000000ff,
+
+  /**
+   * Bits of {@link #IME_MASK_ACTION}: no specific action has been
+   * associated with this editor, let the editor come up with its own if
+   * it can.
+   */
+  IME_ACTION_UNSPECIFIED = 0x00000000,
+
+  /**
+   * Bits of {@link #IME_MASK_ACTION}: there is no available action.
+   */
+  IME_ACTION_NONE = 0x00000001,
+
+  /**
+   * Bits of {@link #IME_MASK_ACTION}: the action key performs a "go"
+   * operation to take the user to the target of the text they typed.
+   * Typically used, for example, when entering a URL.
+   */
+  IME_ACTION_GO = 0x00000002,
+
+  /**
+   * Bits of {@link #IME_MASK_ACTION}: the action key performs a "search"
+   * operation, taking the user to the results of searching for the text
+   * they have typed (in whatever context is appropriate).
+   */
+  IME_ACTION_SEARCH = 0x00000003,
+
+  /**
+   * Bits of {@link #IME_MASK_ACTION}: the action key performs a "send"
+   * operation, delivering the text to its target.  This is typically used
+   * when composing a message in IM or SMS where sending is immediate.
+   */
+  IME_ACTION_SEND = 0x00000004,
+
+  /**
+   * Bits of {@link #IME_MASK_ACTION}: the action key performs a "next"
+   * operation, taking the user to the next field that will accept text.
+   */
+  IME_ACTION_NEXT = 0x00000005,
+
+  /**
+   * Bits of {@link #IME_MASK_ACTION}: the action key performs a "done"
+   * operation, typically meaning there is nothing more to input and the
+   * IME will be closed.
+   */
+  IME_ACTION_DONE = 0x00000006,
+
+  /**
+   * Bits of {@link #IME_MASK_ACTION}: like {@link #IME_ACTION_NEXT}, but
+   * for moving to the previous field.  This will normally not be used to
+   * specify an action (since it precludes {@link #IME_ACTION_NEXT}), but
+   * can be returned to the app if it sets {@link #IME_FLAG_NAVIGATE_PREVIOUS}.
+   */
+  IME_ACTION_PREVIOUS = 0x00000007,
+};
+
+enum GameTextInputImeOptions : uint32_t {
+  /**
+   * Flag of {@link #imeOptions}: used to request that the IME should not update
+   * any personalized data such as typing history and personalized language
+   * model based on what the user typed on this text editing object.  Typical
+   * use cases are: <ul> <li>When the application is in a special mode, where
+   * user's activities are expected to be not recorded in the application's
+   * history.  Some web browsers and chat applications may have this kind of
+   * modes.</li> <li>When storing typing history does not make much sense.
+   * Specifying this flag in typing games may help to avoid typing history from
+   * being filled up with words that the user is less likely to type in their
+   * daily life.  Another example is that when the application already knows
+   * that the expected input is not a valid word (e.g. a promotion code that is
+   *     not a valid word in any natural language).</li>
+   * </ul>
+   *
+   * <p>Applications need to be aware that the flag is not a guarantee, and some
+   * IMEs may not respect it.</p>
+   */
+  IME_FLAG_NO_PERSONALIZED_LEARNING = 0x1000000,
+
+  /**
+   * Flag of {@link #imeOptions}: used to request that the IME never go
+   * into fullscreen mode.
+   * By default, IMEs may go into full screen mode when they think
+   * it's appropriate, for example on small screens in landscape
+   * orientation where displaying a software keyboard may occlude
+   * such a large portion of the screen that the remaining part is
+   * too small to meaningfully display the application UI.
+   * If this flag is set, compliant IMEs will never go into full screen mode,
+   * and always leave some space to display the application UI.
+   * Applications need to be aware that the flag is not a guarantee, and
+   * some IMEs may ignore it.
+   */
+  IME_FLAG_NO_FULLSCREEN = 0x2000000,
+
+  /**
+   * Flag of {@link #imeOptions}: like {@link #IME_FLAG_NAVIGATE_NEXT}, but
+   * specifies there is something interesting that a backward navigation
+   * can focus on.  If the user selects the IME's facility to backward
+   * navigate, this will show up in the application as an {@link
+   * #IME_ACTION_PREVIOUS} at {@link InputConnection#performEditorAction(int)
+   * InputConnection.performEditorAction(int)}.
+   */
+  IME_FLAG_NAVIGATE_PREVIOUS = 0x4000000,
+
+  /**
+   * Flag of {@link #imeOptions}: used to specify that there is something
+   * interesting that a forward navigation can focus on. This is like using
+   * {@link #IME_ACTION_NEXT}, except allows the IME to be multiline (with
+   * an enter key) as well as provide forward navigation.  Note that some
+   * IMEs may not be able to do this, especially when running on a small
+   * screen where there is little space.  In that case it does not need to
+   * present a UI for this option.  Like {@link #IME_ACTION_NEXT}, if the
+   * user selects the IME's facility to forward navigate, this will show up
+   * in the application at {@link InputConnection#performEditorAction(int)
+   * InputConnection.performEditorAction(int)}.
+   */
+  IME_FLAG_NAVIGATE_NEXT = 0x8000000,
+
+  /**
+   * Flag of {@link #imeOptions}: used to specify that the IME does not need
+   * to show its extracted text UI.  For input methods that may be fullscreen,
+   * often when in landscape mode, this allows them to be smaller and let part
+   * of the application be shown behind, through transparent UI parts in the
+   * fullscreen IME. The part of the UI visible to the user may not be
+   * responsive to touch because the IME will receive touch events, which may
+   * confuse the user; use {@link #IME_FLAG_NO_FULLSCREEN} instead for a better
+   * experience. Using this flag is discouraged and it may become deprecated in
+   * the future. Its meaning is unclear in some situations and it may not work
+   * appropriately on older versions of the platform.
+   */
+  IME_FLAG_NO_EXTRACT_UI = 0x10000000,
+
+  /**
+   * Flag of {@link #imeOptions}: used in conjunction with one of the actions
+   * masked by {@link #IME_MASK_ACTION}, this indicates that the action
+   * should not be available as an accessory button on the right of the
+   * extracted text when the input method is full-screen. Note that by setting
+   * this flag, there can be cases where the action is simply never available to
+   * the user. Setting this generally means that you think that in fullscreen
+   * mode, where there is little space to show the text, it's not worth taking
+   * some screen real estate to display the action and it should be used instead
+   * to show more text.
+   */
+  IME_FLAG_NO_ACCESSORY_ACTION = 0x20000000,
+
+  /**
+   * Flag of {@link #imeOptions}: used in conjunction with one of the actions
+   * masked by {@link #IME_MASK_ACTION}. If this flag is not set, IMEs will
+   * normally replace the "enter" key with the action supplied. This flag
+   * indicates that the action should not be available in-line as a replacement
+   * for the "enter" key. Typically this is because the action has such a
+   * significant impact or is not recoverable enough that accidentally hitting
+   * it should be avoided, such as sending a message. Note that
+   * {@link android.widget.TextView} will automatically set this flag for you
+   * on multi-line text views.
+   */
+  IME_FLAG_NO_ENTER_ACTION = 0x40000000,
+
+  /**
+   * Flag of {@link #imeOptions}: used to request an IME that is capable of
+   * inputting ASCII characters.  The intention of this flag is to ensure that
+   * the user can type Roman alphabet characters in a {@link
+   * android.widget.TextView}. It is typically used for an account ID or
+   * password input. A lot of the time, IMEs are already able to input ASCII
+   * even without being told so (such IMEs already respect this flag in a
+   * sense), but there are cases when this is not the default. For instance,
+   * users of languages using a different script like Arabic, Greek, Hebrew or
+   * Russian typically have a keyboard that can't input ASCII characters by
+   * default. Applications need to be aware that the flag is not a guarantee,
+   * and some IMEs may not respect it. However, it is strongly recommended for
+   * IME authors to respect this flag especially when their IME could end up
+   * with a state where only languages using non-ASCII are enabled.
+   */
+  IME_FLAG_FORCE_ASCII = 0x80000000,
+
+  /**
+   * Flag of {@link #internalImeOptions}: flag is set when app window containing
+   * this
+   * {@link EditorInfo} is using {@link Configuration#ORIENTATION_PORTRAIT}
+   * mode.
+   * @hide
+   */
+  IME_INTERNAL_FLAG_APP_WINDOW_PORTRAIT = 0x00000001,
+
+  /**
+   * Generic unspecified type for {@link #imeOptions}.
+   */
+  IME_NULL = 0x00000000,
+};
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/src/game-text-input/gametextinput.cpp b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/src/game-text-input/gametextinput.cpp
new file mode 100644
index 0000000..70a5938
--- /dev/null
+++ b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/src/game-text-input/gametextinput.cpp
@@ -0,0 +1,386 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "game-text-input/gametextinput.h"
+
+#include <android/log.h>
+#include <jni.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <algorithm>
+#include <memory>
+#include <mutex>
+#include <vector>
+
+#define LOG_TAG "GameTextInput"
+
+static constexpr int32_t DEFAULT_MAX_STRING_SIZE = 1 << 16;
+
+// Cache of field ids in the Java GameTextInputState class
+struct StateClassInfo {
+  jfieldID text;
+  jfieldID selectionStart;
+  jfieldID selectionEnd;
+  jfieldID composingRegionStart;
+  jfieldID composingRegionEnd;
+};
+
+// Main GameTextInput object.
+struct GameTextInput {
+ public:
+  GameTextInput(JNIEnv *env, uint32_t max_string_size);
+  ~GameTextInput();
+  void setState(const GameTextInputState &state);
+  GameTextInputState getState() const {
+    std::lock_guard<std::mutex> lock(currentStateMutex_);
+    return currentState_;
+  }
+  void setInputConnection(jobject inputConnection);
+  void processEvent(jobject textInputEvent);
+  void showIme(uint32_t flags);
+  void hideIme(uint32_t flags);
+  void restartInput();
+  void setEventCallback(GameTextInputEventCallback callback, void *context);
+  jobject stateToJava(const GameTextInputState &state) const;
+  void stateFromJava(jobject textInputEvent,
+                     GameTextInputGetStateCallback callback,
+                     void *context) const;
+  void setImeInsetsCallback(GameTextInputImeInsetsCallback callback,
+                            void *context);
+  void processImeInsets(const ARect *insets);
+  const ARect &getImeInsets() const { return currentInsets_; }
+
+ private:
+  // Copy string and set other fields
+  void setStateInner(const GameTextInputState &state);
+  static void processCallback(void *context, const GameTextInputState *state);
+  JNIEnv *env_ = nullptr;
+  // Cached at initialization from
+  // com/google/androidgamesdk/gametextinput/State.
+  jclass stateJavaClass_ = nullptr;
+  // The latest text input update.
+  GameTextInputState currentState_ = {};
+  // A mutex to protect currentState_.
+  mutable std::mutex currentStateMutex_;
+  // An instance of gametextinput.InputConnection.
+  jclass inputConnectionClass_ = nullptr;
+  jobject inputConnection_ = nullptr;
+  jmethodID inputConnectionSetStateMethod_;
+  jmethodID setSoftKeyboardActiveMethod_;
+  jmethodID restartInputMethod_;
+  void (*eventCallback_)(void *context,
+                         const struct GameTextInputState *state) = nullptr;
+  void *eventCallbackContext_ = nullptr;
+  void (*insetsCallback_)(void *context, const struct ARect *insets) = nullptr;
+  ARect currentInsets_ = {};
+  void *insetsCallbackContext_ = nullptr;
+  StateClassInfo stateClassInfo_ = {};
+  // Constant-sized buffer used to store state text.
+  std::vector<char> stateStringBuffer_;
+};
+
+std::unique_ptr<GameTextInput> s_gameTextInput;
+
+extern "C" {
+
+///////////////////////////////////////////////////////////
+/// GameTextInputState C Functions
+///////////////////////////////////////////////////////////
+
+// Convert to a Java structure.
+jobject currentState_toJava(const GameTextInput *gameTextInput,
+                            const GameTextInputState *state) {
+  if (state == nullptr) return NULL;
+  return gameTextInput->stateToJava(*state);
+}
+
+// Convert from Java structure.
+void currentState_fromJava(const GameTextInput *gameTextInput,
+                           jobject textInputEvent,
+                           GameTextInputGetStateCallback callback,
+                           void *context) {
+  gameTextInput->stateFromJava(textInputEvent, callback, context);
+}
+
+///////////////////////////////////////////////////////////
+/// GameTextInput C Functions
+///////////////////////////////////////////////////////////
+
+struct GameTextInput *GameTextInput_init(JNIEnv *env,
+                                         uint32_t max_string_size) {
+  if (s_gameTextInput.get() != nullptr) {
+    __android_log_print(ANDROID_LOG_WARN, LOG_TAG,
+                        "Warning: called GameTextInput_init twice without "
+                        "calling GameTextInput_destroy");
+    return s_gameTextInput.get();
+  }
+  // Don't use make_unique, for C++11 compatibility
+  s_gameTextInput =
+      std::unique_ptr<GameTextInput>(new GameTextInput(env, max_string_size));
+  return s_gameTextInput.get();
+}
+
+void GameTextInput_destroy(GameTextInput *input) {
+  if (input == nullptr || s_gameTextInput.get() == nullptr) return;
+  s_gameTextInput.reset();
+}
+
+void GameTextInput_setState(GameTextInput *input,
+                            const GameTextInputState *state) {
+  if (state == nullptr) return;
+  input->setState(*state);
+}
+
+void GameTextInput_getState(GameTextInput *input,
+                            GameTextInputGetStateCallback callback,
+                            void *context) {
+  GameTextInputState state = input->getState();
+  callback(context, &state);
+}
+
+void GameTextInput_setInputConnection(GameTextInput *input,
+                                      jobject inputConnection) {
+  input->setInputConnection(inputConnection);
+}
+
+void GameTextInput_processEvent(GameTextInput *input, jobject textInputEvent) {
+  input->processEvent(textInputEvent);
+}
+
+void GameTextInput_processImeInsets(GameTextInput *input, const ARect *insets) {
+  input->processImeInsets(insets);
+}
+
+void GameTextInput_showIme(struct GameTextInput *input, uint32_t flags) {
+  input->showIme(flags);
+}
+
+void GameTextInput_hideIme(struct GameTextInput *input, uint32_t flags) {
+  input->hideIme(flags);
+}
+
+void GameTextInput_restartInput(struct GameTextInput *input) {
+  input->restartInput();
+}
+
+void GameTextInput_setEventCallback(struct GameTextInput *input,
+                                    GameTextInputEventCallback callback,
+                                    void *context) {
+  input->setEventCallback(callback, context);
+}
+
+void GameTextInput_setImeInsetsCallback(struct GameTextInput *input,
+                                        GameTextInputImeInsetsCallback callback,
+                                        void *context) {
+  input->setImeInsetsCallback(callback, context);
+}
+
+void GameTextInput_getImeInsets(const GameTextInput *input, ARect *insets) {
+  *insets = input->getImeInsets();
+}
+
+}  // extern "C"
+
+///////////////////////////////////////////////////////////
+/// GameTextInput C++ class Implementation
+///////////////////////////////////////////////////////////
+
+GameTextInput::GameTextInput(JNIEnv *env, uint32_t max_string_size)
+    : env_(env),
+      stateStringBuffer_(max_string_size == 0 ? DEFAULT_MAX_STRING_SIZE
+                                              : max_string_size) {
+  stateJavaClass_ = (jclass)env_->NewGlobalRef(
+      env_->FindClass("com/google/androidgamesdk/gametextinput/State"));
+  inputConnectionClass_ = (jclass)env_->NewGlobalRef(env_->FindClass(
+      "com/google/androidgamesdk/gametextinput/InputConnection"));
+  inputConnectionSetStateMethod_ =
+      env_->GetMethodID(inputConnectionClass_, "setState",
+                        "(Lcom/google/androidgamesdk/gametextinput/State;)V");
+  setSoftKeyboardActiveMethod_ = env_->GetMethodID(
+      inputConnectionClass_, "setSoftKeyboardActive", "(ZI)V");
+  restartInputMethod_ =
+      env_->GetMethodID(inputConnectionClass_, "restartInput", "()V");
+
+  stateClassInfo_.text =
+      env_->GetFieldID(stateJavaClass_, "text", "Ljava/lang/String;");
+  stateClassInfo_.selectionStart =
+      env_->GetFieldID(stateJavaClass_, "selectionStart", "I");
+  stateClassInfo_.selectionEnd =
+      env_->GetFieldID(stateJavaClass_, "selectionEnd", "I");
+  stateClassInfo_.composingRegionStart =
+      env_->GetFieldID(stateJavaClass_, "composingRegionStart", "I");
+  stateClassInfo_.composingRegionEnd =
+      env_->GetFieldID(stateJavaClass_, "composingRegionEnd", "I");
+}
+
+GameTextInput::~GameTextInput() {
+  if (stateJavaClass_ != NULL) {
+    env_->DeleteGlobalRef(stateJavaClass_);
+    stateJavaClass_ = NULL;
+  }
+  if (inputConnectionClass_ != NULL) {
+    env_->DeleteGlobalRef(inputConnectionClass_);
+    inputConnectionClass_ = NULL;
+  }
+  if (inputConnection_ != NULL) {
+    env_->DeleteGlobalRef(inputConnection_);
+    inputConnection_ = NULL;
+  }
+}
+
+void GameTextInput::setState(const GameTextInputState &state) {
+  if (inputConnection_ == nullptr) return;
+  jobject jstate = stateToJava(state);
+  env_->CallVoidMethod(inputConnection_, inputConnectionSetStateMethod_,
+                       jstate);
+  env_->DeleteLocalRef(jstate);
+  setStateInner(state);
+}
+
+void GameTextInput::setStateInner(const GameTextInputState &state) {
+  std::lock_guard<std::mutex> lock(currentStateMutex_);
+
+  // Check if we're setting using our own string (other parts may be
+  // different)
+  if (state.text_UTF8 == currentState_.text_UTF8) {
+    currentState_ = state;
+    return;
+  }
+  // Otherwise, copy across the string.
+  auto bytes_needed =
+      std::min(static_cast<uint32_t>(state.text_length + 1),
+               static_cast<uint32_t>(stateStringBuffer_.size()));
+  currentState_.text_UTF8 = stateStringBuffer_.data();
+  std::copy(state.text_UTF8, state.text_UTF8 + bytes_needed - 1,
+            stateStringBuffer_.data());
+  currentState_.text_length = state.text_length;
+  currentState_.selection = state.selection;
+  currentState_.composingRegion = state.composingRegion;
+  stateStringBuffer_[bytes_needed - 1] = 0;
+}
+
+void GameTextInput::setInputConnection(jobject inputConnection) {
+  if (inputConnection_ != NULL) {
+    env_->DeleteGlobalRef(inputConnection_);
+  }
+  inputConnection_ = env_->NewGlobalRef(inputConnection);
+}
+
+/*static*/ void GameTextInput::processCallback(
+    void *context, const GameTextInputState *state) {
+  auto thiz = static_cast<GameTextInput *>(context);
+  if (state != nullptr) thiz->setStateInner(*state);
+}
+
+void GameTextInput::processEvent(jobject textInputEvent) {
+  stateFromJava(textInputEvent, processCallback, this);
+  if (eventCallback_) {
+    std::lock_guard<std::mutex> lock(currentStateMutex_);
+    eventCallback_(eventCallbackContext_, &currentState_);
+  }
+}
+
+void GameTextInput::showIme(uint32_t flags) {
+  if (inputConnection_ == nullptr) return;
+  env_->CallVoidMethod(inputConnection_, setSoftKeyboardActiveMethod_, true,
+                       static_cast<jint>(flags));
+}
+
+void GameTextInput::setEventCallback(GameTextInputEventCallback callback,
+                                     void *context) {
+  eventCallback_ = callback;
+  eventCallbackContext_ = context;
+}
+
+void GameTextInput::setImeInsetsCallback(
+    GameTextInputImeInsetsCallback callback, void *context) {
+  insetsCallback_ = callback;
+  insetsCallbackContext_ = context;
+}
+
+void GameTextInput::processImeInsets(const ARect *insets) {
+  currentInsets_ = *insets;
+  if (insetsCallback_) {
+    insetsCallback_(insetsCallbackContext_, &currentInsets_);
+  }
+}
+
+void GameTextInput::hideIme(uint32_t flags) {
+  if (inputConnection_ == nullptr) return;
+  env_->CallVoidMethod(inputConnection_, setSoftKeyboardActiveMethod_, false,
+                       static_cast<jint>(flags));
+}
+
+void GameTextInput::restartInput() {
+  if (inputConnection_ == nullptr) return;
+  env_->CallVoidMethod(inputConnection_, restartInputMethod_);
+}
+
+jobject GameTextInput::stateToJava(const GameTextInputState &state) const {
+  static jmethodID constructor = nullptr;
+  if (constructor == nullptr) {
+    constructor = env_->GetMethodID(stateJavaClass_, "<init>",
+                                    "(Ljava/lang/String;IIII)V");
+    if (constructor == nullptr) {
+      __android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
+                          "Can't find gametextinput.State constructor");
+      return nullptr;
+    }
+  }
+  const char *text = state.text_UTF8;
+  if (text == nullptr) {
+    static char empty_string[] = "";
+    text = empty_string;
+  }
+  // Note that this expects 'modified' UTF-8 which is not the same as UTF-8
+  // https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8
+  jstring jtext = env_->NewStringUTF(text);
+  jobject jobj =
+      env_->NewObject(stateJavaClass_, constructor, jtext,
+                      state.selection.start, state.selection.end,
+                      state.composingRegion.start, state.composingRegion.end);
+  env_->DeleteLocalRef(jtext);
+  return jobj;
+}
+
+void GameTextInput::stateFromJava(jobject textInputEvent,
+                                  GameTextInputGetStateCallback callback,
+                                  void *context) const {
+  jstring text =
+      (jstring)env_->GetObjectField(textInputEvent, stateClassInfo_.text);
+  // Note this is 'modified' UTF-8, not true UTF-8. It has no NULLs in it,
+  // except at the end. It's actually not specified whether the value returned
+  // by GetStringUTFChars includes a null at the end, but it *seems to* on
+  // Android.
+  const char *text_chars = env_->GetStringUTFChars(text, NULL);
+  int text_len = env_->GetStringUTFLength(
+      text);  // Length in bytes, *not* including the null.
+  int selectionStart =
+      env_->GetIntField(textInputEvent, stateClassInfo_.selectionStart);
+  int selectionEnd =
+      env_->GetIntField(textInputEvent, stateClassInfo_.selectionEnd);
+  int composingRegionStart =
+      env_->GetIntField(textInputEvent, stateClassInfo_.composingRegionStart);
+  int composingRegionEnd =
+      env_->GetIntField(textInputEvent, stateClassInfo_.composingRegionEnd);
+  GameTextInputState state{text_chars,
+                           text_len,
+                           {selectionStart, selectionEnd},
+                           {composingRegionStart, composingRegionEnd}};
+  callback(context, &state);
+  env_->ReleaseStringUTFChars(text, text_chars);
+  env_->DeleteLocalRef(text);
+}
diff --git a/android-activity/android-games-sdk/include/common/gamesdk_common.h b/android-activity/android-games-sdk/include/common/gamesdk_common.h
index d29ac01..25ce813 100644
--- a/android-activity/android-games-sdk/include/common/gamesdk_common.h
+++ b/android-activity/android-games-sdk/include/common/gamesdk_common.h
@@ -31,11 +31,12 @@
 
 // There are separate versions for each GameSDK component that use this format:
 #define ANDROID_GAMESDK_PACKED_VERSION(MAJOR, MINOR, BUGFIX) \
-    ((MAJOR << 16) | (MINOR << 8) | (BUGFIX))
+  ((MAJOR << 16) | (MINOR << 8) | (BUGFIX))
 // Accessors
 #define ANDROID_GAMESDK_MAJOR_VERSION(PACKED) ((PACKED) >> 16)
 #define ANDROID_GAMESDK_MINOR_VERSION(PACKED) (((PACKED) >> 8) & 0xff)
 #define ANDROID_GAMESDK_BUGFIX_VERSION(PACKED) ((PACKED) & 0xff)
 
-#define AGDK_STRING_VERSION(MAJOR, MINOR, BUGFIX, GIT) \
-#MAJOR "." #MINOR "." #BUGFIX "." #GIT
+#define AGDK_STRINGIFY(NUMBER) #NUMBER
+#define AGDK_STRING_VERSION(MAJOR, MINOR, BUGFIX) \
+  AGDK_STRINGIFY(MAJOR) "." AGDK_STRINGIFY(MINOR) "." AGDK_STRINGIFY(BUGFIX)
diff --git a/android-activity/android-games-sdk/src/common/system_utils.cpp b/android-activity/android-games-sdk/src/common/system_utils.cpp
new file mode 100644
index 0000000..efc5b74
--- /dev/null
+++ b/android-activity/android-games-sdk/src/common/system_utils.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "system_utils.h"
+
+#include <android/api-level.h>
+#include <stdlib.h>
+#include <sys/system_properties.h>
+
+namespace gamesdk {
+
+#if __ANDROID_API__ >= 26
+std::string getSystemPropViaCallback(const char* key,
+                                     const char* default_value = "") {
+    const prop_info* prop = __system_property_find(key);
+    if (prop == nullptr) {
+        return default_value;
+    }
+    std::string return_value;
+    auto thunk = [](void* cookie, const char* /*name*/, const char* value,
+                    uint32_t /*serial*/) {
+        if (value != nullptr) {
+            std::string* r = static_cast<std::string*>(cookie);
+            *r = value;
+        }
+    };
+    __system_property_read_callback(prop, thunk, &return_value);
+    return return_value;
+}
+#else
+std::string getSystemPropViaGet(const char* key,
+                                const char* default_value = "") {
+    char buffer[PROP_VALUE_MAX + 1] = "";  // +1 for terminator
+    int bufferLen = __system_property_get(key, buffer);
+    if (bufferLen > 0)
+        return buffer;
+    else
+        return "";
+}
+#endif
+
+std::string GetSystemProp(const char* key, const char* default_value) {
+#if __ANDROID_API__ >= 26
+    return getSystemPropViaCallback(key, default_value);
+#else
+    return getSystemPropViaGet(key, default_value);
+#endif
+}
+
+int GetSystemPropAsInt(const char* key, int default_value) {
+    std::string prop = GetSystemProp(key);
+    return prop == "" ? default_value : strtoll(prop.c_str(), nullptr, 10);
+}
+
+bool GetSystemPropAsBool(const char* key, bool default_value) {
+    return GetSystemPropAsInt(key, default_value) != 0;
+}
+
+}  // namespace gamesdk
\ No newline at end of file
diff --git a/android-activity/android-games-sdk/src/common/system_utils.h b/android-activity/android-games-sdk/src/common/system_utils.h
new file mode 100644
index 0000000..488374b
--- /dev/null
+++ b/android-activity/android-games-sdk/src/common/system_utils.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "string"
+
+namespace gamesdk {
+
+// Get the value of the given system property
+std::string GetSystemProp(const char* key, const char* default_value = "");
+
+// Get the value of the given system property as an integer
+int GetSystemPropAsInt(const char* key, int default_value = 0);
+
+// Get the value of the given system property as a bool
+bool GetSystemPropAsBool(const char* key, bool default_value = false);
+
+}  // namespace gamesdk
\ No newline at end of file
diff --git a/android-activity/build.rs b/android-activity/build.rs
index 42288f9..eab6121 100644
--- a/android-activity/build.rs
+++ b/android-activity/build.rs
@@ -1,50 +1,86 @@
 #![allow(dead_code)]
 
 fn build_glue_for_game_activity() {
-    let activity_basepath = "android-games-sdk/game-activity/prefab-src/modules/game-activity/include";
-    let textinput_basepath = "android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include";
+    let activity_path = |src_inc, name| {
+        format!("android-games-sdk/game-activity/prefab-src/modules/game-activity/{src_inc}/game-activity/{name}")
+    };
+    let textinput_path = |src_inc, name| {
+        format!("android-games-sdk/game-text-input/prefab-src/modules/game-text-input/{src_inc}/game-text-input/{name}")
+    };
+
+    for f in ["GameActivity.cpp", "GameActivityEvents.cpp"] {
+        println!("cargo:rerun-if-changed={}", activity_path("src", f));
+    }
 
     for f in [
         "GameActivity.h",
-        "GameActivity.cpp",
         "GameActivityEvents.h",
-        "GameActivityEvents.cpp",
         "GameActivityLog.h",
+        "GameActivityEvents_internal.h",
     ] {
-        println!("cargo:rerun-if-changed={activity_basepath}/game-activity/{f}");
+        println!("cargo:rerun-if-changed={}", activity_path("include", f));
     }
+
     cc::Build::new()
         .cpp(true)
+        .include("android-games-sdk/src/common")
+        .file("android-games-sdk/src/common/system_utils.cpp")
+        .extra_warnings(false)
+        .cpp_link_stdlib("c++_static")
+        .compile("libgame_common.a");
+
+    println!("cargo:rerun-if-changed=android-games-sdk/src/common/system_utils.cpp");
+    println!("cargo:rerun-if-changed=android-games-sdk/src/common/system_utils.h");
+
+    cc::Build::new()
+        .cpp(true)
+        .include("android-games-sdk/src/common")
         .include("android-games-sdk/include")
-        .include(activity_basepath)
-        .include(textinput_basepath)
-        .file(format!("{activity_basepath}/game-activity/GameActivity.cpp"))
-        .file(format!("{activity_basepath}/game-activity/GameActivityEvents.cpp"))
+        .include("android-games-sdk/game-activity/prefab-src/modules/game-activity/include")
+        .include("android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include")
+        .file(activity_path("src", "GameActivity.cpp"))
+        .file(activity_path("src", "GameActivityEvents.cpp"))
         .extra_warnings(false)
         .cpp_link_stdlib("c++_static")
         .compile("libgame_activity.a");
 
-    for f in ["gamecommon.h", "gametextinput.h", "gametextinput.cpp"] {
-        println!("cargo:rerun-if-changed={textinput_basepath}/game-text-input/{f}");
-    }
+    println!(
+        "cargo:rerun-if-changed={}",
+        textinput_path("include", "gametextinput.h")
+    );
+    println!(
+        "cargo:rerun-if-changed={}",
+        textinput_path("src", "gametextinput.cpp")
+    );
+
     cc::Build::new()
         .cpp(true)
+        .include("android-games-sdk/src/common")
         .include("android-games-sdk/include")
-        .include(textinput_basepath)
-        .file(format!("{textinput_basepath}/game-text-input/gametextinput.cpp"))
+        .include("android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include")
+        .file(textinput_path("src", "gametextinput.cpp"))
         .cpp_link_stdlib("c++_static")
         .compile("libgame_text_input.a");
 
-    for f in ["android_native_app_glue.h", "android_native_app_glue.c"] {
-        println!("cargo:rerun-if-changed={activity_basepath}/game-activity/native_app_glue/{f}");
-    }
-    
+    println!(
+        "cargo:rerun-if-changed={}",
+        activity_path("src", "native_app_glue/android_native_app_glue.c")
+    );
+    println!(
+        "cargo:rerun-if-changed={}",
+        activity_path("include", "native_app_glue/android_native_app_glue.h")
+    );
+
     cc::Build::new()
+        .include("android-games-sdk/src/common")
         .include("android-games-sdk/include")
-        .include(activity_basepath)
-        .include(textinput_basepath)
-        .include(format!("{activity_basepath}/game-activity/native_app_glue"))
-        .file(format!("{activity_basepath}/game-activity/native_app_glue/android_native_app_glue.c"))
+        .include("android-games-sdk/game-activity/prefab-src/modules/game-activity/include")
+        .include("android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include")
+        .include(activity_path("include", ""))
+        .file(activity_path(
+            "src",
+            "native_app_glue/android_native_app_glue.c",
+        ))
         .extra_warnings(false)
         .cpp_link_stdlib("c++_static")
         .compile("libnative_app_glue.a");

From 88714f0b6a7197b3b72c474a7511c6857436aa8f Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 31 Mar 2025 23:12:07 +0100
Subject: [PATCH 78/93] Add CHANGELOG.md entry for GameActivity bump to 4.0.0

---
 android-activity/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/android-activity/CHANGELOG.md b/android-activity/CHANGELOG.md
index 825cc50..be0c1ac 100644
--- a/android-activity/CHANGELOG.md
+++ b/android-activity/CHANGELOG.md
@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
 - input: Replaced custom types with their `ndk` crate equivalent.
   > [!NOTE]
   > These types existed because the `ndk` crate didn't provide them in an extensible way.  Now that they have the `#[non_exhaustive]` flag and contain a `__Unknown(T)` variant to provide lossless conversions, and not to mention use an ABI type that matches how it is being used by most functions (when the original constants were defined in a "typeless" way), the `ndk` types are used and reexported once again.
@@ -18,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - rust-version bumped to 1.73.0 ([#193](https://github.com/rust-mobile/android-activity/pull/193))
 - The `ndk` and `ndk-sys` crates are now re-exported under `android_activity::ndk` and `android_activity::ndk_sys` ([#194](https://github.com/rust-mobile/android-activity/pull/194))
+- GameActivity updated to 4.0.0 (requires the corresponding 4.0.0 `.aar` release from Google) ([#191](https://github.com/rust-mobile/android-activity/pull/191))
 
 ## [0.6.0] - 2024-04-26
 

From 36832feacf39f55b266510d719dde6562495081e Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 31 Mar 2025 20:38:10 +0100
Subject: [PATCH 79/93] Add import-games-sdk.sh and import some APP_CMD_
 changes for 4.0.0

This replaces `copy-files` + `file_list.txt` (subjective simplification)

This imports the SDK from commit 1b544f896646b29e798c5be0a151a488906797f7, from:
https://github.com/rust-mobile/android-games-sdk/commits/android-activity-4.0.0
---
 android-activity/android-games-sdk/copy-files | 61 -------------------
 .../android-games-sdk/file_list.txt           | 13 ----
 .../modules/game-activity/include/common      |  1 +
 .../native_app_glue/android_native_app_glue.h | 13 +++-
 .../include/game-text-input/gametextinput.h   |  1 +
 .../modules/game-activity/module.json         |  8 +++
 .../game-activity/src/common/system_utils.cpp |  1 +
 .../native_app_glue/android_native_app_glue.c | 12 +++-
 .../src/game-text-input/gametextinput.cpp     |  1 +
 .../src/game-text-input/gametextinput.h       |  1 +
 .../game-activity/prefab-src/prefab.json      | 13 ++++
 .../modules/game-text-input/include/common    |  1 +
 .../modules/game-text-input/module.json       |  8 +++
 .../game-text-input/prefab-src/prefab.json    |  9 +++
 .../android-games-sdk/import-games-sdk.sh     | 45 ++++++++++++++
 15 files changed, 108 insertions(+), 80 deletions(-)
 delete mode 100755 android-activity/android-games-sdk/copy-files
 delete mode 100644 android-activity/android-games-sdk/file_list.txt
 create mode 120000 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/common
 create mode 120000 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-text-input/gametextinput.h
 create mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/module.json
 create mode 120000 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/common/system_utils.cpp
 create mode 120000 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-text-input/gametextinput.cpp
 create mode 120000 android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-text-input/gametextinput.h
 create mode 100644 android-activity/android-games-sdk/game-activity/prefab-src/prefab.json
 create mode 120000 android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/common
 create mode 100644 android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/module.json
 create mode 100644 android-activity/android-games-sdk/game-text-input/prefab-src/prefab.json
 create mode 100755 android-activity/android-games-sdk/import-games-sdk.sh

diff --git a/android-activity/android-games-sdk/copy-files b/android-activity/android-games-sdk/copy-files
deleted file mode 100755
index 71dd503..0000000
--- a/android-activity/android-games-sdk/copy-files
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-
-# Copies files from android-games-sdk-rs so that we don't have to use
-# it has a submodule (see https://github.com/rust-mobile/android-activity/issues/190)
-
-# Usage: ./copy_files source_dir dest_dir file_list.txt
-# file_list.txt should contain one filename or path pattern per line
-
-# Check if correct number of arguments
-if [ $# -ne 1 ]; then
-    echo "Usage: $0 <android-games-sdk-rs dir>"
-    exit 1
-fi
-
-SOURCE_DIR="$1"
-DEST_DIR="${2:-.}"
-FILE_LIST="${3:-file_list.txt}"
-
-# Check if source directory exists
-if [ ! -d "$SOURCE_DIR" ]; then
-    echo "Error: Source directory '$SOURCE_DIR' does not exist."
-    exit 1
-fi
-
-# Check if file list exists
-if [ ! -f "$FILE_LIST" ]; then
-    echo "Error: File list '$FILE_LIST' does not exist."
-    exit 1
-fi
-
-# Create destination directory if it doesn't exist
-mkdir -p "$DEST_DIR"
-
-# Read file list and copy each file
-while IFS= read -r file || [ -n "$file" ]; do
-    # Skip empty lines and comments
-    if [ -z "$file" ] || [[ "$file" =~ ^# ]]; then
-        continue
-    fi
-
-    fpath="$(find "$SOURCE_DIR" -name "$file" -type f)"
-
-    # Find matching files
-    if [ -f "$fpath" ]; then
-        # Get the relative path
-        rel_path="${fpath#$SOURCE_DIR/}"
-        dest_file="$DEST_DIR/$rel_path"
-        dest_dir=$(dirname "$dest_file")
-
-        # Create destination directory structure
-        mkdir -p "$dest_dir"
-
-        # Copy the file
-        cp "$fpath" "$dest_file"
-        echo "Copied: $rel_path"
-    else
-        echo "ERROR: '$file' not found"
-    fi
-done < "$FILE_LIST"
-
-echo "Copy operation completed."
diff --git a/android-activity/android-games-sdk/file_list.txt b/android-activity/android-games-sdk/file_list.txt
deleted file mode 100644
index 506525f..0000000
--- a/android-activity/android-games-sdk/file_list.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-android_native_app_glue.c
-android_native_app_glue.h
-GameActivity.cpp
-GameActivityEvents.cpp
-GameActivityEvents.h
-GameActivityEvents_internal.h
-GameActivity.h
-GameActivityLog.h
-gamesdk_common.h
-gametextinput.cpp
-gametextinput.h
-system_utils.cpp
-system_utils.h
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/common b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/common
new file mode 120000
index 0000000..9388f34
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/common
@@ -0,0 +1 @@
+../../../../../include/common/
\ No newline at end of file
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h
index cdb1ac8..7b4f35b 100644
--- a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-activity/native_app_glue/android_native_app_glue.h
@@ -217,6 +217,13 @@ struct android_app {
 
   /**
    * Last editor action. Valid within APP_CMD_SOFTWARE_KB_VIS_CHANGED handler.
+   *
+   * Note: the upstream comment above isn't accurate.
+   * - `APP_CMD_SOFTWARE_KB_VIS_CHANGED` is associated with `softwareKeyboardVisible`
+   *   changes, not `editorAction`.
+   * - `APP_CMD_EDITOR_ACTION` is associated with this state but unlike for
+   *   `window` state there's no synchonization that blocks the Java main
+   *   thread, so we can't say that this is only valid within the `APP_CMD_` handler.
    */
   int editorAction;
 
@@ -441,17 +448,17 @@ enum NativeAppGlueAppCmd : int8_t {
   /**
    * Command from main thread: an editor action has been triggered.
    */
-  APP_CMD_EDITOR_ACTION,
+  //APP_CMD_EDITOR_ACTION,
 
   /**
    * Command from main thread: a keyboard event has been received.
    */
-  APP_CMD_KEY_EVENT,
+  //APP_CMD_KEY_EVENT,
 
   /**
    * Command from main thread: a touch event has been received.
    */
-  APP_CMD_TOUCH_EVENT,
+  //APP_CMD_TOUCH_EVENT,
 
 };
 
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-text-input/gametextinput.h b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-text-input/gametextinput.h
new file mode 120000
index 0000000..84e9337
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/include/game-text-input/gametextinput.h
@@ -0,0 +1 @@
+../../../../../../game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h
\ No newline at end of file
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/module.json b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/module.json
new file mode 100644
index 0000000..0268e83
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/module.json
@@ -0,0 +1,8 @@
+{
+  "export_libraries": [],
+  "library_name": null,
+  "android": {
+    "export_libraries": ["-landroid", "-llog"],
+    "library_name": null
+  }
+}
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/common/system_utils.cpp b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/common/system_utils.cpp
new file mode 120000
index 0000000..713dcbb
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/common/system_utils.cpp
@@ -0,0 +1 @@
+../../../../../../src/common/system_utils.cpp
\ No newline at end of file
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/native_app_glue/android_native_app_glue.c b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/native_app_glue/android_native_app_glue.c
index 48069d9..3aeae12 100644
--- a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/native_app_glue/android_native_app_glue.c
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-activity/native_app_glue/android_native_app_glue.c
@@ -579,7 +579,7 @@ static bool onTouchEvent(GameActivity* activity,
   ++inputBuffer->motionEventsCount;
   notifyInput(android_app);
 
-  android_app_write_cmd(android_app, APP_CMD_TOUCH_EVENT);
+  //android_app_write_cmd(android_app, APP_CMD_TOUCH_EVENT);
   pthread_mutex_unlock(&android_app->mutex);
   return true;
 }
@@ -665,7 +665,7 @@ static bool onKey(GameActivity* activity, const GameActivityKeyEvent* event) {
   ++inputBuffer->keyEventsCount;
   notifyInput(android_app);
 
-  android_app_write_cmd(android_app, APP_CMD_KEY_EVENT);
+  //android_app_write_cmd(android_app, APP_CMD_KEY_EVENT);
   pthread_mutex_unlock(&android_app->mutex);
   return true;
 }
@@ -722,9 +722,15 @@ static bool onEditorAction(GameActivity* activity, int action) {
   struct android_app* android_app = ToApp(activity);
 
   pthread_mutex_lock(&android_app->mutex);
+
+  // XXX: this is a racy design that could lose InputConnection actions if the
+  // application doesn't manage to look at app->editorAction before another
+  // action is delivered.
   android_app->editorAction = action;
+  // TODO: buffer these actions like other input events
+  //notifyInput(android_app);
 
-  android_app_write_cmd(android_app, APP_CMD_EDITOR_ACTION);
+  //android_app_write_cmd(android_app, APP_CMD_EDITOR_ACTION);
   pthread_mutex_unlock(&android_app->mutex);
   return true;
 }
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-text-input/gametextinput.cpp b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-text-input/gametextinput.cpp
new file mode 120000
index 0000000..3deaa67
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-text-input/gametextinput.cpp
@@ -0,0 +1 @@
+../../../../../../game-text-input/prefab-src/modules/game-text-input/src/game-text-input/gametextinput.cpp
\ No newline at end of file
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-text-input/gametextinput.h b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-text-input/gametextinput.h
new file mode 120000
index 0000000..84e9337
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/modules/game-activity/src/game-text-input/gametextinput.h
@@ -0,0 +1 @@
+../../../../../../game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h
\ No newline at end of file
diff --git a/android-activity/android-games-sdk/game-activity/prefab-src/prefab.json b/android-activity/android-games-sdk/game-activity/prefab-src/prefab.json
new file mode 100644
index 0000000..46adff6
--- /dev/null
+++ b/android-activity/android-games-sdk/game-activity/prefab-src/prefab.json
@@ -0,0 +1,13 @@
+{
+  "name": "game-activity",
+  "schema_version": 1,
+  "dependencies": [],
+  "version": "0.0.1",
+  "cpp_files": [
+    "src/common/system_utils.cpp",
+    "src/game-activity/GameActivity.cpp",
+    "src/game-activity/native_app_glue/android_native_app_glue.c",
+    "src/game-activity/GameActivityEvents.cpp",
+    "src/game-text-input/gametextinput.cpp"
+  ]
+}
diff --git a/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/common b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/common
new file mode 120000
index 0000000..9388f34
--- /dev/null
+++ b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include/common
@@ -0,0 +1 @@
+../../../../../include/common/
\ No newline at end of file
diff --git a/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/module.json b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/module.json
new file mode 100644
index 0000000..1a64fcc
--- /dev/null
+++ b/android-activity/android-games-sdk/game-text-input/prefab-src/modules/game-text-input/module.json
@@ -0,0 +1,8 @@
+{
+  "export_libraries": [],
+  "library_name": null,
+  "android": {
+    "export_libraries": null,
+    "library_name": null
+  }
+}
diff --git a/android-activity/android-games-sdk/game-text-input/prefab-src/prefab.json b/android-activity/android-games-sdk/game-text-input/prefab-src/prefab.json
new file mode 100644
index 0000000..5b3ea1e
--- /dev/null
+++ b/android-activity/android-games-sdk/game-text-input/prefab-src/prefab.json
@@ -0,0 +1,9 @@
+{
+  "name": "game-text-input",
+  "schema_version": 1,
+  "dependencies": [],
+  "version": "0.0.1",
+  "cpp_files": [
+    "src/game-text-input/gametextinput.cpp"
+  ]
+}
diff --git a/android-activity/android-games-sdk/import-games-sdk.sh b/android-activity/android-games-sdk/import-games-sdk.sh
new file mode 100755
index 0000000..83bdf9f
--- /dev/null
+++ b/android-activity/android-games-sdk/import-games-sdk.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+set -xe
+
+# Copies the native, prefab-src for GameActivity + GameTextInput from the
+# upstream, android-games-sdk, including our android-activity integration
+# changes.
+#
+# This code is maintained out-of-tree, based on a fork of Google's AGDK repo, so
+# it's more practical to try and upstream changes we make, or to rebase on new
+# versions.
+
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <android-games-sdk dir>"
+    exit 1
+fi
+
+SOURCE_DIR="$1"
+TOP_DIR=$(git rev-parse --show-toplevel)
+DEST_DIR="$TOP_DIR/android-activity/android-games-sdk"
+
+if [ ! -d "$SOURCE_DIR" ]; then
+    echo "Error: Source directory '$SOURCE_DIR' does not exist."
+    exit 1
+fi
+
+if [ ! -d "$DEST_DIR" ]; then
+    echo "Error: expected find destination directory $DEST_DIR"
+    exit 1
+fi
+
+rm -fr "$DEST_DIR/game-activity"
+rm -fr "$DEST_DIR/game-text-input"
+rm -fr "$DEST_DIR/src/common"
+rm -fr "$DEST_DIR/include/common"
+
+mkdir -p "$DEST_DIR/game-activity"
+mkdir -p "$DEST_DIR/game-text-input"
+mkdir -p "$DEST_DIR/include/common"
+mkdir -p "$DEST_DIR/src/common"
+
+cp -av "$SOURCE_DIR/game-activity/prefab-src" "$DEST_DIR/game-activity"
+cp -av "$SOURCE_DIR/game-text-input/prefab-src" "$DEST_DIR/game-text-input"
+cp -av "$SOURCE_DIR/include/common/gamesdk_common.h" "$DEST_DIR/include/common"
+cp -av "$SOURCE_DIR/src/common/system_utils.h" "$DEST_DIR/src/common"
+cp -av "$SOURCE_DIR/src/common/system_utils.cpp" "$DEST_DIR/src/common"
\ No newline at end of file

From eacddd744a89c3d96f46bbeab2956504f5355da0 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Fri, 14 Mar 2025 12:14:25 -0700
Subject: [PATCH 80/93] bindgen: update paths

Signed-off-by: William Casarin <jb55@jb55.com>
---
 android-activity/generate-bindings.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/android-activity/generate-bindings.sh b/android-activity/generate-bindings.sh
index 690bfbd..cee8691 100644
--- a/android-activity/generate-bindings.sh
+++ b/android-activity/generate-bindings.sh
@@ -37,7 +37,9 @@ while read ARCH && read TARGET ; do
         --blocklist-function 'GameActivity_onCreate_C' \
         --newtype-enum '\w+_(result|status)_t' \
         -- \
-        -Igame-activity-csrc \
+        -Iandroid-games-sdk/game-activity/prefab-src/modules/game-activity/include \
+        -Iandroid-games-sdk/game-text-input/prefab-src/modules/game-text-input/include \
+        -Iandroid-games-sdk/include \
         --sysroot="$SYSROOT" --target=$TARGET
 
 done << EOF

From 5367c865e3514c20d02586a507de5887328ec024 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 31 Mar 2025 14:49:32 +0100
Subject: [PATCH 81/93] Re-generate bindings with rust-bindgen 0.71.1

---
 .../src/game_activity/ffi_aarch64.rs          | 3009 ++++--------
 android-activity/src/game_activity/ffi_arm.rs | 3306 +++++--------
 .../src/game_activity/ffi_i686.rs             | 4256 ++++------------
 .../src/game_activity/ffi_x86_64.rs           | 4309 ++++-------------
 4 files changed, 4148 insertions(+), 10732 deletions(-)

diff --git a/android-activity/src/game_activity/ffi_aarch64.rs b/android-activity/src/game_activity/ffi_aarch64.rs
index cd3fabd..461f377 100644
--- a/android-activity/src/game_activity/ffi_aarch64.rs
+++ b/android-activity/src/game_activity/ffi_aarch64.rs
@@ -1,5 +1,15 @@
-/* automatically generated by rust-bindgen 0.66.1 */
+/* automatically generated by rust-bindgen 0.71.1 */
 
+#[doc = r" If Bindgen could only determine the size and alignment of a"]
+#[doc = r" type, it is represented like this."]
+#[derive(PartialEq, Copy, Clone, Debug, Hash)]
+#[repr(C)]
+pub struct __BindgenOpaqueArray<T: Copy, const N: usize>(pub [T; N]);
+impl<T: Copy + Default, const N: usize> Default for __BindgenOpaqueArray<T, N> {
+    fn default() -> Self {
+        Self([<T as Default>::default(); N])
+    }
+}
 pub const __BIONIC__: u32 = 1;
 pub const __WORDSIZE: u32 = 64;
 pub const __bos_level: u32 = 0;
@@ -24,11 +34,12 @@ pub const __ANDROID_API_R__: u32 = 30;
 pub const __ANDROID_API_S__: u32 = 31;
 pub const __ANDROID_API_T__: u32 = 33;
 pub const __ANDROID_API_U__: u32 = 34;
+pub const __ANDROID_API_V__: u32 = 35;
 pub const __ANDROID_NDK__: u32 = 1;
-pub const __NDK_MAJOR__: u32 = 25;
-pub const __NDK_MINOR__: u32 = 2;
+pub const __NDK_MAJOR__: u32 = 26;
+pub const __NDK_MINOR__: u32 = 1;
 pub const __NDK_BETA__: u32 = 0;
-pub const __NDK_BUILD__: u32 = 9519653;
+pub const __NDK_BUILD__: u32 = 10909125;
 pub const __NDK_CANARY__: u32 = 0;
 pub const WCHAR_MIN: u8 = 0u8;
 pub const INT8_MIN: i32 = -128;
@@ -61,11 +72,10 @@ pub const WINT_MAX: u32 = 4294967295;
 pub const WINT_MIN: u32 = 0;
 pub const __BITS_PER_LONG: u32 = 64;
 pub const __FD_SETSIZE: u32 = 1024;
-pub const __GNUC_VA_LIST: u32 = 1;
 pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8;
+pub const __bool_true_false_are_defined: u32 = 1;
 pub const true_: u32 = 1;
 pub const false_: u32 = 0;
-pub const __bool_true_false_are_defined: u32 = 1;
 pub const __PRI_64_prefix: &[u8; 2] = b"l\0";
 pub const __PRI_PTR_prefix: &[u8; 2] = b"l\0";
 pub const __PRI_FAST_prefix: &[u8; 2] = b"l\0";
@@ -97,6 +107,34 @@ pub const PRIiFAST32: &[u8; 3] = b"li\0";
 pub const PRIiFAST64: &[u8; 3] = b"li\0";
 pub const PRIiMAX: &[u8; 3] = b"ji\0";
 pub const PRIiPTR: &[u8; 3] = b"li\0";
+pub const PRIb8: &[u8; 2] = b"b\0";
+pub const PRIb16: &[u8; 2] = b"b\0";
+pub const PRIb32: &[u8; 2] = b"b\0";
+pub const PRIb64: &[u8; 3] = b"lb\0";
+pub const PRIbLEAST8: &[u8; 2] = b"b\0";
+pub const PRIbLEAST16: &[u8; 2] = b"b\0";
+pub const PRIbLEAST32: &[u8; 2] = b"b\0";
+pub const PRIbLEAST64: &[u8; 3] = b"lb\0";
+pub const PRIbFAST8: &[u8; 2] = b"b\0";
+pub const PRIbFAST16: &[u8; 3] = b"lb\0";
+pub const PRIbFAST32: &[u8; 3] = b"lb\0";
+pub const PRIbFAST64: &[u8; 3] = b"lb\0";
+pub const PRIbMAX: &[u8; 3] = b"jb\0";
+pub const PRIbPTR: &[u8; 3] = b"lb\0";
+pub const PRIB8: &[u8; 2] = b"B\0";
+pub const PRIB16: &[u8; 2] = b"B\0";
+pub const PRIB32: &[u8; 2] = b"B\0";
+pub const PRIB64: &[u8; 3] = b"lB\0";
+pub const PRIBLEAST8: &[u8; 2] = b"B\0";
+pub const PRIBLEAST16: &[u8; 2] = b"B\0";
+pub const PRIBLEAST32: &[u8; 2] = b"B\0";
+pub const PRIBLEAST64: &[u8; 3] = b"lB\0";
+pub const PRIBFAST8: &[u8; 2] = b"B\0";
+pub const PRIBFAST16: &[u8; 3] = b"lB\0";
+pub const PRIBFAST32: &[u8; 3] = b"lB\0";
+pub const PRIBFAST64: &[u8; 3] = b"lB\0";
+pub const PRIBMAX: &[u8; 3] = b"jB\0";
+pub const PRIBPTR: &[u8; 3] = b"lB\0";
 pub const PRIo8: &[u8; 2] = b"o\0";
 pub const PRIo16: &[u8; 2] = b"o\0";
 pub const PRIo32: &[u8; 2] = b"o\0";
@@ -181,6 +219,34 @@ pub const SCNiFAST32: &[u8; 3] = b"li\0";
 pub const SCNiFAST64: &[u8; 3] = b"li\0";
 pub const SCNiMAX: &[u8; 3] = b"ji\0";
 pub const SCNiPTR: &[u8; 3] = b"li\0";
+pub const SCNb8: &[u8; 4] = b"hhb\0";
+pub const SCNb16: &[u8; 3] = b"hb\0";
+pub const SCNb32: &[u8; 2] = b"b\0";
+pub const SCNb64: &[u8; 3] = b"lb\0";
+pub const SCNbLEAST8: &[u8; 4] = b"hhb\0";
+pub const SCNbLEAST16: &[u8; 3] = b"hb\0";
+pub const SCNbLEAST32: &[u8; 2] = b"b\0";
+pub const SCNbLEAST64: &[u8; 3] = b"lb\0";
+pub const SCNbFAST8: &[u8; 4] = b"hhb\0";
+pub const SCNbFAST16: &[u8; 3] = b"lb\0";
+pub const SCNbFAST32: &[u8; 3] = b"lb\0";
+pub const SCNbFAST64: &[u8; 3] = b"lb\0";
+pub const SCNbMAX: &[u8; 3] = b"jb\0";
+pub const SCNbPTR: &[u8; 3] = b"lb\0";
+pub const SCNB8: &[u8; 4] = b"hhB\0";
+pub const SCNB16: &[u8; 3] = b"hB\0";
+pub const SCNB32: &[u8; 2] = b"B\0";
+pub const SCNB64: &[u8; 3] = b"lB\0";
+pub const SCNBLEAST8: &[u8; 4] = b"hhB\0";
+pub const SCNBLEAST16: &[u8; 3] = b"hB\0";
+pub const SCNBLEAST32: &[u8; 2] = b"B\0";
+pub const SCNBLEAST64: &[u8; 3] = b"lB\0";
+pub const SCNBFAST8: &[u8; 4] = b"hhB\0";
+pub const SCNBFAST16: &[u8; 3] = b"lB\0";
+pub const SCNBFAST32: &[u8; 3] = b"lB\0";
+pub const SCNBFAST64: &[u8; 3] = b"lB\0";
+pub const SCNBMAX: &[u8; 3] = b"jB\0";
+pub const SCNBPTR: &[u8; 3] = b"lB\0";
 pub const SCNo8: &[u8; 4] = b"hho\0";
 pub const SCNo16: &[u8; 3] = b"ho\0";
 pub const SCNo32: &[u8; 2] = b"o\0";
@@ -225,12 +291,12 @@ pub const SCNxMAX: &[u8; 3] = b"jx\0";
 pub const SCNxPTR: &[u8; 3] = b"lx\0";
 pub const GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT: u32 = 48;
 pub const GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT: u32 = 8;
-pub const GAMETEXTINPUT_MAJOR_VERSION: u32 = 2;
+pub const GAMETEXTINPUT_MAJOR_VERSION: u32 = 4;
 pub const GAMETEXTINPUT_MINOR_VERSION: u32 = 0;
 pub const GAMETEXTINPUT_BUGFIX_VERSION: u32 = 0;
-pub const GAMEACTIVITY_MAJOR_VERSION: u32 = 2;
+pub const GAMEACTIVITY_MAJOR_VERSION: u32 = 4;
 pub const GAMEACTIVITY_MINOR_VERSION: u32 = 0;
-pub const GAMEACTIVITY_BUGFIX_VERSION: u32 = 2;
+pub const GAMEACTIVITY_BUGFIX_VERSION: u32 = 0;
 pub const POLLIN: u32 = 1;
 pub const POLLPRI: u32 = 2;
 pub const POLLOUT: u32 = 4;
@@ -248,6 +314,10 @@ pub const FPSIMD_MAGIC: u32 = 1179680769;
 pub const ESR_MAGIC: u32 = 1163088385;
 pub const EXTRA_MAGIC: u32 = 1163416577;
 pub const SVE_MAGIC: u32 = 1398162689;
+pub const SVE_SIG_FLAG_SM: u32 = 1;
+pub const TPIDR2_MAGIC: u32 = 1414547714;
+pub const ZA_MAGIC: u32 = 1412850501;
+pub const ZT_MAGIC: u32 = 1515474433;
 pub const __SVE_VQ_BYTES: u32 = 16;
 pub const __SVE_VQ_MIN: u32 = 1;
 pub const __SVE_VQ_MAX: u32 = 512;
@@ -263,6 +333,8 @@ pub const SVE_VL_MIN: u32 = 16;
 pub const SVE_VL_MAX: u32 = 8192;
 pub const SVE_NUM_ZREGS: u32 = 32;
 pub const SVE_NUM_PREGS: u32 = 16;
+pub const ZT_SIG_REG_SIZE: u32 = 512;
+pub const ZT_SIG_REG_BYTES: u32 = 64;
 pub const NR_OPEN: u32 = 1024;
 pub const NGROUPS_MAX: u32 = 65536;
 pub const ARG_MAX: u32 = 131072;
@@ -553,6 +625,7 @@ pub const TRAP_HWBKPT: u32 = 4;
 pub const TRAP_UNK: u32 = 5;
 pub const TRAP_PERF: u32 = 6;
 pub const NSIGTRAP: u32 = 6;
+pub const TRAP_PERF_FLAG_ASYNC: u32 = 1;
 pub const CLD_EXITED: u32 = 1;
 pub const CLD_KILLED: u32 = 2;
 pub const CLD_DUMPED: u32 = 3;
@@ -608,6 +681,9 @@ pub const TIMER_ABSTIME: u32 = 1;
 pub const FD_SETSIZE: u32 = 1024;
 pub const CLOCKS_PER_SEC: u32 = 1000000;
 pub const TIME_UTC: u32 = 1;
+pub const TIME_MONOTONIC: u32 = 2;
+pub const TIME_ACTIVE: u32 = 3;
+pub const TIME_THREAD_ACTIVE: u32 = 4;
 pub const CSIGNAL: u32 = 255;
 pub const CLONE_VM: u32 = 256;
 pub const CLONE_FS: u32 = 512;
@@ -693,32 +769,22 @@ fn bindgen_test_layout_max_align_t() {
     assert_eq!(
         ::std::mem::size_of::<max_align_t>(),
         32usize,
-        concat!("Size of: ", stringify!(max_align_t))
+        "Size of max_align_t"
     );
     assert_eq!(
         ::std::mem::align_of::<max_align_t>(),
         16usize,
-        concat!("Alignment of ", stringify!(max_align_t))
+        "Alignment of max_align_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce1) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(max_align_t),
-            "::",
-            stringify!(__clang_max_align_nonce1)
-        )
+        "Offset of field: max_align_t::__clang_max_align_nonce1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce2) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(max_align_t),
-            "::",
-            stringify!(__clang_max_align_nonce2)
-        )
+        "Offset of field: max_align_t::__clang_max_align_nonce2"
     );
 }
 pub type __int8_t = ::std::os::raw::c_schar;
@@ -769,22 +835,17 @@ fn bindgen_test_layout___kernel_fd_set() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_fd_set>(),
         128usize,
-        concat!("Size of: ", stringify!(__kernel_fd_set))
+        "Size of __kernel_fd_set"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_fd_set>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_fd_set))
+        "Alignment of __kernel_fd_set"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_fd_set),
-            "::",
-            stringify!(fds_bits)
-        )
+        "Offset of field: __kernel_fd_set::fds_bits"
     );
 }
 pub type __kernel_sighandler_t =
@@ -821,22 +882,17 @@ fn bindgen_test_layout___kernel_fsid_t() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_fsid_t>(),
         8usize,
-        concat!("Size of: ", stringify!(__kernel_fsid_t))
+        "Size of __kernel_fsid_t"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_fsid_t>(),
         4usize,
-        concat!("Alignment of ", stringify!(__kernel_fsid_t))
+        "Alignment of __kernel_fsid_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).val) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_fsid_t),
-            "::",
-            stringify!(val)
-        )
+        "Offset of field: __kernel_fsid_t::val"
     );
 }
 pub type __kernel_off_t = __kernel_long_t;
@@ -899,7 +955,7 @@ pub type loff_t = off_t;
 pub type off64_t = loff_t;
 pub type __socklen_t = u32;
 pub type socklen_t = __socklen_t;
-pub type __va_list = [u64; 4usize];
+pub type __va_list = __BindgenOpaqueArray<u64, 4usize>;
 pub type uint_t = ::std::os::raw::c_uint;
 pub type uint = ::std::os::raw::c_uint;
 pub type u_char = ::std::os::raw::c_uchar;
@@ -1204,6 +1260,22 @@ pub const AKEYCODE_REFRESH: _bindgen_ty_2 = 285;
 pub const AKEYCODE_THUMBS_UP: _bindgen_ty_2 = 286;
 pub const AKEYCODE_THUMBS_DOWN: _bindgen_ty_2 = 287;
 pub const AKEYCODE_PROFILE_SWITCH: _bindgen_ty_2 = 288;
+pub const AKEYCODE_VIDEO_APP_1: _bindgen_ty_2 = 289;
+pub const AKEYCODE_VIDEO_APP_2: _bindgen_ty_2 = 290;
+pub const AKEYCODE_VIDEO_APP_3: _bindgen_ty_2 = 291;
+pub const AKEYCODE_VIDEO_APP_4: _bindgen_ty_2 = 292;
+pub const AKEYCODE_VIDEO_APP_5: _bindgen_ty_2 = 293;
+pub const AKEYCODE_VIDEO_APP_6: _bindgen_ty_2 = 294;
+pub const AKEYCODE_VIDEO_APP_7: _bindgen_ty_2 = 295;
+pub const AKEYCODE_VIDEO_APP_8: _bindgen_ty_2 = 296;
+pub const AKEYCODE_FEATURED_APP_1: _bindgen_ty_2 = 297;
+pub const AKEYCODE_FEATURED_APP_2: _bindgen_ty_2 = 298;
+pub const AKEYCODE_FEATURED_APP_3: _bindgen_ty_2 = 299;
+pub const AKEYCODE_FEATURED_APP_4: _bindgen_ty_2 = 300;
+pub const AKEYCODE_DEMO_APP_1: _bindgen_ty_2 = 301;
+pub const AKEYCODE_DEMO_APP_2: _bindgen_ty_2 = 302;
+pub const AKEYCODE_DEMO_APP_3: _bindgen_ty_2 = 303;
+pub const AKEYCODE_DEMO_APP_4: _bindgen_ty_2 = 304;
 pub type _bindgen_ty_2 = ::std::os::raw::c_uint;
 pub const ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: _bindgen_ty_3 = 1;
 pub type _bindgen_ty_3 = ::std::os::raw::c_uint;
@@ -1218,8 +1290,8 @@ pub const ALOOPER_EVENT_ERROR: _bindgen_ty_5 = 4;
 pub const ALOOPER_EVENT_HANGUP: _bindgen_ty_5 = 8;
 pub const ALOOPER_EVENT_INVALID: _bindgen_ty_5 = 16;
 pub type _bindgen_ty_5 = ::std::os::raw::c_uint;
-pub type va_list = [u64; 4usize];
-pub type __gnuc_va_list = [u64; 4usize];
+pub type __gnuc_va_list = __BindgenOpaqueArray<u64, 4usize>;
+pub type va_list = __BindgenOpaqueArray<u64, 4usize>;
 #[repr(C)]
 pub struct JavaVMAttachArgs {
     pub version: jint,
@@ -1233,42 +1305,27 @@ fn bindgen_test_layout_JavaVMAttachArgs() {
     assert_eq!(
         ::std::mem::size_of::<JavaVMAttachArgs>(),
         24usize,
-        concat!("Size of: ", stringify!(JavaVMAttachArgs))
+        "Size of JavaVMAttachArgs"
     );
     assert_eq!(
         ::std::mem::align_of::<JavaVMAttachArgs>(),
         8usize,
-        concat!("Alignment of ", stringify!(JavaVMAttachArgs))
+        "Alignment of JavaVMAttachArgs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
-            "::",
-            stringify!(version)
-        )
+        "Offset of field: JavaVMAttachArgs::version"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).name) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
-            "::",
-            stringify!(name)
-        )
+        "Offset of field: JavaVMAttachArgs::name"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).group) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
-            "::",
-            stringify!(group)
-        )
+        "Offset of field: JavaVMAttachArgs::group"
     );
 }
 #[repr(C)]
@@ -1284,32 +1341,22 @@ fn bindgen_test_layout_JavaVMOption() {
     assert_eq!(
         ::std::mem::size_of::<JavaVMOption>(),
         16usize,
-        concat!("Size of: ", stringify!(JavaVMOption))
+        "Size of JavaVMOption"
     );
     assert_eq!(
         ::std::mem::align_of::<JavaVMOption>(),
         8usize,
-        concat!("Alignment of ", stringify!(JavaVMOption))
+        "Alignment of JavaVMOption"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).optionString) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMOption),
-            "::",
-            stringify!(optionString)
-        )
+        "Offset of field: JavaVMOption::optionString"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).extraInfo) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMOption),
-            "::",
-            stringify!(extraInfo)
-        )
+        "Offset of field: JavaVMOption::extraInfo"
     );
 }
 #[repr(C)]
@@ -1326,52 +1373,32 @@ fn bindgen_test_layout_JavaVMInitArgs() {
     assert_eq!(
         ::std::mem::size_of::<JavaVMInitArgs>(),
         24usize,
-        concat!("Size of: ", stringify!(JavaVMInitArgs))
+        "Size of JavaVMInitArgs"
     );
     assert_eq!(
         ::std::mem::align_of::<JavaVMInitArgs>(),
         8usize,
-        concat!("Alignment of ", stringify!(JavaVMInitArgs))
+        "Alignment of JavaVMInitArgs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(version)
-        )
+        "Offset of field: JavaVMInitArgs::version"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).nOptions) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(nOptions)
-        )
+        "Offset of field: JavaVMInitArgs::nOptions"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).options) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(options)
-        )
+        "Offset of field: JavaVMInitArgs::options"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ignoreUnrecognized) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(ignoreUnrecognized)
-        )
+        "Offset of field: JavaVMInitArgs::ignoreUnrecognized"
     );
 }
 pub const AKEY_STATE_UNKNOWN: _bindgen_ty_6 = -1;
@@ -1841,32 +1868,22 @@ fn bindgen_test_layout_imaxdiv_t() {
     assert_eq!(
         ::std::mem::size_of::<imaxdiv_t>(),
         16usize,
-        concat!("Size of: ", stringify!(imaxdiv_t))
+        "Size of imaxdiv_t"
     );
     assert_eq!(
         ::std::mem::align_of::<imaxdiv_t>(),
         8usize,
-        concat!("Alignment of ", stringify!(imaxdiv_t))
+        "Alignment of imaxdiv_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).quot) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(imaxdiv_t),
-            "::",
-            stringify!(quot)
-        )
+        "Offset of field: imaxdiv_t::quot"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rem) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(imaxdiv_t),
-            "::",
-            stringify!(rem)
-        )
+        "Offset of field: imaxdiv_t::rem"
     );
 }
 extern "C" {
@@ -1971,6 +1988,10 @@ pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = 35;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_YCbCr_P010: AHardwareBuffer_Format = 54;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8_UNORM: AHardwareBuffer_Format = 56;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R16_UINT: AHardwareBuffer_Format = 57;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R16G16_UINT: AHardwareBuffer_Format = 58;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R10G10B10A10_UNORM: AHardwareBuffer_Format =
+    59;
 pub type AHardwareBuffer_Format = ::std::os::raw::c_uint;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_NEVER:
     AHardwareBuffer_UsageFlags = 0;
@@ -2008,6 +2029,8 @@ pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP:
     AHardwareBuffer_UsageFlags = 33554432;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE:
     AHardwareBuffer_UsageFlags = 67108864;
+pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_FRONT_BUFFER:
+    AHardwareBuffer_UsageFlags = 4294967296;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_VENDOR_0: AHardwareBuffer_UsageFlags =
     268435456;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_VENDOR_1: AHardwareBuffer_UsageFlags =
@@ -2068,92 +2091,52 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Desc>(),
         40usize,
-        concat!("Size of: ", stringify!(AHardwareBuffer_Desc))
+        "Size of AHardwareBuffer_Desc"
     );
     assert_eq!(
         ::std::mem::align_of::<AHardwareBuffer_Desc>(),
         8usize,
-        concat!("Alignment of ", stringify!(AHardwareBuffer_Desc))
+        "Alignment of AHardwareBuffer_Desc"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).width) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(width)
-        )
+        "Offset of field: AHardwareBuffer_Desc::width"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).height) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(height)
-        )
+        "Offset of field: AHardwareBuffer_Desc::height"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).layers) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(layers)
-        )
+        "Offset of field: AHardwareBuffer_Desc::layers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).format) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(format)
-        )
+        "Offset of field: AHardwareBuffer_Desc::format"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).usage) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(usage)
-        )
+        "Offset of field: AHardwareBuffer_Desc::usage"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stride) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(stride)
-        )
+        "Offset of field: AHardwareBuffer_Desc::stride"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rfu0) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(rfu0)
-        )
+        "Offset of field: AHardwareBuffer_Desc::rfu0"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rfu1) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(rfu1)
-        )
+        "Offset of field: AHardwareBuffer_Desc::rfu1"
     );
 }
 #[repr(C)]
@@ -2171,42 +2154,27 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Plane>(),
         16usize,
-        concat!("Size of: ", stringify!(AHardwareBuffer_Plane))
+        "Size of AHardwareBuffer_Plane"
     );
     assert_eq!(
         ::std::mem::align_of::<AHardwareBuffer_Plane>(),
         8usize,
-        concat!("Alignment of ", stringify!(AHardwareBuffer_Plane))
+        "Alignment of AHardwareBuffer_Plane"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Plane),
-            "::",
-            stringify!(data)
-        )
+        "Offset of field: AHardwareBuffer_Plane::data"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pixelStride) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Plane),
-            "::",
-            stringify!(pixelStride)
-        )
+        "Offset of field: AHardwareBuffer_Plane::pixelStride"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rowStride) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Plane),
-            "::",
-            stringify!(rowStride)
-        )
+        "Offset of field: AHardwareBuffer_Plane::rowStride"
     );
 }
 #[repr(C)]
@@ -2223,32 +2191,22 @@ fn bindgen_test_layout_AHardwareBuffer_Planes() {
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Planes>(),
         72usize,
-        concat!("Size of: ", stringify!(AHardwareBuffer_Planes))
+        "Size of AHardwareBuffer_Planes"
     );
     assert_eq!(
         ::std::mem::align_of::<AHardwareBuffer_Planes>(),
         8usize,
-        concat!("Alignment of ", stringify!(AHardwareBuffer_Planes))
+        "Alignment of AHardwareBuffer_Planes"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).planeCount) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Planes),
-            "::",
-            stringify!(planeCount)
-        )
+        "Offset of field: AHardwareBuffer_Planes::planeCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).planes) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Planes),
-            "::",
-            stringify!(planes)
-        )
+        "Offset of field: AHardwareBuffer_Planes::planes"
     );
 }
 #[repr(C)]
@@ -2348,62 +2306,37 @@ fn bindgen_test_layout_GameActivityPointerAxes() {
     assert_eq!(
         ::std::mem::size_of::<GameActivityPointerAxes>(),
         208usize,
-        concat!("Size of: ", stringify!(GameActivityPointerAxes))
+        "Size of GameActivityPointerAxes"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityPointerAxes>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameActivityPointerAxes))
+        "Alignment of GameActivityPointerAxes"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(id)
-        )
+        "Offset of field: GameActivityPointerAxes::id"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).toolType) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(toolType)
-        )
+        "Offset of field: GameActivityPointerAxes::toolType"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).axisValues) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(axisValues)
-        )
+        "Offset of field: GameActivityPointerAxes::axisValues"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rawX) as usize - ptr as usize },
         200usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(rawX)
-        )
+        "Offset of field: GameActivityPointerAxes::rawX"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rawY) as usize - ptr as usize },
         204usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(rawY)
-        )
+        "Offset of field: GameActivityPointerAxes::rawY"
     );
 }
 extern "C" {
@@ -2453,202 +2386,107 @@ fn bindgen_test_layout_GameActivityMotionEvent() {
     assert_eq!(
         ::std::mem::size_of::<GameActivityMotionEvent>(),
         1760usize,
-        concat!("Size of: ", stringify!(GameActivityMotionEvent))
+        "Size of GameActivityMotionEvent"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityMotionEvent>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameActivityMotionEvent))
+        "Alignment of GameActivityMotionEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(deviceId)
-        )
+        "Offset of field: GameActivityMotionEvent::deviceId"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(source)
-        )
+        "Offset of field: GameActivityMotionEvent::source"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(action)
-        )
+        "Offset of field: GameActivityMotionEvent::action"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(eventTime)
-        )
+        "Offset of field: GameActivityMotionEvent::eventTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(downTime)
-        )
+        "Offset of field: GameActivityMotionEvent::downTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: GameActivityMotionEvent::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(metaState)
-        )
+        "Offset of field: GameActivityMotionEvent::metaState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).actionButton) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(actionButton)
-        )
+        "Offset of field: GameActivityMotionEvent::actionButton"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).buttonState) as usize - ptr as usize },
         44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(buttonState)
-        )
+        "Offset of field: GameActivityMotionEvent::buttonState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).classification) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(classification)
-        )
+        "Offset of field: GameActivityMotionEvent::classification"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).edgeFlags) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(edgeFlags)
-        )
+        "Offset of field: GameActivityMotionEvent::edgeFlags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pointerCount) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(pointerCount)
-        )
+        "Offset of field: GameActivityMotionEvent::pointerCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pointers) as usize - ptr as usize },
         60usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(pointers)
-        )
+        "Offset of field: GameActivityMotionEvent::pointers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historySize) as usize - ptr as usize },
         1724usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historySize)
-        )
+        "Offset of field: GameActivityMotionEvent::historySize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesMillis) as usize - ptr as usize },
         1728usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalEventTimesMillis)
-        )
+        "Offset of field: GameActivityMotionEvent::historicalEventTimesMillis"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesNanos) as usize - ptr as usize },
         1736usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalEventTimesNanos)
-        )
+        "Offset of field: GameActivityMotionEvent::historicalEventTimesNanos"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historicalAxisValues) as usize - ptr as usize },
         1744usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalAxisValues)
-        )
+        "Offset of field: GameActivityMotionEvent::historicalAxisValues"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).precisionX) as usize - ptr as usize },
         1752usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(precisionX)
-        )
+        "Offset of field: GameActivityMotionEvent::precisionX"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).precisionY) as usize - ptr as usize },
         1756usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(precisionY)
-        )
+        "Offset of field: GameActivityMotionEvent::precisionY"
     );
 }
 extern "C" {
@@ -2663,14 +2501,6 @@ extern "C" {
     #[doc = " \\brief Handle the freeing of the GameActivityMotionEvent struct."]
     pub fn GameActivityMotionEvent_destroy(c_event: *mut GameActivityMotionEvent);
 }
-extern "C" {
-    #[doc = " \\brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`.\n\n This is done automatically by the GameActivity: see `onTouchEvent` to set\n a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityMotionEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityMotionEvent,
-    );
-}
 #[doc = " \\brief Describe a key event that happened on the GameActivity SurfaceView.\n\n This is 1:1 mapping to the information contained in a Java `KeyEvent`\n (see https://developer.android.com/reference/android/view/KeyEvent).\n The only exception is the event times, which are reported as\n nanoseconds in this struct."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -2694,146 +2524,69 @@ fn bindgen_test_layout_GameActivityKeyEvent() {
     assert_eq!(
         ::std::mem::size_of::<GameActivityKeyEvent>(),
         56usize,
-        concat!("Size of: ", stringify!(GameActivityKeyEvent))
+        "Size of GameActivityKeyEvent"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityKeyEvent>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameActivityKeyEvent))
+        "Alignment of GameActivityKeyEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(deviceId)
-        )
+        "Offset of field: GameActivityKeyEvent::deviceId"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(source)
-        )
+        "Offset of field: GameActivityKeyEvent::source"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(action)
-        )
+        "Offset of field: GameActivityKeyEvent::action"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(eventTime)
-        )
+        "Offset of field: GameActivityKeyEvent::eventTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(downTime)
-        )
+        "Offset of field: GameActivityKeyEvent::downTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: GameActivityKeyEvent::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(metaState)
-        )
+        "Offset of field: GameActivityKeyEvent::metaState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).modifiers) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(modifiers)
-        )
+        "Offset of field: GameActivityKeyEvent::modifiers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).repeatCount) as usize - ptr as usize },
         44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(repeatCount)
-        )
+        "Offset of field: GameActivityKeyEvent::repeatCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyCode) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(keyCode)
-        )
+        "Offset of field: GameActivityKeyEvent::keyCode"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).scanCode) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(scanCode)
-        )
+        "Offset of field: GameActivityKeyEvent::scanCode"
     );
 }
-extern "C" {
-    #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.\n\n This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`\n to set a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityKeyEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityKeyEvent,
-    );
-}
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
-    GameCommonInsetsType = 3;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
-#[doc = " The type of a component for which to retrieve insets. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
-pub type GameCommonInsetsType = ::std::os::raw::c_uint;
 #[doc = " This struct holds a span within a region of text from start (inclusive) to\n end (exclusive). An empty span or cursor position is specified with\n start==end. An undefined span is specified with start = end = SPAN_UNDEFINED."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -2850,37 +2603,27 @@ fn bindgen_test_layout_GameTextInputSpan() {
     assert_eq!(
         ::std::mem::size_of::<GameTextInputSpan>(),
         8usize,
-        concat!("Size of: ", stringify!(GameTextInputSpan))
+        "Size of GameTextInputSpan"
     );
     assert_eq!(
         ::std::mem::align_of::<GameTextInputSpan>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameTextInputSpan))
+        "Alignment of GameTextInputSpan"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).start) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputSpan),
-            "::",
-            stringify!(start)
-        )
+        "Offset of field: GameTextInputSpan::start"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).end) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputSpan),
-            "::",
-            stringify!(end)
-        )
+        "Offset of field: GameTextInputSpan::end"
     );
 }
 pub const GameTextInputSpanFlag_SPAN_UNDEFINED: GameTextInputSpanFlag = -1;
 #[doc = " Values with special meaning in a GameTextInputSpan."]
-pub type GameTextInputSpanFlag = ::std::os::raw::c_int;
+pub type GameTextInputSpanFlag = i32;
 #[doc = " This struct holds the state of an editable section of text.\n The text can have a selection and a composing region defined on it.\n A composing region is used by IMEs that allow input using multiple steps to\n compose a glyph or word. Use functions GameTextInput_getState and\n GameTextInput_setState to read and modify the state that an IME is editing."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -2901,52 +2644,32 @@ fn bindgen_test_layout_GameTextInputState() {
     assert_eq!(
         ::std::mem::size_of::<GameTextInputState>(),
         32usize,
-        concat!("Size of: ", stringify!(GameTextInputState))
+        "Size of GameTextInputState"
     );
     assert_eq!(
         ::std::mem::align_of::<GameTextInputState>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameTextInputState))
+        "Alignment of GameTextInputState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).text_UTF8) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(text_UTF8)
-        )
+        "Offset of field: GameTextInputState::text_UTF8"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).text_length) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(text_length)
-        )
+        "Offset of field: GameTextInputState::text_length"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).selection) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(selection)
-        )
+        "Offset of field: GameTextInputState::selection"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).composingRegion) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(composingRegion)
-        )
+        "Offset of field: GameTextInputState::composingRegion"
     );
 }
 #[doc = " A callback called by GameTextInput_getState.\n @param context User-defined context.\n @param state State, owned by the library, that will be valid for the duration\n of the callback."]
@@ -2978,7 +2701,7 @@ pub const ShowImeFlags_SHOW_IME_UNDEFINED: ShowImeFlags = 0;
 pub const ShowImeFlags_SHOW_IMPLICIT: ShowImeFlags = 1;
 pub const ShowImeFlags_SHOW_FORCED: ShowImeFlags = 2;
 #[doc = " Flags to be passed to GameTextInput_showIme."]
-pub type ShowImeFlags = ::std::os::raw::c_uint;
+pub type ShowImeFlags = u32;
 extern "C" {
     #[doc = " Show the IME. Calls InputMethodManager.showSoftInput().\n @param input A valid GameTextInput library handle.\n @param flags Defined in ShowImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
     pub fn GameTextInput_showIme(input: *mut GameTextInput, flags: u32);
@@ -2987,9 +2710,9 @@ pub const HideImeFlags_HIDE_IME_UNDEFINED: HideImeFlags = 0;
 pub const HideImeFlags_HIDE_IMPLICIT_ONLY: HideImeFlags = 1;
 pub const HideImeFlags_HIDE_NOT_ALWAYS: HideImeFlags = 2;
 #[doc = " Flags to be passed to GameTextInput_hideIme."]
-pub type HideImeFlags = ::std::os::raw::c_uint;
+pub type HideImeFlags = u32;
 extern "C" {
-    #[doc = " Show the IME. Calls InputMethodManager.hideSoftInputFromWindow().\n @param input A valid GameTextInput library handle.\n @param flags Defined in HideImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
+    #[doc = " Hide the IME. Calls InputMethodManager.hideSoftInputFromWindow().\n @param input A valid GameTextInput library handle.\n @param flags Defined in HideImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
     pub fn GameTextInput_hideIme(input: *mut GameTextInput, flags: u32);
 }
 extern "C" {
@@ -3016,7 +2739,7 @@ pub type GameTextInputEventCallback = ::std::option::Option<
     ),
 >;
 extern "C" {
-    #[doc = " Optionally set a callback to be called whenever the IME state changes.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME state changes.\n @param context Context passed as first argument to the callback."]
+    #[doc = " Optionally set a callback to be called whenever the IME state changes.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME state changes.\n @param context Context passed as first argument to the callback.\n <b>This function is deprecated. Don't perform any complex processing inside\n the callback other than copying the state variable. Using any synchronization\n primitives inside this callback may cause a deadlock.</b>"]
     pub fn GameTextInput_setEventCallback(
         input: *mut GameTextInput,
         callback: GameTextInputEventCallback,
@@ -3059,6 +2782,144 @@ extern "C" {
         context: *mut ::std::os::raw::c_void,
     );
 }
+#[doc = " Mask of bits that determine the overall class\n of text being given.  Currently supported classes are:\n {@link #TYPE_CLASS_TEXT}, {@link #TYPE_CLASS_NUMBER},\n {@link #TYPE_CLASS_PHONE}, {@link #TYPE_CLASS_DATETIME}.\n <p>IME authors: If the class is not one you\n understand, assume {@link #TYPE_CLASS_TEXT} with NO variation\n or flags.<p>"]
+pub const GameTextInputType_TYPE_MASK_CLASS: GameTextInputType = 15;
+#[doc = " Mask of bits that determine the variation of\n the base content class."]
+pub const GameTextInputType_TYPE_MASK_VARIATION: GameTextInputType = 4080;
+#[doc = " Mask of bits that provide addition bit flags\n of options."]
+pub const GameTextInputType_TYPE_MASK_FLAGS: GameTextInputType = 16773120;
+#[doc = " Special content type for when no explicit type has been specified.\n This should be interpreted to mean that the target input connection\n is not rich, it can not process and show things like candidate text nor\n retrieve the current text, so the input method will need to run in a\n limited \"generate key events\" mode, if it supports it. Note that some\n input methods may not support it, for example a voice-based input\n method will likely not be able to generate key events even if this\n flag is set."]
+pub const GameTextInputType_TYPE_NULL: GameTextInputType = 0;
+#[doc = " Class for normal text.  This class supports the following flags (only\n one of which should be set):\n {@link #TYPE_TEXT_FLAG_CAP_CHARACTERS},\n {@link #TYPE_TEXT_FLAG_CAP_WORDS}, and.\n {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}.  It also supports the\n following variations:\n {@link #TYPE_TEXT_VARIATION_NORMAL}, and\n {@link #TYPE_TEXT_VARIATION_URI}.  If you do not recognize the\n variation, normal should be assumed."]
+pub const GameTextInputType_TYPE_CLASS_TEXT: GameTextInputType = 1;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: capitalize all characters.  Overrides\n {@link #TYPE_TEXT_FLAG_CAP_WORDS} and\n {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}.  This value is explicitly defined\n to be the same as {@link TextUtils#CAP_MODE_CHARACTERS}. Of course,\n this only affects languages where there are upper-case and lower-case\n letters."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_CAP_CHARACTERS: GameTextInputType = 4096;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: capitalize the first character of\n every word.  Overrides {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}.  This\n value is explicitly defined\n to be the same as {@link TextUtils#CAP_MODE_WORDS}. Of course,\n this only affects languages where there are upper-case and lower-case\n letters."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_CAP_WORDS: GameTextInputType = 8192;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: capitalize the first character of\n each sentence.  This value is explicitly defined\n to be the same as {@link TextUtils#CAP_MODE_SENTENCES}. For example\n in English it means to capitalize after a period and a space (note that\n other languages may have different characters for period, or not use\n spaces, or use different grammatical rules). Of course, this only affects\n languages where there are upper-case and lower-case letters."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_CAP_SENTENCES: GameTextInputType = 16384;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the user is entering free-form\n text that should have auto-correction applied to it. Without this flag,\n the IME will not try to correct typos. You should always set this flag\n unless you really expect users to type non-words in this field, for\n example to choose a name for a character in a game.\n Contrast this with {@link #TYPE_TEXT_FLAG_AUTO_COMPLETE} and\n {@link #TYPE_TEXT_FLAG_NO_SUGGESTIONS}:\n {@code TYPE_TEXT_FLAG_AUTO_CORRECT} means that the IME will try to\n auto-correct typos as the user is typing, but does not define whether\n the IME offers an interface to show suggestions."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_AUTO_CORRECT: GameTextInputType = 32768;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the text editor (which means\n the application) is performing auto-completion of the text being entered\n based on its own semantics, which it will present to the user as they type.\n This generally means that the input method should not be showing\n candidates itself, but can expect the editor to supply its own\n completions/candidates from\n {@link android.view.inputmethod.InputMethodSession#displayCompletions\n InputMethodSession.displayCompletions()} as a result of the editor calling\n {@link android.view.inputmethod.InputMethodManager#displayCompletions\n InputMethodManager.displayCompletions()}.\n Note the contrast with {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} and\n {@link #TYPE_TEXT_FLAG_NO_SUGGESTIONS}:\n {@code TYPE_TEXT_FLAG_AUTO_COMPLETE} means the editor should show an\n interface for displaying suggestions, but instead of supplying its own\n it will rely on the Editor to pass completions/corrections."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_AUTO_COMPLETE: GameTextInputType = 65536;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: multiple lines of text can be\n entered into the field.  If this flag is not set, the text field\n will be constrained to a single line. The IME may also choose not to\n display an enter key when this flag is not set, as there should be no\n need to create new lines."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_MULTI_LINE: GameTextInputType = 131072;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the regular text view associated\n with this should not be multi-line, but when a fullscreen input method\n is providing text it should use multiple lines if it can."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_IME_MULTI_LINE: GameTextInputType = 262144;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the input method does not need to\n display any dictionary-based candidates. This is useful for text views that\n do not contain words from the language and do not benefit from any\n dictionary-based completions or corrections. It overrides the\n {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} value when set.\n Please avoid using this unless you are certain this is what you want.\n Many input methods need suggestions to work well, for example the ones\n based on gesture typing. Consider clearing\n {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} instead if you just do not\n want the IME to correct typos.\n Note the contrast with {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} and\n {@link #TYPE_TEXT_FLAG_AUTO_COMPLETE}:\n {@code TYPE_TEXT_FLAG_NO_SUGGESTIONS} means the IME does not need to\n show an interface to display suggestions. Most IMEs will also take this to\n mean they do not need to try to auto-correct what the user is typing."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_NO_SUGGESTIONS: GameTextInputType = 524288;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: Let the IME know the text conversion\n suggestions are required by the application. Text conversion suggestion is\n for the transliteration languages which has pronunciation characters and\n target characters. When the user is typing the pronunciation charactes, the\n IME could provide the possible target characters to the user. When this\n flag is set, the IME should insert the text conversion suggestions through\n {@link Builder#setTextConversionSuggestions(List)} and\n the {@link TextAttribute} with initialized with the text conversion\n suggestions is provided by the IME to the application. To receive the\n additional information, the application needs to implement {@link\n InputConnection#setComposingText(CharSequence, int, TextAttribute)},\n {@link InputConnection#setComposingRegion(int, int, TextAttribute)}, and\n {@link InputConnection#commitText(CharSequence, int, TextAttribute)}."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS: GameTextInputType =
+    1048576;
+#[doc = " Default variation of {@link #TYPE_CLASS_TEXT}: plain old normal text."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_NORMAL: GameTextInputType = 0;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a URI."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_URI: GameTextInputType = 16;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering an e-mail address."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_EMAIL_ADDRESS: GameTextInputType = 32;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering the subject line of\n an e-mail."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_EMAIL_SUBJECT: GameTextInputType = 48;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a short, possibly informal\n message such as an instant message or a text message."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_SHORT_MESSAGE: GameTextInputType = 64;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering the content of a long,\n possibly formal message such as the body of an e-mail."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_LONG_MESSAGE: GameTextInputType = 80;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering the name of a person."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_PERSON_NAME: GameTextInputType = 96;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a postal mailing address."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_POSTAL_ADDRESS: GameTextInputType = 112;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a password."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_PASSWORD: GameTextInputType = 128;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a password, which should\n be visible to the user."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_VISIBLE_PASSWORD: GameTextInputType = 144;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering text inside of a web form."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_WEB_EDIT_TEXT: GameTextInputType = 160;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering text to filter contents\n of a list etc."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_FILTER: GameTextInputType = 176;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering text for phonetic\n pronunciation, such as a phonetic name field in contacts. This is mostly\n useful for languages where one spelling may have several phonetic\n readings, like Japanese."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_PHONETIC: GameTextInputType = 192;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering e-mail address inside\n of a web form.  This was added in\n {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An IME must target\n this API version or later to see this input type; if it doesn't, a request\n for this type will be seen as {@link #TYPE_TEXT_VARIATION_EMAIL_ADDRESS}\n when passed through {@link\n android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS: GameTextInputType = 208;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering password inside\n of a web form.  This was added in\n {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An IME must target\n this API version or later to see this input type; if it doesn't, a request\n for this type will be seen as {@link #TYPE_TEXT_VARIATION_PASSWORD}\n when passed through {@link\n android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_WEB_PASSWORD: GameTextInputType = 224;
+#[doc = " Class for numeric text.  This class supports the following flags:\n {@link #TYPE_NUMBER_FLAG_SIGNED} and\n {@link #TYPE_NUMBER_FLAG_DECIMAL}.  It also supports the following\n variations: {@link #TYPE_NUMBER_VARIATION_NORMAL} and\n {@link #TYPE_NUMBER_VARIATION_PASSWORD}.\n <p>IME authors: If you do not recognize\n the variation, normal should be assumed.</p>"]
+pub const GameTextInputType_TYPE_CLASS_NUMBER: GameTextInputType = 2;
+#[doc = " Flag of {@link #TYPE_CLASS_NUMBER}: the number is signed, allowing\n a positive or negative sign at the start."]
+pub const GameTextInputType_TYPE_NUMBER_FLAG_SIGNED: GameTextInputType = 4096;
+#[doc = " Flag of {@link #TYPE_CLASS_NUMBER}: the number is decimal, allowing\n a decimal point to provide fractional values."]
+pub const GameTextInputType_TYPE_NUMBER_FLAG_DECIMAL: GameTextInputType = 8192;
+#[doc = " Default variation of {@link #TYPE_CLASS_NUMBER}: plain normal\n numeric text.  This was added in\n {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An IME must target\n this API version or later to see this input type; if it doesn't, a request\n for this type will be dropped when passed through\n {@link android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_NUMBER_VARIATION_NORMAL: GameTextInputType = 0;
+#[doc = " Variation of {@link #TYPE_CLASS_NUMBER}: entering a numeric password.\n This was added in {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An\n IME must target this API version or later to see this input type; if it\n doesn't, a request for this type will be dropped when passed\n through {@link android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_NUMBER_VARIATION_PASSWORD: GameTextInputType = 16;
+#[doc = " Class for a phone number.  This class currently supports no variations\n or flags."]
+pub const GameTextInputType_TYPE_CLASS_PHONE: GameTextInputType = 3;
+#[doc = " Class for dates and times.  It supports the\n following variations:\n {@link #TYPE_DATETIME_VARIATION_NORMAL}\n {@link #TYPE_DATETIME_VARIATION_DATE}, and\n {@link #TYPE_DATETIME_VARIATION_TIME}."]
+pub const GameTextInputType_TYPE_CLASS_DATETIME: GameTextInputType = 4;
+#[doc = " Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering\n both a date and time."]
+pub const GameTextInputType_TYPE_DATETIME_VARIATION_NORMAL: GameTextInputType = 0;
+#[doc = " Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering\n only a date."]
+pub const GameTextInputType_TYPE_DATETIME_VARIATION_DATE: GameTextInputType = 16;
+#[doc = " Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering\n only a time."]
+pub const GameTextInputType_TYPE_DATETIME_VARIATION_TIME: GameTextInputType = 32;
+#[doc = " Definitions for inputType argument of GameActivity_setImeEditorInfo()\n\n <pre>\n |-------|-------|-------|-------|\n                              1111 TYPE_MASK_CLASS\n                      11111111     TYPE_MASK_VARIATION\n          111111111111             TYPE_MASK_FLAGS\n |-------|-------|-------|-------|\n                                   TYPE_NULL\n |-------|-------|-------|-------|\n                                 1 TYPE_CLASS_TEXT\n                             1     TYPE_TEXT_VARIATION_URI\n                            1      TYPE_TEXT_VARIATION_EMAIL_ADDRESS\n                            11     TYPE_TEXT_VARIATION_EMAIL_SUBJECT\n                           1       TYPE_TEXT_VARIATION_SHORT_MESSAGE\n                           1 1     TYPE_TEXT_VARIATION_LONG_MESSAGE\n                           11      TYPE_TEXT_VARIATION_PERSON_NAME\n                           111     TYPE_TEXT_VARIATION_POSTAL_ADDRESS\n                          1        TYPE_TEXT_VARIATION_PASSWORD\n                          1  1     TYPE_TEXT_VARIATION_VISIBLE_PASSWORD\n                          1 1      TYPE_TEXT_VARIATION_WEB_EDIT_TEXT\n                          1 11     TYPE_TEXT_VARIATION_FILTER\n                          11       TYPE_TEXT_VARIATION_PHONETIC\n                          11 1     TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS\n                          111      TYPE_TEXT_VARIATION_WEB_PASSWORD\n                     1             TYPE_TEXT_FLAG_CAP_CHARACTERS\n                    1              TYPE_TEXT_FLAG_CAP_WORDS\n                   1               TYPE_TEXT_FLAG_CAP_SENTENCES\n                  1                TYPE_TEXT_FLAG_AUTO_CORRECT\n                 1                 TYPE_TEXT_FLAG_AUTO_COMPLETE\n                1                  TYPE_TEXT_FLAG_MULTI_LINE\n               1                   TYPE_TEXT_FLAG_IME_MULTI_LINE\n              1                    TYPE_TEXT_FLAG_NO_SUGGESTIONS\n             1 TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS\n |-------|-------|-------|-------|\n                                1  TYPE_CLASS_NUMBER\n                             1     TYPE_NUMBER_VARIATION_PASSWORD\n                     1             TYPE_NUMBER_FLAG_SIGNED\n                    1              TYPE_NUMBER_FLAG_DECIMAL\n |-------|-------|-------|-------|\n                                11 TYPE_CLASS_PHONE\n |-------|-------|-------|-------|\n                               1   TYPE_CLASS_DATETIME\n                             1     TYPE_DATETIME_VARIATION_DATE\n                            1      TYPE_DATETIME_VARIATION_TIME\n |-------|-------|-------|-------|</pre>"]
+pub type GameTextInputType = u32;
+#[doc = " Set of bits in {@link #imeOptions} that provide alternative actions\n associated with the \"enter\" key.  This both helps the IME provide\n better feedback about what the enter key will do, and also allows it\n to provide alternative mechanisms for providing that command."]
+pub const GameTextInputActionType_IME_MASK_ACTION: GameTextInputActionType = 255;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: no specific action has been\n associated with this editor, let the editor come up with its own if\n it can."]
+pub const GameTextInputActionType_IME_ACTION_UNSPECIFIED: GameTextInputActionType = 0;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: there is no available action."]
+pub const GameTextInputActionType_IME_ACTION_NONE: GameTextInputActionType = 1;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"go\"\n operation to take the user to the target of the text they typed.\n Typically used, for example, when entering a URL."]
+pub const GameTextInputActionType_IME_ACTION_GO: GameTextInputActionType = 2;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"search\"\n operation, taking the user to the results of searching for the text\n they have typed (in whatever context is appropriate)."]
+pub const GameTextInputActionType_IME_ACTION_SEARCH: GameTextInputActionType = 3;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"send\"\n operation, delivering the text to its target.  This is typically used\n when composing a message in IM or SMS where sending is immediate."]
+pub const GameTextInputActionType_IME_ACTION_SEND: GameTextInputActionType = 4;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"next\"\n operation, taking the user to the next field that will accept text."]
+pub const GameTextInputActionType_IME_ACTION_NEXT: GameTextInputActionType = 5;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"done\"\n operation, typically meaning there is nothing more to input and the\n IME will be closed."]
+pub const GameTextInputActionType_IME_ACTION_DONE: GameTextInputActionType = 6;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: like {@link #IME_ACTION_NEXT}, but\n for moving to the previous field.  This will normally not be used to\n specify an action (since it precludes {@link #IME_ACTION_NEXT}), but\n can be returned to the app if it sets {@link #IME_FLAG_NAVIGATE_PREVIOUS}."]
+pub const GameTextInputActionType_IME_ACTION_PREVIOUS: GameTextInputActionType = 7;
+#[doc = " actionId and imeOptions argument of GameActivity_setImeEditorInfo().\n\n <pre>\n |-------|-------|-------|-------|\n                              1111 IME_MASK_ACTION\n |-------|-------|-------|-------|\n                                   IME_ACTION_UNSPECIFIED\n                                 1 IME_ACTION_NONE\n                                1  IME_ACTION_GO\n                                11 IME_ACTION_SEARCH\n                               1   IME_ACTION_SEND\n                               1 1 IME_ACTION_NEXT\n                               11  IME_ACTION_DONE\n                               111 IME_ACTION_PREVIOUS\n         1                         IME_FLAG_NO_PERSONALIZED_LEARNING\n        1                          IME_FLAG_NO_FULLSCREEN\n       1                           IME_FLAG_NAVIGATE_PREVIOUS\n      1                            IME_FLAG_NAVIGATE_NEXT\n     1                             IME_FLAG_NO_EXTRACT_UI\n    1                              IME_FLAG_NO_ACCESSORY_ACTION\n   1                               IME_FLAG_NO_ENTER_ACTION\n  1                                IME_FLAG_FORCE_ASCII\n |-------|-------|-------|-------|</pre>"]
+pub type GameTextInputActionType = u32;
+#[doc = " Flag of {@link #imeOptions}: used to request that the IME should not update\n any personalized data such as typing history and personalized language\n model based on what the user typed on this text editing object.  Typical\n use cases are: <ul> <li>When the application is in a special mode, where\n user's activities are expected to be not recorded in the application's\n history.  Some web browsers and chat applications may have this kind of\n modes.</li> <li>When storing typing history does not make much sense.\n Specifying this flag in typing games may help to avoid typing history from\n being filled up with words that the user is less likely to type in their\n daily life.  Another example is that when the application already knows\n that the expected input is not a valid word (e.g. a promotion code that is\n     not a valid word in any natural language).</li>\n </ul>\n\n <p>Applications need to be aware that the flag is not a guarantee, and some\n IMEs may not respect it.</p>"]
+pub const GameTextInputImeOptions_IME_FLAG_NO_PERSONALIZED_LEARNING: GameTextInputImeOptions =
+    16777216;
+#[doc = " Flag of {@link #imeOptions}: used to request that the IME never go\n into fullscreen mode.\n By default, IMEs may go into full screen mode when they think\n it's appropriate, for example on small screens in landscape\n orientation where displaying a software keyboard may occlude\n such a large portion of the screen that the remaining part is\n too small to meaningfully display the application UI.\n If this flag is set, compliant IMEs will never go into full screen mode,\n and always leave some space to display the application UI.\n Applications need to be aware that the flag is not a guarantee, and\n some IMEs may ignore it."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_FULLSCREEN: GameTextInputImeOptions = 33554432;
+#[doc = " Flag of {@link #imeOptions}: like {@link #IME_FLAG_NAVIGATE_NEXT}, but\n specifies there is something interesting that a backward navigation\n can focus on.  If the user selects the IME's facility to backward\n navigate, this will show up in the application as an {@link\n #IME_ACTION_PREVIOUS} at {@link InputConnection#performEditorAction(int)\n InputConnection.performEditorAction(int)}."]
+pub const GameTextInputImeOptions_IME_FLAG_NAVIGATE_PREVIOUS: GameTextInputImeOptions = 67108864;
+#[doc = " Flag of {@link #imeOptions}: used to specify that there is something\n interesting that a forward navigation can focus on. This is like using\n {@link #IME_ACTION_NEXT}, except allows the IME to be multiline (with\n an enter key) as well as provide forward navigation.  Note that some\n IMEs may not be able to do this, especially when running on a small\n screen where there is little space.  In that case it does not need to\n present a UI for this option.  Like {@link #IME_ACTION_NEXT}, if the\n user selects the IME's facility to forward navigate, this will show up\n in the application at {@link InputConnection#performEditorAction(int)\n InputConnection.performEditorAction(int)}."]
+pub const GameTextInputImeOptions_IME_FLAG_NAVIGATE_NEXT: GameTextInputImeOptions = 134217728;
+#[doc = " Flag of {@link #imeOptions}: used to specify that the IME does not need\n to show its extracted text UI.  For input methods that may be fullscreen,\n often when in landscape mode, this allows them to be smaller and let part\n of the application be shown behind, through transparent UI parts in the\n fullscreen IME. The part of the UI visible to the user may not be\n responsive to touch because the IME will receive touch events, which may\n confuse the user; use {@link #IME_FLAG_NO_FULLSCREEN} instead for a better\n experience. Using this flag is discouraged and it may become deprecated in\n the future. Its meaning is unclear in some situations and it may not work\n appropriately on older versions of the platform."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_EXTRACT_UI: GameTextInputImeOptions = 268435456;
+#[doc = " Flag of {@link #imeOptions}: used in conjunction with one of the actions\n masked by {@link #IME_MASK_ACTION}, this indicates that the action\n should not be available as an accessory button on the right of the\n extracted text when the input method is full-screen. Note that by setting\n this flag, there can be cases where the action is simply never available to\n the user. Setting this generally means that you think that in fullscreen\n mode, where there is little space to show the text, it's not worth taking\n some screen real estate to display the action and it should be used instead\n to show more text."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_ACCESSORY_ACTION: GameTextInputImeOptions = 536870912;
+#[doc = " Flag of {@link #imeOptions}: used in conjunction with one of the actions\n masked by {@link #IME_MASK_ACTION}. If this flag is not set, IMEs will\n normally replace the \"enter\" key with the action supplied. This flag\n indicates that the action should not be available in-line as a replacement\n for the \"enter\" key. Typically this is because the action has such a\n significant impact or is not recoverable enough that accidentally hitting\n it should be avoided, such as sending a message. Note that\n {@link android.widget.TextView} will automatically set this flag for you\n on multi-line text views."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_ENTER_ACTION: GameTextInputImeOptions = 1073741824;
+#[doc = " Flag of {@link #imeOptions}: used to request an IME that is capable of\n inputting ASCII characters.  The intention of this flag is to ensure that\n the user can type Roman alphabet characters in a {@link\n android.widget.TextView}. It is typically used for an account ID or\n password input. A lot of the time, IMEs are already able to input ASCII\n even without being told so (such IMEs already respect this flag in a\n sense), but there are cases when this is not the default. For instance,\n users of languages using a different script like Arabic, Greek, Hebrew or\n Russian typically have a keyboard that can't input ASCII characters by\n default. Applications need to be aware that the flag is not a guarantee,\n and some IMEs may not respect it. However, it is strongly recommended for\n IME authors to respect this flag especially when their IME could end up\n with a state where only languages using non-ASCII are enabled."]
+pub const GameTextInputImeOptions_IME_FLAG_FORCE_ASCII: GameTextInputImeOptions = 2147483648;
+#[doc = " Flag of {@link #internalImeOptions}: flag is set when app window containing\n this\n {@link EditorInfo} is using {@link Configuration#ORIENTATION_PORTRAIT}\n mode.\n @hide"]
+pub const GameTextInputImeOptions_IME_INTERNAL_FLAG_APP_WINDOW_PORTRAIT: GameTextInputImeOptions =
+    1;
+#[doc = " Generic unspecified type for {@link #imeOptions}."]
+pub const GameTextInputImeOptions_IME_NULL: GameTextInputImeOptions = 0;
+pub type GameTextInputImeOptions = u32;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
+    GameCommonInsetsType = 3;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
+#[doc = " The type of a component for which to retrieve insets. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
+pub type GameCommonInsetsType = u8;
 #[doc = " This structure defines the native side of an android.app.GameActivity.\n It is created by the framework, and handed to the application's native\n code as it is being launched."]
 #[repr(C)]
 pub struct GameActivity {
@@ -3090,112 +2951,62 @@ fn bindgen_test_layout_GameActivity() {
     assert_eq!(
         ::std::mem::size_of::<GameActivity>(),
         80usize,
-        concat!("Size of: ", stringify!(GameActivity))
+        "Size of GameActivity"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivity>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameActivity))
+        "Alignment of GameActivity"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).callbacks) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(callbacks)
-        )
+        "Offset of field: GameActivity::callbacks"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).vm) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(vm)
-        )
+        "Offset of field: GameActivity::vm"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).env) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(env)
-        )
+        "Offset of field: GameActivity::env"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).javaGameActivity) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(javaGameActivity)
-        )
+        "Offset of field: GameActivity::javaGameActivity"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).internalDataPath) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(internalDataPath)
-        )
+        "Offset of field: GameActivity::internalDataPath"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).externalDataPath) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(externalDataPath)
-        )
+        "Offset of field: GameActivity::externalDataPath"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sdkVersion) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(sdkVersion)
-        )
+        "Offset of field: GameActivity::sdkVersion"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).instance) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(instance)
-        )
+        "Offset of field: GameActivity::instance"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).assetManager) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(assetManager)
-        )
+        "Offset of field: GameActivity::assetManager"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).obbPath) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(obbPath)
-        )
+        "Offset of field: GameActivity::obbPath"
     );
 }
 #[doc = " A function the user should call from their callback with the data, its length\n and the library- supplied context."]
@@ -3252,7 +3063,7 @@ pub struct GameActivityCallbacks {
     pub onNativeWindowDestroyed: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The current device AConfiguration has changed.  The new configuration can\n be retrieved from assetManager."]
+    #[doc = " The current device AConfiguration has changed. The new configuration can\n be retrieved from assetManager."]
     pub onConfigurationChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
     #[doc = " The system is running low on memory.  Use this callback to release\n resources you do not need, to help the system avoid killing more\n important processes."]
@@ -3291,6 +3102,13 @@ pub struct GameActivityCallbacks {
     pub onContentRectChanged: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, rect: *const ARect),
     >,
+    #[doc = " Callback called when the software keyboard is shown or hidden."]
+    pub onSoftwareKeyboardVisibilityChanged:
+        ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity, visible: bool)>,
+    #[doc = " Callback called when the software keyboard is shown or hidden."]
+    pub onEditorAction: ::std::option::Option<
+        unsafe extern "C" fn(activity: *mut GameActivity, action: ::std::os::raw::c_int) -> bool,
+    >,
 }
 #[test]
 fn bindgen_test_layout_GameActivityCallbacks() {
@@ -3299,203 +3117,120 @@ fn bindgen_test_layout_GameActivityCallbacks() {
     let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<GameActivityCallbacks>(),
-        152usize,
-        concat!("Size of: ", stringify!(GameActivityCallbacks))
+        168usize,
+        "Size of GameActivityCallbacks"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityCallbacks>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameActivityCallbacks))
+        "Alignment of GameActivityCallbacks"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onStart) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onStart)
-        )
+        "Offset of field: GameActivityCallbacks::onStart"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onResume) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onResume)
-        )
+        "Offset of field: GameActivityCallbacks::onResume"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onSaveInstanceState) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onSaveInstanceState)
-        )
+        "Offset of field: GameActivityCallbacks::onSaveInstanceState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onPause) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onPause)
-        )
+        "Offset of field: GameActivityCallbacks::onPause"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onStop) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onStop)
-        )
+        "Offset of field: GameActivityCallbacks::onStop"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onDestroy) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onDestroy)
-        )
+        "Offset of field: GameActivityCallbacks::onDestroy"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onWindowFocusChanged) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onWindowFocusChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onWindowFocusChanged"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowCreated) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowCreated)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowCreated"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowResized) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowResized)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowResized"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowRedrawNeeded) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowRedrawNeeded)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowRedrawNeeded"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowDestroyed) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowDestroyed)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowDestroyed"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onConfigurationChanged) as usize - ptr as usize },
         88usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onConfigurationChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onConfigurationChanged"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onTrimMemory) as usize - ptr as usize },
         96usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onTrimMemory)
-        )
+        "Offset of field: GameActivityCallbacks::onTrimMemory"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onTouchEvent) as usize - ptr as usize },
         104usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onTouchEvent)
-        )
+        "Offset of field: GameActivityCallbacks::onTouchEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onKeyDown) as usize - ptr as usize },
         112usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onKeyDown)
-        )
+        "Offset of field: GameActivityCallbacks::onKeyDown"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onKeyUp) as usize - ptr as usize },
         120usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onKeyUp)
-        )
+        "Offset of field: GameActivityCallbacks::onKeyUp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onTextInputEvent) as usize - ptr as usize },
         128usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onTextInputEvent)
-        )
+        "Offset of field: GameActivityCallbacks::onTextInputEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onWindowInsetsChanged) as usize - ptr as usize },
         136usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onWindowInsetsChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onWindowInsetsChanged"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onContentRectChanged) as usize - ptr as usize },
         144usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onContentRectChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onContentRectChanged"
+    );
+    assert_eq!(
+        unsafe {
+            ::std::ptr::addr_of!((*ptr).onSoftwareKeyboardVisibilityChanged) as usize - ptr as usize
+        },
+        152usize,
+        "Offset of field: GameActivityCallbacks::onSoftwareKeyboardVisibilityChanged"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).onEditorAction) as usize - ptr as usize },
+        160usize,
+        "Offset of field: GameActivityCallbacks::onEditorAction"
     );
 }
 #[doc = " This is the function that must be in the native code to instantiate the\n application's native activity.  It is called with the activity instance (see\n above); if the code is being instantiated from a previously saved instance,\n the savedState will be non-NULL and point to the saved data.  You must make\n any copy of this data you need -- it will be released after you return from\n this function."]
@@ -3575,7 +3310,7 @@ pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_TURN_SCREEN_ON: GameActiv
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DISMISS_KEYGUARD:
     GameActivitySetWindowFlags = 4194304;
 #[doc = " Flags for GameActivity_setWindowFlags,\n as per the Java API at android.view.WindowManager.LayoutParams."]
-pub type GameActivitySetWindowFlags = ::std::os::raw::c_uint;
+pub type GameActivitySetWindowFlags = u32;
 extern "C" {
     #[doc = " Change the window flags of the given activity.  Calls getWindow().setFlags()\n of the given activity.\n Note that some flags must be set before the window decoration is created,\n see\n https://developer.android.com/reference/android/view/Window#setFlags(int,%20int).\n Note also that this method can be called from\n *any* thread; it will send a message to the main thread of the process\n where the Java finish call will take place."]
     pub fn GameActivity_setWindowFlags(
@@ -3591,11 +3326,15 @@ pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT:
 pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED:
     GameActivityShowSoftInputFlags = 2;
 #[doc = " Flags for GameActivity_showSoftInput; see the Java InputMethodManager\n API for documentation."]
-pub type GameActivityShowSoftInputFlags = ::std::os::raw::c_uint;
+pub type GameActivityShowSoftInputFlags = u8;
 extern "C" {
     #[doc = " Show the IME while in the given activity.  Calls\n InputMethodManager.showSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java call will take place."]
     pub fn GameActivity_showSoftInput(activity: *mut GameActivity, flags: u32);
 }
+extern "C" {
+    #[doc = " Restarts the input method. Calls InputMethodManager.restartInput().\n Note that this method can be called from *any* thread; it will send a message\n to the main thread of the process where the Java call will take place."]
+    pub fn GameActivity_restartInput(activity: *mut GameActivity);
+}
 extern "C" {
     #[doc = " Set the text entry state (see documentation of the GameTextInputState struct\n in the Game Text Input library reference).\n\n Ownership of the state is maintained by the caller."]
     pub fn GameActivity_setTextInputState(
@@ -3622,7 +3361,7 @@ pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_O
 pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS:
     GameActivityHideSoftInputFlags = 2;
 #[doc = " Flags for GameActivity_hideSoftInput; see the Java InputMethodManager\n API for documentation."]
-pub type GameActivityHideSoftInputFlags = ::std::os::raw::c_uint;
+pub type GameActivityHideSoftInputFlags = u16;
 extern "C" {
     #[doc = " Hide the IME while in the given activity.  Calls\n InputMethodManager.hideSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java finish call will take place."]
     pub fn GameActivity_hideSoftInput(activity: *mut GameActivity, flags: u32);
@@ -3636,12 +3375,16 @@ extern "C" {
     );
 }
 extern "C" {
-    #[doc = " Set options on how the IME behaves when it is requested for text input.\n See\n https://developer.android.com/reference/android/view/inputmethod/EditorInfo\n for the meaning of inputType, actionId and imeOptions.\n\n Note that this function will attach the current thread to the JVM if it is\n not already attached, so the caller must detach the thread from the JVM\n before the thread is destroyed using DetachCurrentThread."]
+    #[doc = " Tells whether the software keyboard is visible or not."]
+    pub fn GameActivity_isSoftwareKeyboardVisible(activity: *mut GameActivity) -> bool;
+}
+extern "C" {
+    #[doc = " Set options on how the IME behaves when it is requested for text input.\n See\n https://developer.android.com/reference/android/view/inputmethod/EditorInfo\n for the meaning of inputType, actionId and imeOptions.\n\n <b>Note:</b> currently only TYPE_NULL AND TYPE_CLASS_NUMBER are supported."]
     pub fn GameActivity_setImeEditorInfo(
         activity: *mut GameActivity,
-        inputType: ::std::os::raw::c_int,
-        actionId: ::std::os::raw::c_int,
-        imeOptions: ::std::os::raw::c_int,
+        inputType: GameTextInputType,
+        actionId: GameTextInputActionType,
+        imeOptions: GameTextInputImeOptions,
     );
 }
 extern "C" {
@@ -3672,6 +3415,9 @@ extern "C" {
 extern "C" {
     pub fn GameActivity_getKeyboardHidden(activity: *mut GameActivity) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn GameActivity_getLocalesCount(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
 extern "C" {
     pub fn GameActivity_getMcc(activity: *mut GameActivity) -> ::std::os::raw::c_int;
 }
@@ -3704,6 +3450,39 @@ extern "C" {
 extern "C" {
     pub fn GameActivity_getUIMode(activity: *mut GameActivity) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    #[doc = " The functions below return Java locale information.\n\n In simple cases there will be just one locale, but it's possible tha\n there are more than one locale objects. Users are encouraged to write code\n that handles all locales and not just the first one.\n\n The functions in the block below return string values in the provided buffer.\n Return value is zero if there were no errors, otherwise it's non-zero.\n If the return value is zero, `dst` will contain a null-terminated string:\n strlen(dst) <= dst_size - 1.\n If the return value is non-zero, the content of dst is undefined.\n\n Parameters:\n\n dst, dst_size: define a receiver buffer. Locale string can be something\n short like \"EN/EN\", but it may be longer. You should be safe with a buffer\n size of 256 bytes.\n\n If the buffer is too small, ENOBUFS is returned. Try allocating a larger\n buffer in this case.\n\n localeIdx must be between 0 and the value of GameActivity_getLocalesCount().\n If localeIdx is out of range, EINVAL is returned.\n\n Refer to Java documentation of locales for more information."]
+    pub fn GameActivity_getLocaleLanguage(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getLocaleScript(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getLocaleCountry(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getLocaleVariant(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
 pub const ACONFIGURATION_ORIENTATION_ANY: _bindgen_ty_21 = 0;
 pub const ACONFIGURATION_ORIENTATION_PORT: _bindgen_ty_21 = 1;
 pub const ACONFIGURATION_ORIENTATION_LAND: _bindgen_ty_21 = 2;
@@ -3802,45 +3581,26 @@ pub struct pollfd {
 fn bindgen_test_layout_pollfd() {
     const UNINIT: ::std::mem::MaybeUninit<pollfd> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<pollfd>(),
-        8usize,
-        concat!("Size of: ", stringify!(pollfd))
-    );
+    assert_eq!(::std::mem::size_of::<pollfd>(), 8usize, "Size of pollfd");
     assert_eq!(
         ::std::mem::align_of::<pollfd>(),
         4usize,
-        concat!("Alignment of ", stringify!(pollfd))
+        "Alignment of pollfd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(pollfd),
-            "::",
-            stringify!(fd)
-        )
+        "Offset of field: pollfd::fd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).events) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(pollfd),
-            "::",
-            stringify!(events)
-        )
+        "Offset of field: pollfd::events"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).revents) as usize - ptr as usize },
         6usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(pollfd),
-            "::",
-            stringify!(revents)
-        )
+        "Offset of field: pollfd::revents"
     );
 }
 #[repr(C)]
@@ -3862,72 +3622,42 @@ fn bindgen_test_layout_sigcontext() {
     assert_eq!(
         ::std::mem::size_of::<sigcontext>(),
         4384usize,
-        concat!("Size of: ", stringify!(sigcontext))
+        "Size of sigcontext"
     );
     assert_eq!(
         ::std::mem::align_of::<sigcontext>(),
         16usize,
-        concat!("Alignment of ", stringify!(sigcontext))
+        "Alignment of sigcontext"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fault_address) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(fault_address)
-        )
+        "Offset of field: sigcontext::fault_address"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).regs) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(regs)
-        )
+        "Offset of field: sigcontext::regs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sp) as usize - ptr as usize },
         256usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(sp)
-        )
+        "Offset of field: sigcontext::sp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pc) as usize - ptr as usize },
         264usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(pc)
-        )
+        "Offset of field: sigcontext::pc"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pstate) as usize - ptr as usize },
         272usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(pstate)
-        )
+        "Offset of field: sigcontext::pstate"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__reserved) as usize - ptr as usize },
         288usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(__reserved)
-        )
+        "Offset of field: sigcontext::__reserved"
     );
 }
 #[repr(C)]
@@ -3943,32 +3673,22 @@ fn bindgen_test_layout__aarch64_ctx() {
     assert_eq!(
         ::std::mem::size_of::<_aarch64_ctx>(),
         8usize,
-        concat!("Size of: ", stringify!(_aarch64_ctx))
+        "Size of _aarch64_ctx"
     );
     assert_eq!(
         ::std::mem::align_of::<_aarch64_ctx>(),
         4usize,
-        concat!("Alignment of ", stringify!(_aarch64_ctx))
+        "Alignment of _aarch64_ctx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).magic) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_aarch64_ctx),
-            "::",
-            stringify!(magic)
-        )
+        "Offset of field: _aarch64_ctx::magic"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).size) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_aarch64_ctx),
-            "::",
-            stringify!(size)
-        )
+        "Offset of field: _aarch64_ctx::size"
     );
 }
 #[repr(C)]
@@ -3987,52 +3707,32 @@ fn bindgen_test_layout_fpsimd_context() {
     assert_eq!(
         ::std::mem::size_of::<fpsimd_context>(),
         528usize,
-        concat!("Size of: ", stringify!(fpsimd_context))
+        "Size of fpsimd_context"
     );
     assert_eq!(
         ::std::mem::align_of::<fpsimd_context>(),
         16usize,
-        concat!("Alignment of ", stringify!(fpsimd_context))
+        "Alignment of fpsimd_context"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).head) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(fpsimd_context),
-            "::",
-            stringify!(head)
-        )
+        "Offset of field: fpsimd_context::head"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpsr) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(fpsimd_context),
-            "::",
-            stringify!(fpsr)
-        )
+        "Offset of field: fpsimd_context::fpsr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpcr) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(fpsimd_context),
-            "::",
-            stringify!(fpcr)
-        )
+        "Offset of field: fpsimd_context::fpcr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).vregs) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(fpsimd_context),
-            "::",
-            stringify!(vregs)
-        )
+        "Offset of field: fpsimd_context::vregs"
     );
 }
 #[repr(C)]
@@ -4048,32 +3748,22 @@ fn bindgen_test_layout_esr_context() {
     assert_eq!(
         ::std::mem::size_of::<esr_context>(),
         16usize,
-        concat!("Size of: ", stringify!(esr_context))
+        "Size of esr_context"
     );
     assert_eq!(
         ::std::mem::align_of::<esr_context>(),
         8usize,
-        concat!("Alignment of ", stringify!(esr_context))
+        "Alignment of esr_context"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).head) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(esr_context),
-            "::",
-            stringify!(head)
-        )
+        "Offset of field: esr_context::head"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).esr) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(esr_context),
-            "::",
-            stringify!(esr)
-        )
+        "Offset of field: esr_context::esr"
     );
 }
 #[repr(C)]
@@ -4091,52 +3781,32 @@ fn bindgen_test_layout_extra_context() {
     assert_eq!(
         ::std::mem::size_of::<extra_context>(),
         32usize,
-        concat!("Size of: ", stringify!(extra_context))
+        "Size of extra_context"
     );
     assert_eq!(
         ::std::mem::align_of::<extra_context>(),
         8usize,
-        concat!("Alignment of ", stringify!(extra_context))
+        "Alignment of extra_context"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).head) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(extra_context),
-            "::",
-            stringify!(head)
-        )
+        "Offset of field: extra_context::head"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).datap) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(extra_context),
-            "::",
-            stringify!(datap)
-        )
+        "Offset of field: extra_context::datap"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).size) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(extra_context),
-            "::",
-            stringify!(size)
-        )
+        "Offset of field: extra_context::size"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__reserved) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(extra_context),
-            "::",
-            stringify!(__reserved)
-        )
+        "Offset of field: extra_context::__reserved"
     );
 }
 #[repr(C)]
@@ -4144,7 +3814,8 @@ fn bindgen_test_layout_extra_context() {
 pub struct sve_context {
     pub head: _aarch64_ctx,
     pub vl: __u16,
-    pub __reserved: [__u16; 3usize],
+    pub flags: __u16,
+    pub __reserved: [__u16; 2usize],
 }
 #[test]
 fn bindgen_test_layout_sve_context() {
@@ -4153,42 +3824,137 @@ fn bindgen_test_layout_sve_context() {
     assert_eq!(
         ::std::mem::size_of::<sve_context>(),
         16usize,
-        concat!("Size of: ", stringify!(sve_context))
+        "Size of sve_context"
     );
     assert_eq!(
         ::std::mem::align_of::<sve_context>(),
         4usize,
-        concat!("Alignment of ", stringify!(sve_context))
+        "Alignment of sve_context"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).head) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sve_context),
-            "::",
-            stringify!(head)
-        )
+        "Offset of field: sve_context::head"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).vl) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sve_context),
-            "::",
-            stringify!(vl)
-        )
+        "Offset of field: sve_context::vl"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
+        10usize,
+        "Offset of field: sve_context::flags"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).__reserved) as usize - ptr as usize },
+        12usize,
+        "Offset of field: sve_context::__reserved"
+    );
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct tpidr2_context {
+    pub head: _aarch64_ctx,
+    pub tpidr2: __u64,
+}
+#[test]
+fn bindgen_test_layout_tpidr2_context() {
+    const UNINIT: ::std::mem::MaybeUninit<tpidr2_context> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<tpidr2_context>(),
+        16usize,
+        "Size of tpidr2_context"
+    );
+    assert_eq!(
+        ::std::mem::align_of::<tpidr2_context>(),
+        8usize,
+        "Alignment of tpidr2_context"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).head) as usize - ptr as usize },
+        0usize,
+        "Offset of field: tpidr2_context::head"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).tpidr2) as usize - ptr as usize },
+        8usize,
+        "Offset of field: tpidr2_context::tpidr2"
+    );
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct za_context {
+    pub head: _aarch64_ctx,
+    pub vl: __u16,
+    pub __reserved: [__u16; 3usize],
+}
+#[test]
+fn bindgen_test_layout_za_context() {
+    const UNINIT: ::std::mem::MaybeUninit<za_context> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<za_context>(),
+        16usize,
+        "Size of za_context"
+    );
+    assert_eq!(
+        ::std::mem::align_of::<za_context>(),
+        4usize,
+        "Alignment of za_context"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).head) as usize - ptr as usize },
+        0usize,
+        "Offset of field: za_context::head"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).vl) as usize - ptr as usize },
+        8usize,
+        "Offset of field: za_context::vl"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__reserved) as usize - ptr as usize },
         10usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sve_context),
-            "::",
-            stringify!(__reserved)
-        )
+        "Offset of field: za_context::__reserved"
+    );
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct zt_context {
+    pub head: _aarch64_ctx,
+    pub nregs: __u16,
+    pub __reserved: [__u16; 3usize],
+}
+#[test]
+fn bindgen_test_layout_zt_context() {
+    const UNINIT: ::std::mem::MaybeUninit<zt_context> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<zt_context>(),
+        16usize,
+        "Size of zt_context"
+    );
+    assert_eq!(
+        ::std::mem::align_of::<zt_context>(),
+        4usize,
+        "Alignment of zt_context"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).head) as usize - ptr as usize },
+        0usize,
+        "Offset of field: zt_context::head"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).nregs) as usize - ptr as usize },
+        8usize,
+        "Offset of field: zt_context::nregs"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).__reserved) as usize - ptr as usize },
+        10usize,
+        "Offset of field: zt_context::__reserved"
     );
 }
 #[repr(C)]
@@ -4203,22 +3969,17 @@ fn bindgen_test_layout_sigset_t() {
     assert_eq!(
         ::std::mem::size_of::<sigset_t>(),
         8usize,
-        concat!("Size of: ", stringify!(sigset_t))
+        "Size of sigset_t"
     );
     assert_eq!(
         ::std::mem::align_of::<sigset_t>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigset_t))
+        "Alignment of sigset_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sig) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigset_t),
-            "::",
-            stringify!(sig)
-        )
+        "Offset of field: sigset_t::sig"
     );
 }
 pub type old_sigset_t = ::std::os::raw::c_ulong;
@@ -4241,52 +4002,32 @@ fn bindgen_test_layout___kernel_sigaction() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_sigaction>(),
         32usize,
-        concat!("Size of: ", stringify!(__kernel_sigaction))
+        "Size of __kernel_sigaction"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_sigaction>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_sigaction))
+        "Alignment of __kernel_sigaction"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(sa_handler)
-        )
+        "Offset of field: __kernel_sigaction::sa_handler"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(sa_flags)
-        )
+        "Offset of field: __kernel_sigaction::sa_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(sa_restorer)
-        )
+        "Offset of field: __kernel_sigaction::sa_restorer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(sa_mask)
-        )
+        "Offset of field: __kernel_sigaction::sa_mask"
     );
 }
 #[repr(C)]
@@ -4303,42 +4044,27 @@ fn bindgen_test_layout_sigaltstack() {
     assert_eq!(
         ::std::mem::size_of::<sigaltstack>(),
         24usize,
-        concat!("Size of: ", stringify!(sigaltstack))
+        "Size of sigaltstack"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaltstack>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigaltstack))
+        "Alignment of sigaltstack"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss_sp) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaltstack),
-            "::",
-            stringify!(ss_sp)
-        )
+        "Offset of field: sigaltstack::ss_sp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss_flags) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaltstack),
-            "::",
-            stringify!(ss_flags)
-        )
+        "Offset of field: sigaltstack::ss_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss_size) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaltstack),
-            "::",
-            stringify!(ss_size)
-        )
+        "Offset of field: sigaltstack::ss_size"
     );
 }
 pub type stack_t = sigaltstack;
@@ -4352,35 +4078,21 @@ pub union sigval {
 fn bindgen_test_layout_sigval() {
     const UNINIT: ::std::mem::MaybeUninit<sigval> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<sigval>(),
-        8usize,
-        concat!("Size of: ", stringify!(sigval))
-    );
+    assert_eq!(::std::mem::size_of::<sigval>(), 8usize, "Size of sigval");
     assert_eq!(
         ::std::mem::align_of::<sigval>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigval))
+        "Alignment of sigval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sival_int) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigval),
-            "::",
-            stringify!(sival_int)
-        )
+        "Offset of field: sigval::sival_int"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sival_ptr) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigval),
-            "::",
-            stringify!(sival_ptr)
-        )
+        "Offset of field: sigval::sival_ptr"
     );
 }
 pub type sigval_t = sigval;
@@ -4409,32 +4121,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_1>(),
         8usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_1))
+        "Size of __sifields__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_1))
+        "Alignment of __sifields__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_1),
-            "::",
-            stringify!(_pid)
-        )
+        "Offset of field: __sifields__bindgen_ty_1::_pid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_1),
-            "::",
-            stringify!(_uid)
-        )
+        "Offset of field: __sifields__bindgen_ty_1::_uid"
     );
 }
 #[repr(C)]
@@ -4453,52 +4155,32 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_2>(),
         24usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_2))
+        "Size of __sifields__bindgen_ty_2"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_2>(),
         8usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_2))
+        "Alignment of __sifields__bindgen_ty_2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_tid)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._overrun) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_overrun)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_overrun"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_sigval)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_sigval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sys_private) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_sys_private)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_sys_private"
     );
 }
 #[repr(C)]
@@ -4516,42 +4198,27 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_3>(),
         16usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_3))
+        "Size of __sifields__bindgen_ty_3"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_3>(),
         8usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_3))
+        "Alignment of __sifields__bindgen_ty_3"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_3),
-            "::",
-            stringify!(_pid)
-        )
+        "Offset of field: __sifields__bindgen_ty_3::_pid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_3),
-            "::",
-            stringify!(_uid)
-        )
+        "Offset of field: __sifields__bindgen_ty_3::_uid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_3),
-            "::",
-            stringify!(_sigval)
-        )
+        "Offset of field: __sifields__bindgen_ty_3::_sigval"
     );
 }
 #[repr(C)]
@@ -4571,62 +4238,37 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_4>(),
         32usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_4))
+        "Size of __sifields__bindgen_ty_4"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_4>(),
         8usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_4))
+        "Alignment of __sifields__bindgen_ty_4"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_pid)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_pid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_uid)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_uid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._status) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_status)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_status"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._utime) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_utime)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_utime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._stime) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_stime)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_stime"
     );
 }
 #[repr(C)]
@@ -4659,48 +4301,27 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>(),
         24usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>(),
         8usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._dummy_bnd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_dummy_bnd)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1::_dummy_bnd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._lower) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_lower)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1::_lower"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._upper) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_upper)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1::_upper"
     );
 }
 #[repr(C)]
@@ -4717,38 +4338,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>(),
         12usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2)
-        )
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._dummy_pkey) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2),
-            "::",
-            stringify!(_dummy_pkey)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2::_dummy_pkey"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pkey) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2),
-            "::",
-            stringify!(_pkey)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2::_pkey"
     );
 }
 #[repr(C)]
@@ -4756,6 +4361,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
 pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3 {
     pub _data: ::std::os::raw::c_ulong,
     pub _type: __u32,
+    pub _flags: __u32,
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3() {
@@ -4765,38 +4371,27 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
         16usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
-        )
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
         8usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._data) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
-            "::",
-            stringify!(_data)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3::_data"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._type) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
-            "::",
-            stringify!(_type)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3::_type"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._flags) as usize - ptr as usize },
+        12usize,
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3::_flags"
     );
 }
 #[test]
@@ -4807,68 +4402,37 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1>(),
         24usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1)
-        )
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1>(),
         8usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._trapno) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_trapno)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_trapno"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr_lsb) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_addr_lsb)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_addr_lsb"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr_bnd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_addr_bnd)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_addr_bnd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr_pkey) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_addr_pkey)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_addr_pkey"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._perf) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_perf)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_perf"
     );
 }
 #[test]
@@ -4879,22 +4443,17 @@ fn bindgen_test_layout___sifields__bindgen_ty_5() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5>(),
         32usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_5))
+        "Size of __sifields__bindgen_ty_5"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5>(),
         8usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_5))
+        "Alignment of __sifields__bindgen_ty_5"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5),
-            "::",
-            stringify!(_addr)
-        )
+        "Offset of field: __sifields__bindgen_ty_5::_addr"
     );
 }
 #[repr(C)]
@@ -4911,32 +4470,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_6() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_6>(),
         16usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_6))
+        "Size of __sifields__bindgen_ty_6"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_6>(),
         8usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_6))
+        "Alignment of __sifields__bindgen_ty_6"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._band) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_6),
-            "::",
-            stringify!(_band)
-        )
+        "Offset of field: __sifields__bindgen_ty_6::_band"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._fd) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_6),
-            "::",
-            stringify!(_fd)
-        )
+        "Offset of field: __sifields__bindgen_ty_6::_fd"
     );
 }
 #[repr(C)]
@@ -4954,42 +4503,27 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_7>(),
         16usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_7))
+        "Size of __sifields__bindgen_ty_7"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_7>(),
         8usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_7))
+        "Alignment of __sifields__bindgen_ty_7"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._call_addr) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_7),
-            "::",
-            stringify!(_call_addr)
-        )
+        "Offset of field: __sifields__bindgen_ty_7::_call_addr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._syscall) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_7),
-            "::",
-            stringify!(_syscall)
-        )
+        "Offset of field: __sifields__bindgen_ty_7::_syscall"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._arch) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_7),
-            "::",
-            stringify!(_arch)
-        )
+        "Offset of field: __sifields__bindgen_ty_7::_arch"
     );
 }
 #[test]
@@ -4999,82 +4533,47 @@ fn bindgen_test_layout___sifields() {
     assert_eq!(
         ::std::mem::size_of::<__sifields>(),
         32usize,
-        concat!("Size of: ", stringify!(__sifields))
+        "Size of __sifields"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields>(),
         8usize,
-        concat!("Alignment of ", stringify!(__sifields))
+        "Alignment of __sifields"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._kill) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_kill)
-        )
+        "Offset of field: __sifields::_kill"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._timer) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_timer)
-        )
+        "Offset of field: __sifields::_timer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._rt) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_rt)
-        )
+        "Offset of field: __sifields::_rt"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigchld) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigchld)
-        )
+        "Offset of field: __sifields::_sigchld"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigfault) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigfault)
-        )
+        "Offset of field: __sifields::_sigfault"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigpoll) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigpoll)
-        )
+        "Offset of field: __sifields::_sigpoll"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigsys) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigsys)
-        )
+        "Offset of field: __sifields::_sigsys"
     );
 }
 #[repr(C)]
@@ -5104,55 +4603,32 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1__bindgen_ty_1>(),
         48usize,
-        concat!("Size of: ", stringify!(siginfo__bindgen_ty_1__bindgen_ty_1))
+        "Size of siginfo__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<siginfo__bindgen_ty_1__bindgen_ty_1>(),
         8usize,
-        concat!(
-            "Alignment of ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Alignment of siginfo__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si_signo) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(si_signo)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::si_signo"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si_errno) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(si_errno)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::si_errno"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si_code) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(si_code)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::si_code"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sifields) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_sifields)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::_sifields"
     );
 }
 #[test]
@@ -5163,22 +4639,17 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1>(),
         128usize,
-        concat!("Size of: ", stringify!(siginfo__bindgen_ty_1))
+        "Size of siginfo__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<siginfo__bindgen_ty_1>(),
         8usize,
-        concat!("Alignment of ", stringify!(siginfo__bindgen_ty_1))
+        "Alignment of siginfo__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._si_pad) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1),
-            "::",
-            stringify!(_si_pad)
-        )
+        "Offset of field: siginfo__bindgen_ty_1::_si_pad"
     );
 }
 #[test]
@@ -5186,12 +4657,12 @@ fn bindgen_test_layout_siginfo() {
     assert_eq!(
         ::std::mem::size_of::<siginfo>(),
         128usize,
-        concat!("Size of: ", stringify!(siginfo))
+        "Size of siginfo"
     );
     assert_eq!(
         ::std::mem::align_of::<siginfo>(),
         8usize,
-        concat!("Alignment of ", stringify!(siginfo))
+        "Alignment of siginfo"
     );
 }
 pub type siginfo_t = siginfo;
@@ -5224,38 +4695,22 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1__bindgen_ty_1>(),
         16usize,
-        concat!(
-            "Size of: ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Size of sigevent__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigevent__bindgen_ty_1__bindgen_ty_1>(),
         8usize,
-        concat!(
-            "Alignment of ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Alignment of sigevent__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._function) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_function)
-        )
+        "Offset of field: sigevent__bindgen_ty_1__bindgen_ty_1::_function"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._attribute) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_attribute)
-        )
+        "Offset of field: sigevent__bindgen_ty_1__bindgen_ty_1::_attribute"
     );
 }
 #[test]
@@ -5266,42 +4721,27 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1>(),
         48usize,
-        concat!("Size of: ", stringify!(sigevent__bindgen_ty_1))
+        "Size of sigevent__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigevent__bindgen_ty_1>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigevent__bindgen_ty_1))
+        "Alignment of sigevent__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pad) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1),
-            "::",
-            stringify!(_pad)
-        )
+        "Offset of field: sigevent__bindgen_ty_1::_pad"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1),
-            "::",
-            stringify!(_tid)
-        )
+        "Offset of field: sigevent__bindgen_ty_1::_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigev_thread) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1),
-            "::",
-            stringify!(_sigev_thread)
-        )
+        "Offset of field: sigevent__bindgen_ty_1::_sigev_thread"
     );
 }
 #[test]
@@ -5311,52 +4751,32 @@ fn bindgen_test_layout_sigevent() {
     assert_eq!(
         ::std::mem::size_of::<sigevent>(),
         64usize,
-        concat!("Size of: ", stringify!(sigevent))
+        "Size of sigevent"
     );
     assert_eq!(
         ::std::mem::align_of::<sigevent>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigevent))
+        "Alignment of sigevent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sigev_value) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(sigev_value)
-        )
+        "Offset of field: sigevent::sigev_value"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sigev_signo) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(sigev_signo)
-        )
+        "Offset of field: sigevent::sigev_signo"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sigev_notify) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(sigev_notify)
-        )
+        "Offset of field: sigevent::sigev_notify"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigev_un) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(_sigev_un)
-        )
+        "Offset of field: sigevent::_sigev_un"
     );
 }
 pub type sigevent_t = sigevent;
@@ -5392,32 +4812,22 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigaction__bindgen_ty_1>(),
         8usize,
-        concat!("Size of: ", stringify!(sigaction__bindgen_ty_1))
+        "Size of sigaction__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction__bindgen_ty_1>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigaction__bindgen_ty_1))
+        "Alignment of sigaction__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction__bindgen_ty_1),
-            "::",
-            stringify!(sa_handler)
-        )
+        "Offset of field: sigaction__bindgen_ty_1::sa_handler"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction__bindgen_ty_1),
-            "::",
-            stringify!(sa_sigaction)
-        )
+        "Offset of field: sigaction__bindgen_ty_1::sa_sigaction"
     );
 }
 #[test]
@@ -5427,42 +4837,27 @@ fn bindgen_test_layout_sigaction() {
     assert_eq!(
         ::std::mem::size_of::<sigaction>(),
         32usize,
-        concat!("Size of: ", stringify!(sigaction))
+        "Size of sigaction"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigaction))
+        "Alignment of sigaction"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction),
-            "::",
-            stringify!(sa_flags)
-        )
+        "Offset of field: sigaction::sa_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction),
-            "::",
-            stringify!(sa_mask)
-        )
+        "Offset of field: sigaction::sa_mask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction),
-            "::",
-            stringify!(sa_restorer)
-        )
+        "Offset of field: sigaction::sa_restorer"
     );
 }
 #[repr(C)]
@@ -5493,32 +4888,22 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigaction64__bindgen_ty_1>(),
         8usize,
-        concat!("Size of: ", stringify!(sigaction64__bindgen_ty_1))
+        "Size of sigaction64__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction64__bindgen_ty_1>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigaction64__bindgen_ty_1))
+        "Alignment of sigaction64__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64__bindgen_ty_1),
-            "::",
-            stringify!(sa_handler)
-        )
+        "Offset of field: sigaction64__bindgen_ty_1::sa_handler"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64__bindgen_ty_1),
-            "::",
-            stringify!(sa_sigaction)
-        )
+        "Offset of field: sigaction64__bindgen_ty_1::sa_sigaction"
     );
 }
 #[test]
@@ -5528,42 +4913,27 @@ fn bindgen_test_layout_sigaction64() {
     assert_eq!(
         ::std::mem::size_of::<sigaction64>(),
         32usize,
-        concat!("Size of: ", stringify!(sigaction64))
+        "Size of sigaction64"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction64>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigaction64))
+        "Alignment of sigaction64"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64),
-            "::",
-            stringify!(sa_flags)
-        )
+        "Offset of field: sigaction64::sa_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64),
-            "::",
-            stringify!(sa_mask)
-        )
+        "Offset of field: sigaction64::sa_mask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64),
-            "::",
-            stringify!(sa_restorer)
-        )
+        "Offset of field: sigaction64::sa_restorer"
     );
 }
 #[repr(C)]
@@ -5579,32 +4949,22 @@ fn bindgen_test_layout_timespec() {
     assert_eq!(
         ::std::mem::size_of::<timespec>(),
         16usize,
-        concat!("Size of: ", stringify!(timespec))
+        "Size of timespec"
     );
     assert_eq!(
         ::std::mem::align_of::<timespec>(),
         8usize,
-        concat!("Alignment of ", stringify!(timespec))
+        "Alignment of timespec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timespec),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: timespec::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timespec),
-            "::",
-            stringify!(tv_nsec)
-        )
+        "Offset of field: timespec::tv_nsec"
     );
 }
 #[repr(C)]
@@ -5622,52 +4982,32 @@ fn bindgen_test_layout_user_regs_struct() {
     assert_eq!(
         ::std::mem::size_of::<user_regs_struct>(),
         272usize,
-        concat!("Size of: ", stringify!(user_regs_struct))
+        "Size of user_regs_struct"
     );
     assert_eq!(
         ::std::mem::align_of::<user_regs_struct>(),
         8usize,
-        concat!("Alignment of ", stringify!(user_regs_struct))
+        "Alignment of user_regs_struct"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).regs) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(regs)
-        )
+        "Offset of field: user_regs_struct::regs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sp) as usize - ptr as usize },
         248usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(sp)
-        )
+        "Offset of field: user_regs_struct::sp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pc) as usize - ptr as usize },
         256usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(pc)
-        )
+        "Offset of field: user_regs_struct::pc"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pstate) as usize - ptr as usize },
         264usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(pstate)
-        )
+        "Offset of field: user_regs_struct::pstate"
     );
 }
 #[repr(C)]
@@ -5685,42 +5025,27 @@ fn bindgen_test_layout_user_fpsimd_struct() {
     assert_eq!(
         ::std::mem::size_of::<user_fpsimd_struct>(),
         528usize,
-        concat!("Size of: ", stringify!(user_fpsimd_struct))
+        "Size of user_fpsimd_struct"
     );
     assert_eq!(
         ::std::mem::align_of::<user_fpsimd_struct>(),
         16usize,
-        concat!("Alignment of ", stringify!(user_fpsimd_struct))
+        "Alignment of user_fpsimd_struct"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).vregs) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpsimd_struct),
-            "::",
-            stringify!(vregs)
-        )
+        "Offset of field: user_fpsimd_struct::vregs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpsr) as usize - ptr as usize },
         512usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpsimd_struct),
-            "::",
-            stringify!(fpsr)
-        )
+        "Offset of field: user_fpsimd_struct::fpsr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpcr) as usize - ptr as usize },
         516usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpsimd_struct),
-            "::",
-            stringify!(fpcr)
-        )
+        "Offset of field: user_fpsimd_struct::fpcr"
     );
 }
 pub type greg_t = ::std::os::raw::c_ulong;
@@ -5753,32 +5078,22 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<ucontext__bindgen_ty_1>(),
         8usize,
-        concat!("Size of: ", stringify!(ucontext__bindgen_ty_1))
+        "Size of ucontext__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<ucontext__bindgen_ty_1>(),
         8usize,
-        concat!("Alignment of ", stringify!(ucontext__bindgen_ty_1))
+        "Alignment of ucontext__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext__bindgen_ty_1),
-            "::",
-            stringify!(uc_sigmask)
-        )
+        "Offset of field: ucontext__bindgen_ty_1::uc_sigmask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask64) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext__bindgen_ty_1),
-            "::",
-            stringify!(uc_sigmask64)
-        )
+        "Offset of field: ucontext__bindgen_ty_1::uc_sigmask64"
     );
 }
 #[test]
@@ -5788,62 +5103,37 @@ fn bindgen_test_layout_ucontext() {
     assert_eq!(
         ::std::mem::size_of::<ucontext>(),
         4560usize,
-        concat!("Size of: ", stringify!(ucontext))
+        "Size of ucontext"
     );
     assert_eq!(
         ::std::mem::align_of::<ucontext>(),
         16usize,
-        concat!("Alignment of ", stringify!(ucontext))
+        "Alignment of ucontext"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_flags) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_flags)
-        )
+        "Offset of field: ucontext::uc_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_link) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_link)
-        )
+        "Offset of field: ucontext::uc_link"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_stack) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_stack)
-        )
+        "Offset of field: ucontext::uc_stack"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__padding) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(__padding)
-        )
+        "Offset of field: ucontext::__padding"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_mcontext) as usize - ptr as usize },
         176usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_mcontext)
-        )
+        "Offset of field: ucontext::uc_mcontext"
     );
 }
 pub type ucontext_t = ucontext;
@@ -6055,32 +5345,22 @@ fn bindgen_test_layout___kernel_timespec() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_timespec>(),
         16usize,
-        concat!("Size of: ", stringify!(__kernel_timespec))
+        "Size of __kernel_timespec"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_timespec>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_timespec))
+        "Alignment of __kernel_timespec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_timespec),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: __kernel_timespec::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_timespec),
-            "::",
-            stringify!(tv_nsec)
-        )
+        "Offset of field: __kernel_timespec::tv_nsec"
     );
 }
 #[repr(C)]
@@ -6096,32 +5376,22 @@ fn bindgen_test_layout___kernel_itimerspec() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_itimerspec>(),
         32usize,
-        concat!("Size of: ", stringify!(__kernel_itimerspec))
+        "Size of __kernel_itimerspec"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_itimerspec>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_itimerspec))
+        "Alignment of __kernel_itimerspec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_itimerspec),
-            "::",
-            stringify!(it_interval)
-        )
+        "Offset of field: __kernel_itimerspec::it_interval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_itimerspec),
-            "::",
-            stringify!(it_value)
-        )
+        "Offset of field: __kernel_itimerspec::it_value"
     );
 }
 #[repr(C)]
@@ -6138,32 +5408,22 @@ fn bindgen_test_layout___kernel_old_timespec() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_old_timespec>(),
         16usize,
-        concat!("Size of: ", stringify!(__kernel_old_timespec))
+        "Size of __kernel_old_timespec"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_old_timespec>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_old_timespec))
+        "Alignment of __kernel_old_timespec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_old_timespec),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: __kernel_old_timespec::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_old_timespec),
-            "::",
-            stringify!(tv_nsec)
-        )
+        "Offset of field: __kernel_old_timespec::tv_nsec"
     );
 }
 #[repr(C)]
@@ -6180,32 +5440,22 @@ fn bindgen_test_layout___kernel_sock_timeval() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_sock_timeval>(),
         16usize,
-        concat!("Size of: ", stringify!(__kernel_sock_timeval))
+        "Size of __kernel_sock_timeval"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_sock_timeval>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_sock_timeval))
+        "Alignment of __kernel_sock_timeval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sock_timeval),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: __kernel_sock_timeval::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sock_timeval),
-            "::",
-            stringify!(tv_usec)
-        )
+        "Offset of field: __kernel_sock_timeval::tv_usec"
     );
 }
 #[repr(C)]
@@ -6218,35 +5468,21 @@ pub struct timeval {
 fn bindgen_test_layout_timeval() {
     const UNINIT: ::std::mem::MaybeUninit<timeval> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<timeval>(),
-        16usize,
-        concat!("Size of: ", stringify!(timeval))
-    );
+    assert_eq!(::std::mem::size_of::<timeval>(), 16usize, "Size of timeval");
     assert_eq!(
         ::std::mem::align_of::<timeval>(),
         8usize,
-        concat!("Alignment of ", stringify!(timeval))
+        "Alignment of timeval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timeval),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: timeval::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timeval),
-            "::",
-            stringify!(tv_usec)
-        )
+        "Offset of field: timeval::tv_usec"
     );
 }
 #[repr(C)]
@@ -6262,32 +5498,22 @@ fn bindgen_test_layout_itimerspec() {
     assert_eq!(
         ::std::mem::size_of::<itimerspec>(),
         32usize,
-        concat!("Size of: ", stringify!(itimerspec))
+        "Size of itimerspec"
     );
     assert_eq!(
         ::std::mem::align_of::<itimerspec>(),
         8usize,
-        concat!("Alignment of ", stringify!(itimerspec))
+        "Alignment of itimerspec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerspec),
-            "::",
-            stringify!(it_interval)
-        )
+        "Offset of field: itimerspec::it_interval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerspec),
-            "::",
-            stringify!(it_value)
-        )
+        "Offset of field: itimerspec::it_value"
     );
 }
 #[repr(C)]
@@ -6303,32 +5529,22 @@ fn bindgen_test_layout_itimerval() {
     assert_eq!(
         ::std::mem::size_of::<itimerval>(),
         32usize,
-        concat!("Size of: ", stringify!(itimerval))
+        "Size of itimerval"
     );
     assert_eq!(
         ::std::mem::align_of::<itimerval>(),
         8usize,
-        concat!("Alignment of ", stringify!(itimerval))
+        "Alignment of itimerval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerval),
-            "::",
-            stringify!(it_interval)
-        )
+        "Offset of field: itimerval::it_interval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerval),
-            "::",
-            stringify!(it_value)
-        )
+        "Offset of field: itimerval::it_value"
     );
 }
 #[repr(C)]
@@ -6344,32 +5560,22 @@ fn bindgen_test_layout_timezone() {
     assert_eq!(
         ::std::mem::size_of::<timezone>(),
         8usize,
-        concat!("Size of: ", stringify!(timezone))
+        "Size of timezone"
     );
     assert_eq!(
         ::std::mem::align_of::<timezone>(),
         4usize,
-        concat!("Alignment of ", stringify!(timezone))
+        "Alignment of timezone"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tz_minuteswest) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_minuteswest)
-        )
+        "Offset of field: timezone::tz_minuteswest"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tz_dsttime) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_dsttime)
-        )
+        "Offset of field: timezone::tz_dsttime"
     );
 }
 pub type fd_mask = ::std::os::raw::c_ulong;
@@ -6382,25 +5588,16 @@ pub struct fd_set {
 fn bindgen_test_layout_fd_set() {
     const UNINIT: ::std::mem::MaybeUninit<fd_set> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<fd_set>(),
-        128usize,
-        concat!("Size of: ", stringify!(fd_set))
-    );
+    assert_eq!(::std::mem::size_of::<fd_set>(), 128usize, "Size of fd_set");
     assert_eq!(
         ::std::mem::align_of::<fd_set>(),
         8usize,
-        concat!("Alignment of ", stringify!(fd_set))
+        "Alignment of fd_set"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(fd_set),
-            "::",
-            stringify!(fds_bits)
-        )
+        "Offset of field: fd_set::fds_bits"
     );
 }
 extern "C" {
@@ -6504,125 +5701,62 @@ pub struct tm {
 fn bindgen_test_layout_tm() {
     const UNINIT: ::std::mem::MaybeUninit<tm> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<tm>(),
-        56usize,
-        concat!("Size of: ", stringify!(tm))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<tm>(),
-        8usize,
-        concat!("Alignment of ", stringify!(tm))
-    );
+    assert_eq!(::std::mem::size_of::<tm>(), 56usize, "Size of tm");
+    assert_eq!(::std::mem::align_of::<tm>(), 8usize, "Alignment of tm");
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_sec)
-        )
+        "Offset of field: tm::tm_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_min) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_min)
-        )
+        "Offset of field: tm::tm_min"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_hour) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_hour)
-        )
+        "Offset of field: tm::tm_hour"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_mday) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_mday)
-        )
+        "Offset of field: tm::tm_mday"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_mon) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_mon)
-        )
+        "Offset of field: tm::tm_mon"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_year) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_year)
-        )
+        "Offset of field: tm::tm_year"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_wday) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_wday)
-        )
+        "Offset of field: tm::tm_wday"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_yday) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_yday)
-        )
+        "Offset of field: tm::tm_yday"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_isdst) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_isdst)
-        )
+        "Offset of field: tm::tm_isdst"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_gmtoff) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_gmtoff)
-        )
+        "Offset of field: tm::tm_gmtoff"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_zone) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_zone)
-        )
+        "Offset of field: tm::tm_zone"
     );
 }
 extern "C" {
@@ -6655,12 +5789,18 @@ extern "C" {
 extern "C" {
     pub fn localtime_r(__t: *const time_t, __tm: *mut tm) -> *mut tm;
 }
+extern "C" {
+    pub fn timelocal(__tm: *mut tm) -> time_t;
+}
 extern "C" {
     pub fn gmtime(__t: *const time_t) -> *mut tm;
 }
 extern "C" {
     pub fn gmtime_r(__t: *const time_t, __tm: *mut tm) -> *mut tm;
 }
+extern "C" {
+    pub fn timegm(__tm: *mut tm) -> time_t;
+}
 extern "C" {
     pub fn strptime(
         __s: *const ::std::os::raw::c_char,
@@ -6747,19 +5887,19 @@ extern "C" {
     ) -> ::std::os::raw::c_int;
 }
 extern "C" {
-    pub fn timer_gettime(__timer: timer_t, __ts: *mut itimerspec) -> ::std::os::raw::c_int;
+    pub fn timer_gettime(_timer: timer_t, __ts: *mut itimerspec) -> ::std::os::raw::c_int;
 }
 extern "C" {
     pub fn timer_getoverrun(__timer: timer_t) -> ::std::os::raw::c_int;
 }
 extern "C" {
-    pub fn timelocal(__tm: *mut tm) -> time_t;
-}
-extern "C" {
-    pub fn timegm(__tm: *mut tm) -> time_t;
+    pub fn timespec_get(
+        __ts: *mut timespec,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_int;
 }
 extern "C" {
-    pub fn timespec_get(
+    pub fn timespec_getres(
         __ts: *mut timespec,
         __base: ::std::os::raw::c_int,
     ) -> ::std::os::raw::c_int;
@@ -6810,122 +5950,67 @@ fn bindgen_test_layout_clone_args() {
     assert_eq!(
         ::std::mem::size_of::<clone_args>(),
         88usize,
-        concat!("Size of: ", stringify!(clone_args))
+        "Size of clone_args"
     );
     assert_eq!(
         ::std::mem::align_of::<clone_args>(),
         8usize,
-        concat!("Alignment of ", stringify!(clone_args))
+        "Alignment of clone_args"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: clone_args::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pidfd) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(pidfd)
-        )
+        "Offset of field: clone_args::pidfd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).child_tid) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(child_tid)
-        )
+        "Offset of field: clone_args::child_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).parent_tid) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(parent_tid)
-        )
+        "Offset of field: clone_args::parent_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).exit_signal) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(exit_signal)
-        )
+        "Offset of field: clone_args::exit_signal"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stack) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(stack)
-        )
+        "Offset of field: clone_args::stack"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stack_size) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(stack_size)
-        )
+        "Offset of field: clone_args::stack_size"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tls) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(tls)
-        )
+        "Offset of field: clone_args::tls"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).set_tid) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(set_tid)
-        )
+        "Offset of field: clone_args::set_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).set_tid_size) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(set_tid_size)
-        )
+        "Offset of field: clone_args::set_tid_size"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cgroup) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(cgroup)
-        )
+        "Offset of field: clone_args::cgroup"
     );
 }
 #[repr(C)]
@@ -6940,22 +6025,17 @@ fn bindgen_test_layout_sched_param() {
     assert_eq!(
         ::std::mem::size_of::<sched_param>(),
         4usize,
-        concat!("Size of: ", stringify!(sched_param))
+        "Size of sched_param"
     );
     assert_eq!(
         ::std::mem::align_of::<sched_param>(),
         4usize,
-        concat!("Alignment of ", stringify!(sched_param))
+        "Alignment of sched_param"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sched_priority) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sched_param),
-            "::",
-            stringify!(sched_priority)
-        )
+        "Offset of field: sched_param::sched_priority"
     );
 }
 extern "C" {
@@ -6996,13 +6076,12 @@ pub type _bindgen_ty_22 = ::std::os::raw::c_uint;
 pub const PTHREAD_RWLOCK_PREFER_READER_NP: _bindgen_ty_23 = 0;
 pub const PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP: _bindgen_ty_23 = 1;
 pub type _bindgen_ty_23 = ::std::os::raw::c_uint;
-pub type __pthread_cleanup_func_t =
-    ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct __pthread_cleanup_t {
     pub __cleanup_prev: *mut __pthread_cleanup_t,
-    pub __cleanup_routine: __pthread_cleanup_func_t,
+    pub __cleanup_routine:
+        ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>,
     pub __cleanup_arg: *mut ::std::os::raw::c_void,
 }
 #[test]
@@ -7012,48 +6091,33 @@ fn bindgen_test_layout___pthread_cleanup_t() {
     assert_eq!(
         ::std::mem::size_of::<__pthread_cleanup_t>(),
         24usize,
-        concat!("Size of: ", stringify!(__pthread_cleanup_t))
+        "Size of __pthread_cleanup_t"
     );
     assert_eq!(
         ::std::mem::align_of::<__pthread_cleanup_t>(),
         8usize,
-        concat!("Alignment of ", stringify!(__pthread_cleanup_t))
+        "Alignment of __pthread_cleanup_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_prev) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__pthread_cleanup_t),
-            "::",
-            stringify!(__cleanup_prev)
-        )
+        "Offset of field: __pthread_cleanup_t::__cleanup_prev"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_routine) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__pthread_cleanup_t),
-            "::",
-            stringify!(__cleanup_routine)
-        )
+        "Offset of field: __pthread_cleanup_t::__cleanup_routine"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_arg) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__pthread_cleanup_t),
-            "::",
-            stringify!(__cleanup_arg)
-        )
+        "Offset of field: __pthread_cleanup_t::__cleanup_arg"
     );
 }
 extern "C" {
     pub fn __pthread_cleanup_push(
         c: *mut __pthread_cleanup_t,
-        arg1: __pthread_cleanup_func_t,
+        arg1: ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>,
         arg2: *mut ::std::os::raw::c_void,
     );
 }
@@ -7080,42 +6144,27 @@ fn bindgen_test_layout_android_poll_source() {
     assert_eq!(
         ::std::mem::size_of::<android_poll_source>(),
         24usize,
-        concat!("Size of: ", stringify!(android_poll_source))
+        "Size of android_poll_source"
     );
     assert_eq!(
         ::std::mem::align_of::<android_poll_source>(),
         8usize,
-        concat!("Alignment of ", stringify!(android_poll_source))
+        "Alignment of android_poll_source"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_poll_source),
-            "::",
-            stringify!(id)
-        )
+        "Offset of field: android_poll_source::id"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).app) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_poll_source),
-            "::",
-            stringify!(app)
-        )
+        "Offset of field: android_poll_source::app"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).process) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_poll_source),
-            "::",
-            stringify!(process)
-        )
+        "Offset of field: android_poll_source::process"
     );
 }
 #[repr(C)]
@@ -7141,72 +6190,42 @@ fn bindgen_test_layout_android_input_buffer() {
     assert_eq!(
         ::std::mem::size_of::<android_input_buffer>(),
         48usize,
-        concat!("Size of: ", stringify!(android_input_buffer))
+        "Size of android_input_buffer"
     );
     assert_eq!(
         ::std::mem::align_of::<android_input_buffer>(),
         8usize,
-        concat!("Alignment of ", stringify!(android_input_buffer))
+        "Alignment of android_input_buffer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEvents) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(motionEvents)
-        )
+        "Offset of field: android_input_buffer::motionEvents"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEventsCount) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(motionEventsCount)
-        )
+        "Offset of field: android_input_buffer::motionEventsCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEventsBufferSize) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(motionEventsBufferSize)
-        )
+        "Offset of field: android_input_buffer::motionEventsBufferSize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEvents) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(keyEvents)
-        )
+        "Offset of field: android_input_buffer::keyEvents"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEventsCount) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(keyEventsCount)
-        )
+        "Offset of field: android_input_buffer::keyEventsCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEventsBufferSize) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(keyEventsBufferSize)
-        )
+        "Offset of field: android_input_buffer::keyEventsBufferSize"
     );
 }
 #[doc = " Function pointer declaration for the filtering of key events.\n A function with this signature should be passed to\n android_app_set_key_event_filter and return false for any events that should\n not be handled by android_native_app_glue. These events will be handled by\n the system instead."]
@@ -7236,6 +6255,10 @@ pub struct android_app {
     pub window: *mut ANativeWindow,
     #[doc = " Current content rectangle of the window; this is the area where the\n window's content should be placed to be seen by the user."]
     pub contentRect: ARect,
+    #[doc = " Whether the software keyboard is visible or not."]
+    pub softwareKeyboardVisible: bool,
+    #[doc = " Last editor action. Valid within APP_CMD_SOFTWARE_KB_VIS_CHANGED handler.\n\n Note: the upstream comment above isn't accurate.\n - `APP_CMD_SOFTWARE_KB_VIS_CHANGED` is associated with `softwareKeyboardVisible`\n   changes, not `editorAction`.\n - `APP_CMD_EDITOR_ACTION` is associated with this state but unlike for\n   `window` state there's no synchonization that blocks the Java main\n   thread, so we can't say that this is only valid within the `APP_CMD_` handler."]
+    pub editorAction: ::std::os::raw::c_int,
     #[doc = " Current state of the app's activity.  May be either APP_CMD_START,\n APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP."]
     pub activityState: ::std::os::raw::c_int,
     #[doc = " This is non-zero when the application's GameActivity is being\n destroyed and waiting for the app thread to complete."]
@@ -7269,313 +6292,173 @@ fn bindgen_test_layout_android_app() {
     let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_app>(),
-        384usize,
-        concat!("Size of: ", stringify!(android_app))
+        392usize,
+        "Size of android_app"
     );
     assert_eq!(
         ::std::mem::align_of::<android_app>(),
         8usize,
-        concat!("Alignment of ", stringify!(android_app))
+        "Alignment of android_app"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).userData) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(userData)
-        )
+        "Offset of field: android_app::userData"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onAppCmd) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(onAppCmd)
-        )
+        "Offset of field: android_app::onAppCmd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).activity) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(activity)
-        )
+        "Offset of field: android_app::activity"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).config) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(config)
-        )
+        "Offset of field: android_app::config"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).savedState) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(savedState)
-        )
+        "Offset of field: android_app::savedState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).savedStateSize) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(savedStateSize)
-        )
+        "Offset of field: android_app::savedStateSize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).looper) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(looper)
-        )
+        "Offset of field: android_app::looper"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).window) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(window)
-        )
+        "Offset of field: android_app::window"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).contentRect) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(contentRect)
-        )
+        "Offset of field: android_app::contentRect"
     );
     assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).activityState) as usize - ptr as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).softwareKeyboardVisible) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(activityState)
-        )
+        "Offset of field: android_app::softwareKeyboardVisible"
     );
     assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).destroyRequested) as usize - ptr as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).editorAction) as usize - ptr as usize },
         84usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(destroyRequested)
-        )
+        "Offset of field: android_app::editorAction"
     );
     assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).inputBuffers) as usize - ptr as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).activityState) as usize - ptr as usize },
         88usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(inputBuffers)
-        )
+        "Offset of field: android_app::activityState"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).destroyRequested) as usize - ptr as usize },
+        92usize,
+        "Offset of field: android_app::destroyRequested"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).inputBuffers) as usize - ptr as usize },
+        96usize,
+        "Offset of field: android_app::inputBuffers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).currentInputBuffer) as usize - ptr as usize },
-        184usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(currentInputBuffer)
-        )
+        192usize,
+        "Offset of field: android_app::currentInputBuffer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).textInputState) as usize - ptr as usize },
-        188usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(textInputState)
-        )
+        196usize,
+        "Offset of field: android_app::textInputState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).mutex) as usize - ptr as usize },
-        192usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(mutex)
-        )
+        200usize,
+        "Offset of field: android_app::mutex"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cond) as usize - ptr as usize },
-        232usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(cond)
-        )
+        240usize,
+        "Offset of field: android_app::cond"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).msgread) as usize - ptr as usize },
-        280usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(msgread)
-        )
+        288usize,
+        "Offset of field: android_app::msgread"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).msgwrite) as usize - ptr as usize },
-        284usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(msgwrite)
-        )
+        292usize,
+        "Offset of field: android_app::msgwrite"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).thread) as usize - ptr as usize },
-        288usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(thread)
-        )
+        296usize,
+        "Offset of field: android_app::thread"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cmdPollSource) as usize - ptr as usize },
-        296usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(cmdPollSource)
-        )
+        304usize,
+        "Offset of field: android_app::cmdPollSource"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).running) as usize - ptr as usize },
-        320usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(running)
-        )
+        328usize,
+        "Offset of field: android_app::running"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stateSaved) as usize - ptr as usize },
-        324usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(stateSaved)
-        )
+        332usize,
+        "Offset of field: android_app::stateSaved"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).destroyed) as usize - ptr as usize },
-        328usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(destroyed)
-        )
+        336usize,
+        "Offset of field: android_app::destroyed"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).redrawNeeded) as usize - ptr as usize },
-        332usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(redrawNeeded)
-        )
+        340usize,
+        "Offset of field: android_app::redrawNeeded"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pendingWindow) as usize - ptr as usize },
-        336usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(pendingWindow)
-        )
+        344usize,
+        "Offset of field: android_app::pendingWindow"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pendingContentRect) as usize - ptr as usize },
-        344usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(pendingContentRect)
-        )
+        352usize,
+        "Offset of field: android_app::pendingContentRect"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEventFilter) as usize - ptr as usize },
-        360usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(keyEventFilter)
-        )
+        368usize,
+        "Offset of field: android_app::keyEventFilter"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEventFilter) as usize - ptr as usize },
-        368usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(motionEventFilter)
-        )
+        376usize,
+        "Offset of field: android_app::motionEventFilter"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).inputAvailableWakeUp) as usize - ptr as usize },
-        376usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(inputAvailableWakeUp)
-        )
+        384usize,
+        "Offset of field: android_app::inputAvailableWakeUp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).inputSwapPending) as usize - ptr as usize },
-        377usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(inputSwapPending)
-        )
+        385usize,
+        "Offset of field: android_app::inputSwapPending"
     );
 }
 #[doc = " Looper data ID of commands coming from the app's main thread, which\n is returned as an identifier from ALooper_pollOnce().  The data for this\n identifier is a pointer to an android_poll_source structure.\n These can be retrieved and processed with android_app_read_cmd()\n and android_app_exec_cmd()."]
@@ -7585,7 +6468,7 @@ pub const NativeAppGlueLooperId_LOOPER_ID_INPUT: NativeAppGlueLooperId = 2;
 #[doc = " Start of user-defined ALooper identifiers."]
 pub const NativeAppGlueLooperId_LOOPER_ID_USER: NativeAppGlueLooperId = 3;
 #[doc = " Looper ID of commands coming from the app's main thread, an AInputQueue or\n user-defined sources."]
-pub type NativeAppGlueLooperId = ::std::os::raw::c_uint;
+pub type NativeAppGlueLooperId = i8;
 #[doc = " Unused. Reserved for future use when usage of AInputQueue will be\n supported."]
 pub const NativeAppGlueAppCmd_UNUSED_APP_CMD_INPUT_CHANGED: NativeAppGlueAppCmd = 0;
 #[doc = " Command from main thread: a new ANativeWindow is ready for use.  Upon\n receiving this command, android_app->window will contain the new window\n surface."]
@@ -7598,30 +6481,32 @@ pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_RESIZED: NativeAppGlueAppCmd = 3;
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_REDRAW_NEEDED: NativeAppGlueAppCmd = 4;
 #[doc = " Command from main thread: the content area of the window has changed,\n such as from the soft input window being shown or hidden.  You can\n find the new content rect in android_app::contentRect."]
 pub const NativeAppGlueAppCmd_APP_CMD_CONTENT_RECT_CHANGED: NativeAppGlueAppCmd = 5;
+#[doc = " Command from main thread: the software keyboard was shown or hidden."]
+pub const NativeAppGlueAppCmd_APP_CMD_SOFTWARE_KB_VIS_CHANGED: NativeAppGlueAppCmd = 6;
 #[doc = " Command from main thread: the app's activity window has gained\n input focus."]
-pub const NativeAppGlueAppCmd_APP_CMD_GAINED_FOCUS: NativeAppGlueAppCmd = 6;
+pub const NativeAppGlueAppCmd_APP_CMD_GAINED_FOCUS: NativeAppGlueAppCmd = 7;
 #[doc = " Command from main thread: the app's activity window has lost\n input focus."]
-pub const NativeAppGlueAppCmd_APP_CMD_LOST_FOCUS: NativeAppGlueAppCmd = 7;
+pub const NativeAppGlueAppCmd_APP_CMD_LOST_FOCUS: NativeAppGlueAppCmd = 8;
 #[doc = " Command from main thread: the current device configuration has changed."]
-pub const NativeAppGlueAppCmd_APP_CMD_CONFIG_CHANGED: NativeAppGlueAppCmd = 8;
+pub const NativeAppGlueAppCmd_APP_CMD_CONFIG_CHANGED: NativeAppGlueAppCmd = 9;
 #[doc = " Command from main thread: the system is running low on memory.\n Try to reduce your memory use."]
-pub const NativeAppGlueAppCmd_APP_CMD_LOW_MEMORY: NativeAppGlueAppCmd = 9;
+pub const NativeAppGlueAppCmd_APP_CMD_LOW_MEMORY: NativeAppGlueAppCmd = 10;
 #[doc = " Command from main thread: the app's activity has been started."]
-pub const NativeAppGlueAppCmd_APP_CMD_START: NativeAppGlueAppCmd = 10;
+pub const NativeAppGlueAppCmd_APP_CMD_START: NativeAppGlueAppCmd = 11;
 #[doc = " Command from main thread: the app's activity has been resumed."]
-pub const NativeAppGlueAppCmd_APP_CMD_RESUME: NativeAppGlueAppCmd = 11;
+pub const NativeAppGlueAppCmd_APP_CMD_RESUME: NativeAppGlueAppCmd = 12;
 #[doc = " Command from main thread: the app should generate a new saved state\n for itself, to restore from later if needed.  If you have saved state,\n allocate it with malloc and place it in android_app.savedState with\n the size in android_app.savedStateSize.  The will be freed for you\n later."]
-pub const NativeAppGlueAppCmd_APP_CMD_SAVE_STATE: NativeAppGlueAppCmd = 12;
+pub const NativeAppGlueAppCmd_APP_CMD_SAVE_STATE: NativeAppGlueAppCmd = 13;
 #[doc = " Command from main thread: the app's activity has been paused."]
-pub const NativeAppGlueAppCmd_APP_CMD_PAUSE: NativeAppGlueAppCmd = 13;
+pub const NativeAppGlueAppCmd_APP_CMD_PAUSE: NativeAppGlueAppCmd = 14;
 #[doc = " Command from main thread: the app's activity has been stopped."]
-pub const NativeAppGlueAppCmd_APP_CMD_STOP: NativeAppGlueAppCmd = 14;
+pub const NativeAppGlueAppCmd_APP_CMD_STOP: NativeAppGlueAppCmd = 15;
 #[doc = " Command from main thread: the app's activity is being destroyed,\n and waiting for the app thread to clean up and exit before proceeding."]
-pub const NativeAppGlueAppCmd_APP_CMD_DESTROY: NativeAppGlueAppCmd = 15;
+pub const NativeAppGlueAppCmd_APP_CMD_DESTROY: NativeAppGlueAppCmd = 16;
 #[doc = " Command from main thread: the app's insets have changed."]
-pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_INSETS_CHANGED: NativeAppGlueAppCmd = 16;
-#[doc = " Commands passed from the application's main Java thread to the game's thread."]
-pub type NativeAppGlueAppCmd = ::std::os::raw::c_uint;
+pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_INSETS_CHANGED: NativeAppGlueAppCmd = 17;
+#[doc = " Commands passed from the application's main Java thread to the game's thread.\n\n Values from 0 to 127 are reserved for this library; values from -128 to -1\n can be used for custom user's events."]
+pub type NativeAppGlueAppCmd = i8;
 extern "C" {
     #[doc = " Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next\n app command message."]
     pub fn android_app_read_cmd(android_app: *mut android_app) -> i8;
@@ -7666,6 +6551,10 @@ extern "C" {
         filter: android_motion_event_filter,
     );
 }
+extern "C" {
+    #[doc = " You can send your custom events using the function below.\n\n Make sure your custom codes do not overlap with this library's ones.\n\n Values from 0 to 127 are reserved for this library; values from -128 to -1\n can be used for custom user's events."]
+    pub fn android_app_write_cmd(android_app: *mut android_app, cmd: i8);
+}
 extern "C" {
     #[doc = " Determines if a looper wake up was due to new input becoming available"]
     pub fn android_app_input_available_wake_up(app: *mut android_app) -> bool;
diff --git a/android-activity/src/game_activity/ffi_arm.rs b/android-activity/src/game_activity/ffi_arm.rs
index 8933437..de717f5 100644
--- a/android-activity/src/game_activity/ffi_arm.rs
+++ b/android-activity/src/game_activity/ffi_arm.rs
@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.66.1 */
+/* automatically generated by rust-bindgen 0.71.1 */
 
 #[repr(C)]
 #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
@@ -16,10 +16,7 @@ where
     Storage: AsRef<[u8]> + AsMut<[u8]>,
 {
     #[inline]
-    pub fn get_bit(&self, index: usize) -> bool {
-        debug_assert!(index / 8 < self.storage.as_ref().len());
-        let byte_index = index / 8;
-        let byte = self.storage.as_ref()[byte_index];
+    fn extract_bit(byte: u8, index: usize) -> bool {
         let bit_index = if cfg!(target_endian = "big") {
             7 - (index % 8)
         } else {
@@ -29,10 +26,21 @@ where
         byte & mask == mask
     }
     #[inline]
-    pub fn set_bit(&mut self, index: usize, val: bool) {
+    pub fn get_bit(&self, index: usize) -> bool {
         debug_assert!(index / 8 < self.storage.as_ref().len());
         let byte_index = index / 8;
-        let byte = &mut self.storage.as_mut()[byte_index];
+        let byte = self.storage.as_ref()[byte_index];
+        Self::extract_bit(byte, index)
+    }
+    #[inline]
+    pub unsafe fn raw_get_bit(this: *const Self, index: usize) -> bool {
+        debug_assert!(index / 8 < core::mem::size_of::<Storage>());
+        let byte_index = index / 8;
+        let byte = *(core::ptr::addr_of!((*this).storage) as *const u8).offset(byte_index as isize);
+        Self::extract_bit(byte, index)
+    }
+    #[inline]
+    fn change_bit(byte: u8, index: usize, val: bool) -> u8 {
         let bit_index = if cfg!(target_endian = "big") {
             7 - (index % 8)
         } else {
@@ -40,12 +48,27 @@ where
         };
         let mask = 1 << bit_index;
         if val {
-            *byte |= mask;
+            byte | mask
         } else {
-            *byte &= !mask;
+            byte & !mask
         }
     }
     #[inline]
+    pub fn set_bit(&mut self, index: usize, val: bool) {
+        debug_assert!(index / 8 < self.storage.as_ref().len());
+        let byte_index = index / 8;
+        let byte = &mut self.storage.as_mut()[byte_index];
+        *byte = Self::change_bit(*byte, index, val);
+    }
+    #[inline]
+    pub unsafe fn raw_set_bit(this: *mut Self, index: usize, val: bool) {
+        debug_assert!(index / 8 < core::mem::size_of::<Storage>());
+        let byte_index = index / 8;
+        let byte =
+            (core::ptr::addr_of_mut!((*this).storage) as *mut u8).offset(byte_index as isize);
+        *byte = Self::change_bit(*byte, index, val);
+    }
+    #[inline]
     pub fn get(&self, bit_offset: usize, bit_width: u8) -> u64 {
         debug_assert!(bit_width <= 64);
         debug_assert!(bit_offset / 8 < self.storage.as_ref().len());
@@ -64,6 +87,24 @@ where
         val
     }
     #[inline]
+    pub unsafe fn raw_get(this: *const Self, bit_offset: usize, bit_width: u8) -> u64 {
+        debug_assert!(bit_width <= 64);
+        debug_assert!(bit_offset / 8 < core::mem::size_of::<Storage>());
+        debug_assert!((bit_offset + (bit_width as usize)) / 8 <= core::mem::size_of::<Storage>());
+        let mut val = 0;
+        for i in 0..(bit_width as usize) {
+            if Self::raw_get_bit(this, i + bit_offset) {
+                let index = if cfg!(target_endian = "big") {
+                    bit_width as usize - 1 - i
+                } else {
+                    i
+                };
+                val |= 1 << index;
+            }
+        }
+        val
+    }
+    #[inline]
     pub fn set(&mut self, bit_offset: usize, bit_width: u8, val: u64) {
         debug_assert!(bit_width <= 64);
         debug_assert!(bit_offset / 8 < self.storage.as_ref().len());
@@ -79,6 +120,22 @@ where
             self.set_bit(index + bit_offset, val_bit_is_set);
         }
     }
+    #[inline]
+    pub unsafe fn raw_set(this: *mut Self, bit_offset: usize, bit_width: u8, val: u64) {
+        debug_assert!(bit_width <= 64);
+        debug_assert!(bit_offset / 8 < core::mem::size_of::<Storage>());
+        debug_assert!((bit_offset + (bit_width as usize)) / 8 <= core::mem::size_of::<Storage>());
+        for i in 0..(bit_width as usize) {
+            let mask = 1 << i;
+            let val_bit_is_set = val & mask == mask;
+            let index = if cfg!(target_endian = "big") {
+                bit_width as usize - 1 - i
+            } else {
+                i
+            };
+            Self::raw_set_bit(this, index + bit_offset, val_bit_is_set);
+        }
+    }
 }
 pub const __BIONIC__: u32 = 1;
 pub const __WORDSIZE: u32 = 32;
@@ -104,11 +161,12 @@ pub const __ANDROID_API_R__: u32 = 30;
 pub const __ANDROID_API_S__: u32 = 31;
 pub const __ANDROID_API_T__: u32 = 33;
 pub const __ANDROID_API_U__: u32 = 34;
+pub const __ANDROID_API_V__: u32 = 35;
 pub const __ANDROID_NDK__: u32 = 1;
-pub const __NDK_MAJOR__: u32 = 25;
-pub const __NDK_MINOR__: u32 = 2;
+pub const __NDK_MAJOR__: u32 = 26;
+pub const __NDK_MINOR__: u32 = 1;
 pub const __NDK_BETA__: u32 = 0;
-pub const __NDK_BUILD__: u32 = 9519653;
+pub const __NDK_BUILD__: u32 = 10909125;
 pub const __NDK_CANARY__: u32 = 0;
 pub const WCHAR_MIN: u8 = 0u8;
 pub const INT8_MIN: i32 = -128;
@@ -147,11 +205,10 @@ pub const PTRDIFF_MAX: u32 = 2147483647;
 pub const SIZE_MAX: u32 = 4294967295;
 pub const __BITS_PER_LONG: u32 = 32;
 pub const __FD_SETSIZE: u32 = 1024;
-pub const __GNUC_VA_LIST: u32 = 1;
 pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8;
+pub const __bool_true_false_are_defined: u32 = 1;
 pub const true_: u32 = 1;
 pub const false_: u32 = 0;
-pub const __bool_true_false_are_defined: u32 = 1;
 pub const __PRI_64_prefix: &[u8; 3] = b"ll\0";
 pub const PRId8: &[u8; 2] = b"d\0";
 pub const PRId16: &[u8; 2] = b"d\0";
@@ -175,6 +232,28 @@ pub const PRIiLEAST64: &[u8; 4] = b"lli\0";
 pub const PRIiFAST8: &[u8; 2] = b"i\0";
 pub const PRIiFAST64: &[u8; 4] = b"lli\0";
 pub const PRIiMAX: &[u8; 3] = b"ji\0";
+pub const PRIb8: &[u8; 2] = b"b\0";
+pub const PRIb16: &[u8; 2] = b"b\0";
+pub const PRIb32: &[u8; 2] = b"b\0";
+pub const PRIb64: &[u8; 4] = b"llb\0";
+pub const PRIbLEAST8: &[u8; 2] = b"b\0";
+pub const PRIbLEAST16: &[u8; 2] = b"b\0";
+pub const PRIbLEAST32: &[u8; 2] = b"b\0";
+pub const PRIbLEAST64: &[u8; 4] = b"llb\0";
+pub const PRIbFAST8: &[u8; 2] = b"b\0";
+pub const PRIbFAST64: &[u8; 4] = b"llb\0";
+pub const PRIbMAX: &[u8; 3] = b"jb\0";
+pub const PRIB8: &[u8; 2] = b"B\0";
+pub const PRIB16: &[u8; 2] = b"B\0";
+pub const PRIB32: &[u8; 2] = b"B\0";
+pub const PRIB64: &[u8; 4] = b"llB\0";
+pub const PRIBLEAST8: &[u8; 2] = b"B\0";
+pub const PRIBLEAST16: &[u8; 2] = b"B\0";
+pub const PRIBLEAST32: &[u8; 2] = b"B\0";
+pub const PRIBLEAST64: &[u8; 4] = b"llB\0";
+pub const PRIBFAST8: &[u8; 2] = b"B\0";
+pub const PRIBFAST64: &[u8; 4] = b"llB\0";
+pub const PRIBMAX: &[u8; 3] = b"jB\0";
 pub const PRIo8: &[u8; 2] = b"o\0";
 pub const PRIo16: &[u8; 2] = b"o\0";
 pub const PRIo32: &[u8; 2] = b"o\0";
@@ -241,6 +320,28 @@ pub const SCNiLEAST64: &[u8; 4] = b"lli\0";
 pub const SCNiFAST8: &[u8; 4] = b"hhi\0";
 pub const SCNiFAST64: &[u8; 4] = b"lli\0";
 pub const SCNiMAX: &[u8; 3] = b"ji\0";
+pub const SCNb8: &[u8; 4] = b"hhb\0";
+pub const SCNb16: &[u8; 3] = b"hb\0";
+pub const SCNb32: &[u8; 2] = b"b\0";
+pub const SCNb64: &[u8; 4] = b"llb\0";
+pub const SCNbLEAST8: &[u8; 4] = b"hhb\0";
+pub const SCNbLEAST16: &[u8; 3] = b"hb\0";
+pub const SCNbLEAST32: &[u8; 2] = b"b\0";
+pub const SCNbLEAST64: &[u8; 4] = b"llb\0";
+pub const SCNbFAST8: &[u8; 4] = b"hhb\0";
+pub const SCNbFAST64: &[u8; 4] = b"llb\0";
+pub const SCNbMAX: &[u8; 3] = b"jb\0";
+pub const SCNB8: &[u8; 4] = b"hhB\0";
+pub const SCNB16: &[u8; 3] = b"hB\0";
+pub const SCNB32: &[u8; 2] = b"B\0";
+pub const SCNB64: &[u8; 4] = b"llB\0";
+pub const SCNBLEAST8: &[u8; 4] = b"hhB\0";
+pub const SCNBLEAST16: &[u8; 3] = b"hB\0";
+pub const SCNBLEAST32: &[u8; 2] = b"B\0";
+pub const SCNBLEAST64: &[u8; 4] = b"llB\0";
+pub const SCNBFAST8: &[u8; 4] = b"hhB\0";
+pub const SCNBFAST64: &[u8; 4] = b"llB\0";
+pub const SCNBMAX: &[u8; 3] = b"jB\0";
 pub const SCNo8: &[u8; 4] = b"hho\0";
 pub const SCNo16: &[u8; 3] = b"ho\0";
 pub const SCNo32: &[u8; 2] = b"o\0";
@@ -276,12 +377,12 @@ pub const SCNxFAST64: &[u8; 4] = b"llx\0";
 pub const SCNxMAX: &[u8; 3] = b"jx\0";
 pub const GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT: u32 = 48;
 pub const GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT: u32 = 8;
-pub const GAMETEXTINPUT_MAJOR_VERSION: u32 = 2;
+pub const GAMETEXTINPUT_MAJOR_VERSION: u32 = 4;
 pub const GAMETEXTINPUT_MINOR_VERSION: u32 = 0;
 pub const GAMETEXTINPUT_BUGFIX_VERSION: u32 = 0;
-pub const GAMEACTIVITY_MAJOR_VERSION: u32 = 2;
+pub const GAMEACTIVITY_MAJOR_VERSION: u32 = 4;
 pub const GAMEACTIVITY_MINOR_VERSION: u32 = 0;
-pub const GAMEACTIVITY_BUGFIX_VERSION: u32 = 2;
+pub const GAMEACTIVITY_BUGFIX_VERSION: u32 = 0;
 pub const POLLIN: u32 = 1;
 pub const POLLPRI: u32 = 2;
 pub const POLLOUT: u32 = 4;
@@ -584,6 +685,7 @@ pub const TRAP_HWBKPT: u32 = 4;
 pub const TRAP_UNK: u32 = 5;
 pub const TRAP_PERF: u32 = 6;
 pub const NSIGTRAP: u32 = 6;
+pub const TRAP_PERF_FLAG_ASYNC: u32 = 1;
 pub const CLD_EXITED: u32 = 1;
 pub const CLD_KILLED: u32 = 2;
 pub const CLD_DUMPED: u32 = 3;
@@ -640,6 +742,9 @@ pub const TIMER_ABSTIME: u32 = 1;
 pub const FD_SETSIZE: u32 = 1024;
 pub const CLOCKS_PER_SEC: u32 = 1000000;
 pub const TIME_UTC: u32 = 1;
+pub const TIME_MONOTONIC: u32 = 2;
+pub const TIME_ACTIVE: u32 = 3;
+pub const TIME_THREAD_ACTIVE: u32 = 4;
 pub const CSIGNAL: u32 = 255;
 pub const CLONE_VM: u32 = 256;
 pub const CLONE_FS: u32 = 512;
@@ -723,32 +828,22 @@ fn bindgen_test_layout_max_align_t() {
     assert_eq!(
         ::std::mem::size_of::<max_align_t>(),
         16usize,
-        concat!("Size of: ", stringify!(max_align_t))
+        "Size of max_align_t"
     );
     assert_eq!(
         ::std::mem::align_of::<max_align_t>(),
         8usize,
-        concat!("Alignment of ", stringify!(max_align_t))
+        "Alignment of max_align_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce1) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(max_align_t),
-            "::",
-            stringify!(__clang_max_align_nonce1)
-        )
+        "Offset of field: max_align_t::__clang_max_align_nonce1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce2) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(max_align_t),
-            "::",
-            stringify!(__clang_max_align_nonce2)
-        )
+        "Offset of field: max_align_t::__clang_max_align_nonce2"
     );
 }
 pub type __int8_t = ::std::os::raw::c_schar;
@@ -799,22 +894,17 @@ fn bindgen_test_layout___kernel_fd_set() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_fd_set>(),
         128usize,
-        concat!("Size of: ", stringify!(__kernel_fd_set))
+        "Size of __kernel_fd_set"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_fd_set>(),
         4usize,
-        concat!("Alignment of ", stringify!(__kernel_fd_set))
+        "Alignment of __kernel_fd_set"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_fd_set),
-            "::",
-            stringify!(fds_bits)
-        )
+        "Offset of field: __kernel_fd_set::fds_bits"
     );
 }
 pub type __kernel_sighandler_t =
@@ -851,22 +941,17 @@ fn bindgen_test_layout___kernel_fsid_t() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_fsid_t>(),
         8usize,
-        concat!("Size of: ", stringify!(__kernel_fsid_t))
+        "Size of __kernel_fsid_t"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_fsid_t>(),
         4usize,
-        concat!("Alignment of ", stringify!(__kernel_fsid_t))
+        "Alignment of __kernel_fsid_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).val) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_fsid_t),
-            "::",
-            stringify!(val)
-        )
+        "Offset of field: __kernel_fsid_t::val"
     );
 }
 pub type __kernel_off_t = __kernel_long_t;
@@ -1234,6 +1319,22 @@ pub const AKEYCODE_REFRESH: _bindgen_ty_2 = 285;
 pub const AKEYCODE_THUMBS_UP: _bindgen_ty_2 = 286;
 pub const AKEYCODE_THUMBS_DOWN: _bindgen_ty_2 = 287;
 pub const AKEYCODE_PROFILE_SWITCH: _bindgen_ty_2 = 288;
+pub const AKEYCODE_VIDEO_APP_1: _bindgen_ty_2 = 289;
+pub const AKEYCODE_VIDEO_APP_2: _bindgen_ty_2 = 290;
+pub const AKEYCODE_VIDEO_APP_3: _bindgen_ty_2 = 291;
+pub const AKEYCODE_VIDEO_APP_4: _bindgen_ty_2 = 292;
+pub const AKEYCODE_VIDEO_APP_5: _bindgen_ty_2 = 293;
+pub const AKEYCODE_VIDEO_APP_6: _bindgen_ty_2 = 294;
+pub const AKEYCODE_VIDEO_APP_7: _bindgen_ty_2 = 295;
+pub const AKEYCODE_VIDEO_APP_8: _bindgen_ty_2 = 296;
+pub const AKEYCODE_FEATURED_APP_1: _bindgen_ty_2 = 297;
+pub const AKEYCODE_FEATURED_APP_2: _bindgen_ty_2 = 298;
+pub const AKEYCODE_FEATURED_APP_3: _bindgen_ty_2 = 299;
+pub const AKEYCODE_FEATURED_APP_4: _bindgen_ty_2 = 300;
+pub const AKEYCODE_DEMO_APP_1: _bindgen_ty_2 = 301;
+pub const AKEYCODE_DEMO_APP_2: _bindgen_ty_2 = 302;
+pub const AKEYCODE_DEMO_APP_3: _bindgen_ty_2 = 303;
+pub const AKEYCODE_DEMO_APP_4: _bindgen_ty_2 = 304;
 pub type _bindgen_ty_2 = ::std::os::raw::c_uint;
 pub const ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: _bindgen_ty_3 = 1;
 pub type _bindgen_ty_3 = ::std::os::raw::c_uint;
@@ -1248,8 +1349,8 @@ pub const ALOOPER_EVENT_ERROR: _bindgen_ty_5 = 4;
 pub const ALOOPER_EVENT_HANGUP: _bindgen_ty_5 = 8;
 pub const ALOOPER_EVENT_INVALID: _bindgen_ty_5 = 16;
 pub type _bindgen_ty_5 = ::std::os::raw::c_uint;
-pub type va_list = u32;
 pub type __gnuc_va_list = u32;
+pub type va_list = u32;
 #[repr(C)]
 pub struct JavaVMAttachArgs {
     pub version: jint,
@@ -1263,42 +1364,27 @@ fn bindgen_test_layout_JavaVMAttachArgs() {
     assert_eq!(
         ::std::mem::size_of::<JavaVMAttachArgs>(),
         12usize,
-        concat!("Size of: ", stringify!(JavaVMAttachArgs))
+        "Size of JavaVMAttachArgs"
     );
     assert_eq!(
         ::std::mem::align_of::<JavaVMAttachArgs>(),
         4usize,
-        concat!("Alignment of ", stringify!(JavaVMAttachArgs))
+        "Alignment of JavaVMAttachArgs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
-            "::",
-            stringify!(version)
-        )
+        "Offset of field: JavaVMAttachArgs::version"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).name) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
-            "::",
-            stringify!(name)
-        )
+        "Offset of field: JavaVMAttachArgs::name"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).group) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
-            "::",
-            stringify!(group)
-        )
+        "Offset of field: JavaVMAttachArgs::group"
     );
 }
 #[repr(C)]
@@ -1314,32 +1400,22 @@ fn bindgen_test_layout_JavaVMOption() {
     assert_eq!(
         ::std::mem::size_of::<JavaVMOption>(),
         8usize,
-        concat!("Size of: ", stringify!(JavaVMOption))
+        "Size of JavaVMOption"
     );
     assert_eq!(
         ::std::mem::align_of::<JavaVMOption>(),
         4usize,
-        concat!("Alignment of ", stringify!(JavaVMOption))
+        "Alignment of JavaVMOption"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).optionString) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMOption),
-            "::",
-            stringify!(optionString)
-        )
+        "Offset of field: JavaVMOption::optionString"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).extraInfo) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMOption),
-            "::",
-            stringify!(extraInfo)
-        )
+        "Offset of field: JavaVMOption::extraInfo"
     );
 }
 #[repr(C)]
@@ -1356,52 +1432,32 @@ fn bindgen_test_layout_JavaVMInitArgs() {
     assert_eq!(
         ::std::mem::size_of::<JavaVMInitArgs>(),
         16usize,
-        concat!("Size of: ", stringify!(JavaVMInitArgs))
+        "Size of JavaVMInitArgs"
     );
     assert_eq!(
         ::std::mem::align_of::<JavaVMInitArgs>(),
         4usize,
-        concat!("Alignment of ", stringify!(JavaVMInitArgs))
+        "Alignment of JavaVMInitArgs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(version)
-        )
+        "Offset of field: JavaVMInitArgs::version"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).nOptions) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(nOptions)
-        )
+        "Offset of field: JavaVMInitArgs::nOptions"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).options) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(options)
-        )
+        "Offset of field: JavaVMInitArgs::options"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ignoreUnrecognized) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(ignoreUnrecognized)
-        )
+        "Offset of field: JavaVMInitArgs::ignoreUnrecognized"
     );
 }
 pub const AKEY_STATE_UNKNOWN: _bindgen_ty_6 = -1;
@@ -1871,32 +1927,22 @@ fn bindgen_test_layout_imaxdiv_t() {
     assert_eq!(
         ::std::mem::size_of::<imaxdiv_t>(),
         16usize,
-        concat!("Size of: ", stringify!(imaxdiv_t))
+        "Size of imaxdiv_t"
     );
     assert_eq!(
         ::std::mem::align_of::<imaxdiv_t>(),
         8usize,
-        concat!("Alignment of ", stringify!(imaxdiv_t))
+        "Alignment of imaxdiv_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).quot) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(imaxdiv_t),
-            "::",
-            stringify!(quot)
-        )
+        "Offset of field: imaxdiv_t::quot"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rem) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(imaxdiv_t),
-            "::",
-            stringify!(rem)
-        )
+        "Offset of field: imaxdiv_t::rem"
     );
 }
 extern "C" {
@@ -2001,6 +2047,10 @@ pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = 35;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_YCbCr_P010: AHardwareBuffer_Format = 54;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8_UNORM: AHardwareBuffer_Format = 56;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R16_UINT: AHardwareBuffer_Format = 57;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R16G16_UINT: AHardwareBuffer_Format = 58;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R10G10B10A10_UNORM: AHardwareBuffer_Format =
+    59;
 pub type AHardwareBuffer_Format = ::std::os::raw::c_uint;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_NEVER:
     AHardwareBuffer_UsageFlags = 0;
@@ -2038,6 +2088,8 @@ pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP:
     AHardwareBuffer_UsageFlags = 33554432;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE:
     AHardwareBuffer_UsageFlags = 67108864;
+pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_FRONT_BUFFER:
+    AHardwareBuffer_UsageFlags = 2147483648;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_VENDOR_0: AHardwareBuffer_UsageFlags =
     268435456;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_VENDOR_1: AHardwareBuffer_UsageFlags =
@@ -2098,92 +2150,52 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Desc>(),
         40usize,
-        concat!("Size of: ", stringify!(AHardwareBuffer_Desc))
+        "Size of AHardwareBuffer_Desc"
     );
     assert_eq!(
         ::std::mem::align_of::<AHardwareBuffer_Desc>(),
         8usize,
-        concat!("Alignment of ", stringify!(AHardwareBuffer_Desc))
+        "Alignment of AHardwareBuffer_Desc"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).width) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(width)
-        )
+        "Offset of field: AHardwareBuffer_Desc::width"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).height) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(height)
-        )
+        "Offset of field: AHardwareBuffer_Desc::height"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).layers) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(layers)
-        )
+        "Offset of field: AHardwareBuffer_Desc::layers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).format) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(format)
-        )
+        "Offset of field: AHardwareBuffer_Desc::format"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).usage) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(usage)
-        )
+        "Offset of field: AHardwareBuffer_Desc::usage"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stride) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(stride)
-        )
+        "Offset of field: AHardwareBuffer_Desc::stride"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rfu0) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(rfu0)
-        )
+        "Offset of field: AHardwareBuffer_Desc::rfu0"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rfu1) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(rfu1)
-        )
+        "Offset of field: AHardwareBuffer_Desc::rfu1"
     );
 }
 #[repr(C)]
@@ -2201,42 +2213,27 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Plane>(),
         12usize,
-        concat!("Size of: ", stringify!(AHardwareBuffer_Plane))
+        "Size of AHardwareBuffer_Plane"
     );
     assert_eq!(
         ::std::mem::align_of::<AHardwareBuffer_Plane>(),
         4usize,
-        concat!("Alignment of ", stringify!(AHardwareBuffer_Plane))
+        "Alignment of AHardwareBuffer_Plane"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Plane),
-            "::",
-            stringify!(data)
-        )
+        "Offset of field: AHardwareBuffer_Plane::data"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pixelStride) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Plane),
-            "::",
-            stringify!(pixelStride)
-        )
+        "Offset of field: AHardwareBuffer_Plane::pixelStride"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rowStride) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Plane),
-            "::",
-            stringify!(rowStride)
-        )
+        "Offset of field: AHardwareBuffer_Plane::rowStride"
     );
 }
 #[repr(C)]
@@ -2253,32 +2250,22 @@ fn bindgen_test_layout_AHardwareBuffer_Planes() {
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Planes>(),
         52usize,
-        concat!("Size of: ", stringify!(AHardwareBuffer_Planes))
+        "Size of AHardwareBuffer_Planes"
     );
     assert_eq!(
         ::std::mem::align_of::<AHardwareBuffer_Planes>(),
         4usize,
-        concat!("Alignment of ", stringify!(AHardwareBuffer_Planes))
+        "Alignment of AHardwareBuffer_Planes"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).planeCount) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Planes),
-            "::",
-            stringify!(planeCount)
-        )
+        "Offset of field: AHardwareBuffer_Planes::planeCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).planes) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Planes),
-            "::",
-            stringify!(planes)
-        )
+        "Offset of field: AHardwareBuffer_Planes::planes"
     );
 }
 #[repr(C)]
@@ -2378,62 +2365,37 @@ fn bindgen_test_layout_GameActivityPointerAxes() {
     assert_eq!(
         ::std::mem::size_of::<GameActivityPointerAxes>(),
         208usize,
-        concat!("Size of: ", stringify!(GameActivityPointerAxes))
+        "Size of GameActivityPointerAxes"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityPointerAxes>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameActivityPointerAxes))
+        "Alignment of GameActivityPointerAxes"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(id)
-        )
+        "Offset of field: GameActivityPointerAxes::id"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).toolType) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(toolType)
-        )
+        "Offset of field: GameActivityPointerAxes::toolType"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).axisValues) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(axisValues)
-        )
+        "Offset of field: GameActivityPointerAxes::axisValues"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rawX) as usize - ptr as usize },
         200usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(rawX)
-        )
+        "Offset of field: GameActivityPointerAxes::rawX"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rawY) as usize - ptr as usize },
         204usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(rawY)
-        )
+        "Offset of field: GameActivityPointerAxes::rawY"
     );
 }
 extern "C" {
@@ -2483,202 +2445,107 @@ fn bindgen_test_layout_GameActivityMotionEvent() {
     assert_eq!(
         ::std::mem::size_of::<GameActivityMotionEvent>(),
         1752usize,
-        concat!("Size of: ", stringify!(GameActivityMotionEvent))
+        "Size of GameActivityMotionEvent"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityMotionEvent>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameActivityMotionEvent))
+        "Alignment of GameActivityMotionEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(deviceId)
-        )
+        "Offset of field: GameActivityMotionEvent::deviceId"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(source)
-        )
+        "Offset of field: GameActivityMotionEvent::source"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(action)
-        )
+        "Offset of field: GameActivityMotionEvent::action"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(eventTime)
-        )
+        "Offset of field: GameActivityMotionEvent::eventTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(downTime)
-        )
+        "Offset of field: GameActivityMotionEvent::downTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: GameActivityMotionEvent::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(metaState)
-        )
+        "Offset of field: GameActivityMotionEvent::metaState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).actionButton) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(actionButton)
-        )
+        "Offset of field: GameActivityMotionEvent::actionButton"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).buttonState) as usize - ptr as usize },
         44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(buttonState)
-        )
+        "Offset of field: GameActivityMotionEvent::buttonState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).classification) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(classification)
-        )
+        "Offset of field: GameActivityMotionEvent::classification"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).edgeFlags) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(edgeFlags)
-        )
+        "Offset of field: GameActivityMotionEvent::edgeFlags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pointerCount) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(pointerCount)
-        )
+        "Offset of field: GameActivityMotionEvent::pointerCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pointers) as usize - ptr as usize },
         60usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(pointers)
-        )
+        "Offset of field: GameActivityMotionEvent::pointers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historySize) as usize - ptr as usize },
         1724usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historySize)
-        )
+        "Offset of field: GameActivityMotionEvent::historySize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesMillis) as usize - ptr as usize },
         1728usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalEventTimesMillis)
-        )
+        "Offset of field: GameActivityMotionEvent::historicalEventTimesMillis"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesNanos) as usize - ptr as usize },
         1732usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalEventTimesNanos)
-        )
+        "Offset of field: GameActivityMotionEvent::historicalEventTimesNanos"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historicalAxisValues) as usize - ptr as usize },
         1736usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalAxisValues)
-        )
+        "Offset of field: GameActivityMotionEvent::historicalAxisValues"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).precisionX) as usize - ptr as usize },
         1740usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(precisionX)
-        )
+        "Offset of field: GameActivityMotionEvent::precisionX"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).precisionY) as usize - ptr as usize },
         1744usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(precisionY)
-        )
+        "Offset of field: GameActivityMotionEvent::precisionY"
     );
 }
 extern "C" {
@@ -2693,14 +2560,6 @@ extern "C" {
     #[doc = " \\brief Handle the freeing of the GameActivityMotionEvent struct."]
     pub fn GameActivityMotionEvent_destroy(c_event: *mut GameActivityMotionEvent);
 }
-extern "C" {
-    #[doc = " \\brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`.\n\n This is done automatically by the GameActivity: see `onTouchEvent` to set\n a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityMotionEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityMotionEvent,
-    );
-}
 #[doc = " \\brief Describe a key event that happened on the GameActivity SurfaceView.\n\n This is 1:1 mapping to the information contained in a Java `KeyEvent`\n (see https://developer.android.com/reference/android/view/KeyEvent).\n The only exception is the event times, which are reported as\n nanoseconds in this struct."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -2724,146 +2583,69 @@ fn bindgen_test_layout_GameActivityKeyEvent() {
     assert_eq!(
         ::std::mem::size_of::<GameActivityKeyEvent>(),
         56usize,
-        concat!("Size of: ", stringify!(GameActivityKeyEvent))
+        "Size of GameActivityKeyEvent"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityKeyEvent>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameActivityKeyEvent))
+        "Alignment of GameActivityKeyEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(deviceId)
-        )
+        "Offset of field: GameActivityKeyEvent::deviceId"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(source)
-        )
+        "Offset of field: GameActivityKeyEvent::source"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(action)
-        )
+        "Offset of field: GameActivityKeyEvent::action"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(eventTime)
-        )
+        "Offset of field: GameActivityKeyEvent::eventTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(downTime)
-        )
+        "Offset of field: GameActivityKeyEvent::downTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: GameActivityKeyEvent::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(metaState)
-        )
+        "Offset of field: GameActivityKeyEvent::metaState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).modifiers) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(modifiers)
-        )
+        "Offset of field: GameActivityKeyEvent::modifiers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).repeatCount) as usize - ptr as usize },
         44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(repeatCount)
-        )
+        "Offset of field: GameActivityKeyEvent::repeatCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyCode) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(keyCode)
-        )
+        "Offset of field: GameActivityKeyEvent::keyCode"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).scanCode) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(scanCode)
-        )
-    );
-}
-extern "C" {
-    #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.\n\n This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`\n to set a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityKeyEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityKeyEvent,
+        "Offset of field: GameActivityKeyEvent::scanCode"
     );
 }
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
-    GameCommonInsetsType = 3;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
-#[doc = " The type of a component for which to retrieve insets. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
-pub type GameCommonInsetsType = ::std::os::raw::c_uint;
 #[doc = " This struct holds a span within a region of text from start (inclusive) to\n end (exclusive). An empty span or cursor position is specified with\n start==end. An undefined span is specified with start = end = SPAN_UNDEFINED."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -2880,37 +2662,27 @@ fn bindgen_test_layout_GameTextInputSpan() {
     assert_eq!(
         ::std::mem::size_of::<GameTextInputSpan>(),
         8usize,
-        concat!("Size of: ", stringify!(GameTextInputSpan))
+        "Size of GameTextInputSpan"
     );
     assert_eq!(
         ::std::mem::align_of::<GameTextInputSpan>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameTextInputSpan))
+        "Alignment of GameTextInputSpan"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).start) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputSpan),
-            "::",
-            stringify!(start)
-        )
+        "Offset of field: GameTextInputSpan::start"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).end) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputSpan),
-            "::",
-            stringify!(end)
-        )
+        "Offset of field: GameTextInputSpan::end"
     );
 }
 pub const GameTextInputSpanFlag_SPAN_UNDEFINED: GameTextInputSpanFlag = -1;
 #[doc = " Values with special meaning in a GameTextInputSpan."]
-pub type GameTextInputSpanFlag = ::std::os::raw::c_int;
+pub type GameTextInputSpanFlag = i32;
 #[doc = " This struct holds the state of an editable section of text.\n The text can have a selection and a composing region defined on it.\n A composing region is used by IMEs that allow input using multiple steps to\n compose a glyph or word. Use functions GameTextInput_getState and\n GameTextInput_setState to read and modify the state that an IME is editing."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -2931,52 +2703,32 @@ fn bindgen_test_layout_GameTextInputState() {
     assert_eq!(
         ::std::mem::size_of::<GameTextInputState>(),
         24usize,
-        concat!("Size of: ", stringify!(GameTextInputState))
+        "Size of GameTextInputState"
     );
     assert_eq!(
         ::std::mem::align_of::<GameTextInputState>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameTextInputState))
+        "Alignment of GameTextInputState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).text_UTF8) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(text_UTF8)
-        )
+        "Offset of field: GameTextInputState::text_UTF8"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).text_length) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(text_length)
-        )
+        "Offset of field: GameTextInputState::text_length"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).selection) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(selection)
-        )
+        "Offset of field: GameTextInputState::selection"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).composingRegion) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(composingRegion)
-        )
+        "Offset of field: GameTextInputState::composingRegion"
     );
 }
 #[doc = " A callback called by GameTextInput_getState.\n @param context User-defined context.\n @param state State, owned by the library, that will be valid for the duration\n of the callback."]
@@ -3008,7 +2760,7 @@ pub const ShowImeFlags_SHOW_IME_UNDEFINED: ShowImeFlags = 0;
 pub const ShowImeFlags_SHOW_IMPLICIT: ShowImeFlags = 1;
 pub const ShowImeFlags_SHOW_FORCED: ShowImeFlags = 2;
 #[doc = " Flags to be passed to GameTextInput_showIme."]
-pub type ShowImeFlags = ::std::os::raw::c_uint;
+pub type ShowImeFlags = u32;
 extern "C" {
     #[doc = " Show the IME. Calls InputMethodManager.showSoftInput().\n @param input A valid GameTextInput library handle.\n @param flags Defined in ShowImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
     pub fn GameTextInput_showIme(input: *mut GameTextInput, flags: u32);
@@ -3017,9 +2769,9 @@ pub const HideImeFlags_HIDE_IME_UNDEFINED: HideImeFlags = 0;
 pub const HideImeFlags_HIDE_IMPLICIT_ONLY: HideImeFlags = 1;
 pub const HideImeFlags_HIDE_NOT_ALWAYS: HideImeFlags = 2;
 #[doc = " Flags to be passed to GameTextInput_hideIme."]
-pub type HideImeFlags = ::std::os::raw::c_uint;
+pub type HideImeFlags = u32;
 extern "C" {
-    #[doc = " Show the IME. Calls InputMethodManager.hideSoftInputFromWindow().\n @param input A valid GameTextInput library handle.\n @param flags Defined in HideImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
+    #[doc = " Hide the IME. Calls InputMethodManager.hideSoftInputFromWindow().\n @param input A valid GameTextInput library handle.\n @param flags Defined in HideImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
     pub fn GameTextInput_hideIme(input: *mut GameTextInput, flags: u32);
 }
 extern "C" {
@@ -3046,7 +2798,7 @@ pub type GameTextInputEventCallback = ::std::option::Option<
     ),
 >;
 extern "C" {
-    #[doc = " Optionally set a callback to be called whenever the IME state changes.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME state changes.\n @param context Context passed as first argument to the callback."]
+    #[doc = " Optionally set a callback to be called whenever the IME state changes.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME state changes.\n @param context Context passed as first argument to the callback.\n <b>This function is deprecated. Don't perform any complex processing inside\n the callback other than copying the state variable. Using any synchronization\n primitives inside this callback may cause a deadlock.</b>"]
     pub fn GameTextInput_setEventCallback(
         input: *mut GameTextInput,
         callback: GameTextInputEventCallback,
@@ -3089,6 +2841,144 @@ extern "C" {
         context: *mut ::std::os::raw::c_void,
     );
 }
+#[doc = " Mask of bits that determine the overall class\n of text being given.  Currently supported classes are:\n {@link #TYPE_CLASS_TEXT}, {@link #TYPE_CLASS_NUMBER},\n {@link #TYPE_CLASS_PHONE}, {@link #TYPE_CLASS_DATETIME}.\n <p>IME authors: If the class is not one you\n understand, assume {@link #TYPE_CLASS_TEXT} with NO variation\n or flags.<p>"]
+pub const GameTextInputType_TYPE_MASK_CLASS: GameTextInputType = 15;
+#[doc = " Mask of bits that determine the variation of\n the base content class."]
+pub const GameTextInputType_TYPE_MASK_VARIATION: GameTextInputType = 4080;
+#[doc = " Mask of bits that provide addition bit flags\n of options."]
+pub const GameTextInputType_TYPE_MASK_FLAGS: GameTextInputType = 16773120;
+#[doc = " Special content type for when no explicit type has been specified.\n This should be interpreted to mean that the target input connection\n is not rich, it can not process and show things like candidate text nor\n retrieve the current text, so the input method will need to run in a\n limited \"generate key events\" mode, if it supports it. Note that some\n input methods may not support it, for example a voice-based input\n method will likely not be able to generate key events even if this\n flag is set."]
+pub const GameTextInputType_TYPE_NULL: GameTextInputType = 0;
+#[doc = " Class for normal text.  This class supports the following flags (only\n one of which should be set):\n {@link #TYPE_TEXT_FLAG_CAP_CHARACTERS},\n {@link #TYPE_TEXT_FLAG_CAP_WORDS}, and.\n {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}.  It also supports the\n following variations:\n {@link #TYPE_TEXT_VARIATION_NORMAL}, and\n {@link #TYPE_TEXT_VARIATION_URI}.  If you do not recognize the\n variation, normal should be assumed."]
+pub const GameTextInputType_TYPE_CLASS_TEXT: GameTextInputType = 1;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: capitalize all characters.  Overrides\n {@link #TYPE_TEXT_FLAG_CAP_WORDS} and\n {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}.  This value is explicitly defined\n to be the same as {@link TextUtils#CAP_MODE_CHARACTERS}. Of course,\n this only affects languages where there are upper-case and lower-case\n letters."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_CAP_CHARACTERS: GameTextInputType = 4096;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: capitalize the first character of\n every word.  Overrides {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}.  This\n value is explicitly defined\n to be the same as {@link TextUtils#CAP_MODE_WORDS}. Of course,\n this only affects languages where there are upper-case and lower-case\n letters."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_CAP_WORDS: GameTextInputType = 8192;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: capitalize the first character of\n each sentence.  This value is explicitly defined\n to be the same as {@link TextUtils#CAP_MODE_SENTENCES}. For example\n in English it means to capitalize after a period and a space (note that\n other languages may have different characters for period, or not use\n spaces, or use different grammatical rules). Of course, this only affects\n languages where there are upper-case and lower-case letters."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_CAP_SENTENCES: GameTextInputType = 16384;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the user is entering free-form\n text that should have auto-correction applied to it. Without this flag,\n the IME will not try to correct typos. You should always set this flag\n unless you really expect users to type non-words in this field, for\n example to choose a name for a character in a game.\n Contrast this with {@link #TYPE_TEXT_FLAG_AUTO_COMPLETE} and\n {@link #TYPE_TEXT_FLAG_NO_SUGGESTIONS}:\n {@code TYPE_TEXT_FLAG_AUTO_CORRECT} means that the IME will try to\n auto-correct typos as the user is typing, but does not define whether\n the IME offers an interface to show suggestions."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_AUTO_CORRECT: GameTextInputType = 32768;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the text editor (which means\n the application) is performing auto-completion of the text being entered\n based on its own semantics, which it will present to the user as they type.\n This generally means that the input method should not be showing\n candidates itself, but can expect the editor to supply its own\n completions/candidates from\n {@link android.view.inputmethod.InputMethodSession#displayCompletions\n InputMethodSession.displayCompletions()} as a result of the editor calling\n {@link android.view.inputmethod.InputMethodManager#displayCompletions\n InputMethodManager.displayCompletions()}.\n Note the contrast with {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} and\n {@link #TYPE_TEXT_FLAG_NO_SUGGESTIONS}:\n {@code TYPE_TEXT_FLAG_AUTO_COMPLETE} means the editor should show an\n interface for displaying suggestions, but instead of supplying its own\n it will rely on the Editor to pass completions/corrections."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_AUTO_COMPLETE: GameTextInputType = 65536;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: multiple lines of text can be\n entered into the field.  If this flag is not set, the text field\n will be constrained to a single line. The IME may also choose not to\n display an enter key when this flag is not set, as there should be no\n need to create new lines."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_MULTI_LINE: GameTextInputType = 131072;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the regular text view associated\n with this should not be multi-line, but when a fullscreen input method\n is providing text it should use multiple lines if it can."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_IME_MULTI_LINE: GameTextInputType = 262144;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the input method does not need to\n display any dictionary-based candidates. This is useful for text views that\n do not contain words from the language and do not benefit from any\n dictionary-based completions or corrections. It overrides the\n {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} value when set.\n Please avoid using this unless you are certain this is what you want.\n Many input methods need suggestions to work well, for example the ones\n based on gesture typing. Consider clearing\n {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} instead if you just do not\n want the IME to correct typos.\n Note the contrast with {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} and\n {@link #TYPE_TEXT_FLAG_AUTO_COMPLETE}:\n {@code TYPE_TEXT_FLAG_NO_SUGGESTIONS} means the IME does not need to\n show an interface to display suggestions. Most IMEs will also take this to\n mean they do not need to try to auto-correct what the user is typing."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_NO_SUGGESTIONS: GameTextInputType = 524288;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: Let the IME know the text conversion\n suggestions are required by the application. Text conversion suggestion is\n for the transliteration languages which has pronunciation characters and\n target characters. When the user is typing the pronunciation charactes, the\n IME could provide the possible target characters to the user. When this\n flag is set, the IME should insert the text conversion suggestions through\n {@link Builder#setTextConversionSuggestions(List)} and\n the {@link TextAttribute} with initialized with the text conversion\n suggestions is provided by the IME to the application. To receive the\n additional information, the application needs to implement {@link\n InputConnection#setComposingText(CharSequence, int, TextAttribute)},\n {@link InputConnection#setComposingRegion(int, int, TextAttribute)}, and\n {@link InputConnection#commitText(CharSequence, int, TextAttribute)}."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS: GameTextInputType =
+    1048576;
+#[doc = " Default variation of {@link #TYPE_CLASS_TEXT}: plain old normal text."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_NORMAL: GameTextInputType = 0;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a URI."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_URI: GameTextInputType = 16;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering an e-mail address."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_EMAIL_ADDRESS: GameTextInputType = 32;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering the subject line of\n an e-mail."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_EMAIL_SUBJECT: GameTextInputType = 48;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a short, possibly informal\n message such as an instant message or a text message."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_SHORT_MESSAGE: GameTextInputType = 64;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering the content of a long,\n possibly formal message such as the body of an e-mail."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_LONG_MESSAGE: GameTextInputType = 80;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering the name of a person."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_PERSON_NAME: GameTextInputType = 96;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a postal mailing address."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_POSTAL_ADDRESS: GameTextInputType = 112;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a password."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_PASSWORD: GameTextInputType = 128;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a password, which should\n be visible to the user."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_VISIBLE_PASSWORD: GameTextInputType = 144;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering text inside of a web form."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_WEB_EDIT_TEXT: GameTextInputType = 160;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering text to filter contents\n of a list etc."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_FILTER: GameTextInputType = 176;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering text for phonetic\n pronunciation, such as a phonetic name field in contacts. This is mostly\n useful for languages where one spelling may have several phonetic\n readings, like Japanese."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_PHONETIC: GameTextInputType = 192;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering e-mail address inside\n of a web form.  This was added in\n {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An IME must target\n this API version or later to see this input type; if it doesn't, a request\n for this type will be seen as {@link #TYPE_TEXT_VARIATION_EMAIL_ADDRESS}\n when passed through {@link\n android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS: GameTextInputType = 208;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering password inside\n of a web form.  This was added in\n {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An IME must target\n this API version or later to see this input type; if it doesn't, a request\n for this type will be seen as {@link #TYPE_TEXT_VARIATION_PASSWORD}\n when passed through {@link\n android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_WEB_PASSWORD: GameTextInputType = 224;
+#[doc = " Class for numeric text.  This class supports the following flags:\n {@link #TYPE_NUMBER_FLAG_SIGNED} and\n {@link #TYPE_NUMBER_FLAG_DECIMAL}.  It also supports the following\n variations: {@link #TYPE_NUMBER_VARIATION_NORMAL} and\n {@link #TYPE_NUMBER_VARIATION_PASSWORD}.\n <p>IME authors: If you do not recognize\n the variation, normal should be assumed.</p>"]
+pub const GameTextInputType_TYPE_CLASS_NUMBER: GameTextInputType = 2;
+#[doc = " Flag of {@link #TYPE_CLASS_NUMBER}: the number is signed, allowing\n a positive or negative sign at the start."]
+pub const GameTextInputType_TYPE_NUMBER_FLAG_SIGNED: GameTextInputType = 4096;
+#[doc = " Flag of {@link #TYPE_CLASS_NUMBER}: the number is decimal, allowing\n a decimal point to provide fractional values."]
+pub const GameTextInputType_TYPE_NUMBER_FLAG_DECIMAL: GameTextInputType = 8192;
+#[doc = " Default variation of {@link #TYPE_CLASS_NUMBER}: plain normal\n numeric text.  This was added in\n {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An IME must target\n this API version or later to see this input type; if it doesn't, a request\n for this type will be dropped when passed through\n {@link android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_NUMBER_VARIATION_NORMAL: GameTextInputType = 0;
+#[doc = " Variation of {@link #TYPE_CLASS_NUMBER}: entering a numeric password.\n This was added in {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An\n IME must target this API version or later to see this input type; if it\n doesn't, a request for this type will be dropped when passed\n through {@link android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_NUMBER_VARIATION_PASSWORD: GameTextInputType = 16;
+#[doc = " Class for a phone number.  This class currently supports no variations\n or flags."]
+pub const GameTextInputType_TYPE_CLASS_PHONE: GameTextInputType = 3;
+#[doc = " Class for dates and times.  It supports the\n following variations:\n {@link #TYPE_DATETIME_VARIATION_NORMAL}\n {@link #TYPE_DATETIME_VARIATION_DATE}, and\n {@link #TYPE_DATETIME_VARIATION_TIME}."]
+pub const GameTextInputType_TYPE_CLASS_DATETIME: GameTextInputType = 4;
+#[doc = " Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering\n both a date and time."]
+pub const GameTextInputType_TYPE_DATETIME_VARIATION_NORMAL: GameTextInputType = 0;
+#[doc = " Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering\n only a date."]
+pub const GameTextInputType_TYPE_DATETIME_VARIATION_DATE: GameTextInputType = 16;
+#[doc = " Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering\n only a time."]
+pub const GameTextInputType_TYPE_DATETIME_VARIATION_TIME: GameTextInputType = 32;
+#[doc = " Definitions for inputType argument of GameActivity_setImeEditorInfo()\n\n <pre>\n |-------|-------|-------|-------|\n                              1111 TYPE_MASK_CLASS\n                      11111111     TYPE_MASK_VARIATION\n          111111111111             TYPE_MASK_FLAGS\n |-------|-------|-------|-------|\n                                   TYPE_NULL\n |-------|-------|-------|-------|\n                                 1 TYPE_CLASS_TEXT\n                             1     TYPE_TEXT_VARIATION_URI\n                            1      TYPE_TEXT_VARIATION_EMAIL_ADDRESS\n                            11     TYPE_TEXT_VARIATION_EMAIL_SUBJECT\n                           1       TYPE_TEXT_VARIATION_SHORT_MESSAGE\n                           1 1     TYPE_TEXT_VARIATION_LONG_MESSAGE\n                           11      TYPE_TEXT_VARIATION_PERSON_NAME\n                           111     TYPE_TEXT_VARIATION_POSTAL_ADDRESS\n                          1        TYPE_TEXT_VARIATION_PASSWORD\n                          1  1     TYPE_TEXT_VARIATION_VISIBLE_PASSWORD\n                          1 1      TYPE_TEXT_VARIATION_WEB_EDIT_TEXT\n                          1 11     TYPE_TEXT_VARIATION_FILTER\n                          11       TYPE_TEXT_VARIATION_PHONETIC\n                          11 1     TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS\n                          111      TYPE_TEXT_VARIATION_WEB_PASSWORD\n                     1             TYPE_TEXT_FLAG_CAP_CHARACTERS\n                    1              TYPE_TEXT_FLAG_CAP_WORDS\n                   1               TYPE_TEXT_FLAG_CAP_SENTENCES\n                  1                TYPE_TEXT_FLAG_AUTO_CORRECT\n                 1                 TYPE_TEXT_FLAG_AUTO_COMPLETE\n                1                  TYPE_TEXT_FLAG_MULTI_LINE\n               1                   TYPE_TEXT_FLAG_IME_MULTI_LINE\n              1                    TYPE_TEXT_FLAG_NO_SUGGESTIONS\n             1 TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS\n |-------|-------|-------|-------|\n                                1  TYPE_CLASS_NUMBER\n                             1     TYPE_NUMBER_VARIATION_PASSWORD\n                     1             TYPE_NUMBER_FLAG_SIGNED\n                    1              TYPE_NUMBER_FLAG_DECIMAL\n |-------|-------|-------|-------|\n                                11 TYPE_CLASS_PHONE\n |-------|-------|-------|-------|\n                               1   TYPE_CLASS_DATETIME\n                             1     TYPE_DATETIME_VARIATION_DATE\n                            1      TYPE_DATETIME_VARIATION_TIME\n |-------|-------|-------|-------|</pre>"]
+pub type GameTextInputType = u32;
+#[doc = " Set of bits in {@link #imeOptions} that provide alternative actions\n associated with the \"enter\" key.  This both helps the IME provide\n better feedback about what the enter key will do, and also allows it\n to provide alternative mechanisms for providing that command."]
+pub const GameTextInputActionType_IME_MASK_ACTION: GameTextInputActionType = 255;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: no specific action has been\n associated with this editor, let the editor come up with its own if\n it can."]
+pub const GameTextInputActionType_IME_ACTION_UNSPECIFIED: GameTextInputActionType = 0;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: there is no available action."]
+pub const GameTextInputActionType_IME_ACTION_NONE: GameTextInputActionType = 1;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"go\"\n operation to take the user to the target of the text they typed.\n Typically used, for example, when entering a URL."]
+pub const GameTextInputActionType_IME_ACTION_GO: GameTextInputActionType = 2;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"search\"\n operation, taking the user to the results of searching for the text\n they have typed (in whatever context is appropriate)."]
+pub const GameTextInputActionType_IME_ACTION_SEARCH: GameTextInputActionType = 3;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"send\"\n operation, delivering the text to its target.  This is typically used\n when composing a message in IM or SMS where sending is immediate."]
+pub const GameTextInputActionType_IME_ACTION_SEND: GameTextInputActionType = 4;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"next\"\n operation, taking the user to the next field that will accept text."]
+pub const GameTextInputActionType_IME_ACTION_NEXT: GameTextInputActionType = 5;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"done\"\n operation, typically meaning there is nothing more to input and the\n IME will be closed."]
+pub const GameTextInputActionType_IME_ACTION_DONE: GameTextInputActionType = 6;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: like {@link #IME_ACTION_NEXT}, but\n for moving to the previous field.  This will normally not be used to\n specify an action (since it precludes {@link #IME_ACTION_NEXT}), but\n can be returned to the app if it sets {@link #IME_FLAG_NAVIGATE_PREVIOUS}."]
+pub const GameTextInputActionType_IME_ACTION_PREVIOUS: GameTextInputActionType = 7;
+#[doc = " actionId and imeOptions argument of GameActivity_setImeEditorInfo().\n\n <pre>\n |-------|-------|-------|-------|\n                              1111 IME_MASK_ACTION\n |-------|-------|-------|-------|\n                                   IME_ACTION_UNSPECIFIED\n                                 1 IME_ACTION_NONE\n                                1  IME_ACTION_GO\n                                11 IME_ACTION_SEARCH\n                               1   IME_ACTION_SEND\n                               1 1 IME_ACTION_NEXT\n                               11  IME_ACTION_DONE\n                               111 IME_ACTION_PREVIOUS\n         1                         IME_FLAG_NO_PERSONALIZED_LEARNING\n        1                          IME_FLAG_NO_FULLSCREEN\n       1                           IME_FLAG_NAVIGATE_PREVIOUS\n      1                            IME_FLAG_NAVIGATE_NEXT\n     1                             IME_FLAG_NO_EXTRACT_UI\n    1                              IME_FLAG_NO_ACCESSORY_ACTION\n   1                               IME_FLAG_NO_ENTER_ACTION\n  1                                IME_FLAG_FORCE_ASCII\n |-------|-------|-------|-------|</pre>"]
+pub type GameTextInputActionType = u32;
+#[doc = " Flag of {@link #imeOptions}: used to request that the IME should not update\n any personalized data such as typing history and personalized language\n model based on what the user typed on this text editing object.  Typical\n use cases are: <ul> <li>When the application is in a special mode, where\n user's activities are expected to be not recorded in the application's\n history.  Some web browsers and chat applications may have this kind of\n modes.</li> <li>When storing typing history does not make much sense.\n Specifying this flag in typing games may help to avoid typing history from\n being filled up with words that the user is less likely to type in their\n daily life.  Another example is that when the application already knows\n that the expected input is not a valid word (e.g. a promotion code that is\n     not a valid word in any natural language).</li>\n </ul>\n\n <p>Applications need to be aware that the flag is not a guarantee, and some\n IMEs may not respect it.</p>"]
+pub const GameTextInputImeOptions_IME_FLAG_NO_PERSONALIZED_LEARNING: GameTextInputImeOptions =
+    16777216;
+#[doc = " Flag of {@link #imeOptions}: used to request that the IME never go\n into fullscreen mode.\n By default, IMEs may go into full screen mode when they think\n it's appropriate, for example on small screens in landscape\n orientation where displaying a software keyboard may occlude\n such a large portion of the screen that the remaining part is\n too small to meaningfully display the application UI.\n If this flag is set, compliant IMEs will never go into full screen mode,\n and always leave some space to display the application UI.\n Applications need to be aware that the flag is not a guarantee, and\n some IMEs may ignore it."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_FULLSCREEN: GameTextInputImeOptions = 33554432;
+#[doc = " Flag of {@link #imeOptions}: like {@link #IME_FLAG_NAVIGATE_NEXT}, but\n specifies there is something interesting that a backward navigation\n can focus on.  If the user selects the IME's facility to backward\n navigate, this will show up in the application as an {@link\n #IME_ACTION_PREVIOUS} at {@link InputConnection#performEditorAction(int)\n InputConnection.performEditorAction(int)}."]
+pub const GameTextInputImeOptions_IME_FLAG_NAVIGATE_PREVIOUS: GameTextInputImeOptions = 67108864;
+#[doc = " Flag of {@link #imeOptions}: used to specify that there is something\n interesting that a forward navigation can focus on. This is like using\n {@link #IME_ACTION_NEXT}, except allows the IME to be multiline (with\n an enter key) as well as provide forward navigation.  Note that some\n IMEs may not be able to do this, especially when running on a small\n screen where there is little space.  In that case it does not need to\n present a UI for this option.  Like {@link #IME_ACTION_NEXT}, if the\n user selects the IME's facility to forward navigate, this will show up\n in the application at {@link InputConnection#performEditorAction(int)\n InputConnection.performEditorAction(int)}."]
+pub const GameTextInputImeOptions_IME_FLAG_NAVIGATE_NEXT: GameTextInputImeOptions = 134217728;
+#[doc = " Flag of {@link #imeOptions}: used to specify that the IME does not need\n to show its extracted text UI.  For input methods that may be fullscreen,\n often when in landscape mode, this allows them to be smaller and let part\n of the application be shown behind, through transparent UI parts in the\n fullscreen IME. The part of the UI visible to the user may not be\n responsive to touch because the IME will receive touch events, which may\n confuse the user; use {@link #IME_FLAG_NO_FULLSCREEN} instead for a better\n experience. Using this flag is discouraged and it may become deprecated in\n the future. Its meaning is unclear in some situations and it may not work\n appropriately on older versions of the platform."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_EXTRACT_UI: GameTextInputImeOptions = 268435456;
+#[doc = " Flag of {@link #imeOptions}: used in conjunction with one of the actions\n masked by {@link #IME_MASK_ACTION}, this indicates that the action\n should not be available as an accessory button on the right of the\n extracted text when the input method is full-screen. Note that by setting\n this flag, there can be cases where the action is simply never available to\n the user. Setting this generally means that you think that in fullscreen\n mode, where there is little space to show the text, it's not worth taking\n some screen real estate to display the action and it should be used instead\n to show more text."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_ACCESSORY_ACTION: GameTextInputImeOptions = 536870912;
+#[doc = " Flag of {@link #imeOptions}: used in conjunction with one of the actions\n masked by {@link #IME_MASK_ACTION}. If this flag is not set, IMEs will\n normally replace the \"enter\" key with the action supplied. This flag\n indicates that the action should not be available in-line as a replacement\n for the \"enter\" key. Typically this is because the action has such a\n significant impact or is not recoverable enough that accidentally hitting\n it should be avoided, such as sending a message. Note that\n {@link android.widget.TextView} will automatically set this flag for you\n on multi-line text views."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_ENTER_ACTION: GameTextInputImeOptions = 1073741824;
+#[doc = " Flag of {@link #imeOptions}: used to request an IME that is capable of\n inputting ASCII characters.  The intention of this flag is to ensure that\n the user can type Roman alphabet characters in a {@link\n android.widget.TextView}. It is typically used for an account ID or\n password input. A lot of the time, IMEs are already able to input ASCII\n even without being told so (such IMEs already respect this flag in a\n sense), but there are cases when this is not the default. For instance,\n users of languages using a different script like Arabic, Greek, Hebrew or\n Russian typically have a keyboard that can't input ASCII characters by\n default. Applications need to be aware that the flag is not a guarantee,\n and some IMEs may not respect it. However, it is strongly recommended for\n IME authors to respect this flag especially when their IME could end up\n with a state where only languages using non-ASCII are enabled."]
+pub const GameTextInputImeOptions_IME_FLAG_FORCE_ASCII: GameTextInputImeOptions = 2147483648;
+#[doc = " Flag of {@link #internalImeOptions}: flag is set when app window containing\n this\n {@link EditorInfo} is using {@link Configuration#ORIENTATION_PORTRAIT}\n mode.\n @hide"]
+pub const GameTextInputImeOptions_IME_INTERNAL_FLAG_APP_WINDOW_PORTRAIT: GameTextInputImeOptions =
+    1;
+#[doc = " Generic unspecified type for {@link #imeOptions}."]
+pub const GameTextInputImeOptions_IME_NULL: GameTextInputImeOptions = 0;
+pub type GameTextInputImeOptions = u32;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
+    GameCommonInsetsType = 3;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
+#[doc = " The type of a component for which to retrieve insets. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
+pub type GameCommonInsetsType = u8;
 #[doc = " This structure defines the native side of an android.app.GameActivity.\n It is created by the framework, and handed to the application's native\n code as it is being launched."]
 #[repr(C)]
 pub struct GameActivity {
@@ -3120,112 +3010,62 @@ fn bindgen_test_layout_GameActivity() {
     assert_eq!(
         ::std::mem::size_of::<GameActivity>(),
         40usize,
-        concat!("Size of: ", stringify!(GameActivity))
+        "Size of GameActivity"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivity>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameActivity))
+        "Alignment of GameActivity"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).callbacks) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(callbacks)
-        )
+        "Offset of field: GameActivity::callbacks"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).vm) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(vm)
-        )
+        "Offset of field: GameActivity::vm"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).env) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(env)
-        )
+        "Offset of field: GameActivity::env"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).javaGameActivity) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(javaGameActivity)
-        )
+        "Offset of field: GameActivity::javaGameActivity"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).internalDataPath) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(internalDataPath)
-        )
+        "Offset of field: GameActivity::internalDataPath"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).externalDataPath) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(externalDataPath)
-        )
+        "Offset of field: GameActivity::externalDataPath"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sdkVersion) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(sdkVersion)
-        )
+        "Offset of field: GameActivity::sdkVersion"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).instance) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(instance)
-        )
+        "Offset of field: GameActivity::instance"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).assetManager) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(assetManager)
-        )
+        "Offset of field: GameActivity::assetManager"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).obbPath) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(obbPath)
-        )
+        "Offset of field: GameActivity::obbPath"
     );
 }
 #[doc = " A function the user should call from their callback with the data, its length\n and the library- supplied context."]
@@ -3282,7 +3122,7 @@ pub struct GameActivityCallbacks {
     pub onNativeWindowDestroyed: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The current device AConfiguration has changed.  The new configuration can\n be retrieved from assetManager."]
+    #[doc = " The current device AConfiguration has changed. The new configuration can\n be retrieved from assetManager."]
     pub onConfigurationChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
     #[doc = " The system is running low on memory.  Use this callback to release\n resources you do not need, to help the system avoid killing more\n important processes."]
@@ -3321,6 +3161,13 @@ pub struct GameActivityCallbacks {
     pub onContentRectChanged: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, rect: *const ARect),
     >,
+    #[doc = " Callback called when the software keyboard is shown or hidden."]
+    pub onSoftwareKeyboardVisibilityChanged:
+        ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity, visible: bool)>,
+    #[doc = " Callback called when the software keyboard is shown or hidden."]
+    pub onEditorAction: ::std::option::Option<
+        unsafe extern "C" fn(activity: *mut GameActivity, action: ::std::os::raw::c_int) -> bool,
+    >,
 }
 #[test]
 fn bindgen_test_layout_GameActivityCallbacks() {
@@ -3329,203 +3176,120 @@ fn bindgen_test_layout_GameActivityCallbacks() {
     let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<GameActivityCallbacks>(),
-        76usize,
-        concat!("Size of: ", stringify!(GameActivityCallbacks))
+        84usize,
+        "Size of GameActivityCallbacks"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityCallbacks>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameActivityCallbacks))
+        "Alignment of GameActivityCallbacks"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onStart) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onStart)
-        )
+        "Offset of field: GameActivityCallbacks::onStart"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onResume) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onResume)
-        )
+        "Offset of field: GameActivityCallbacks::onResume"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onSaveInstanceState) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onSaveInstanceState)
-        )
+        "Offset of field: GameActivityCallbacks::onSaveInstanceState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onPause) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onPause)
-        )
+        "Offset of field: GameActivityCallbacks::onPause"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onStop) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onStop)
-        )
+        "Offset of field: GameActivityCallbacks::onStop"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onDestroy) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onDestroy)
-        )
+        "Offset of field: GameActivityCallbacks::onDestroy"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onWindowFocusChanged) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onWindowFocusChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onWindowFocusChanged"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowCreated) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowCreated)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowCreated"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowResized) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowResized)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowResized"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowRedrawNeeded) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowRedrawNeeded)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowRedrawNeeded"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowDestroyed) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowDestroyed)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowDestroyed"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onConfigurationChanged) as usize - ptr as usize },
         44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onConfigurationChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onConfigurationChanged"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onTrimMemory) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onTrimMemory)
-        )
+        "Offset of field: GameActivityCallbacks::onTrimMemory"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onTouchEvent) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onTouchEvent)
-        )
+        "Offset of field: GameActivityCallbacks::onTouchEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onKeyDown) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onKeyDown)
-        )
+        "Offset of field: GameActivityCallbacks::onKeyDown"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onKeyUp) as usize - ptr as usize },
         60usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onKeyUp)
-        )
+        "Offset of field: GameActivityCallbacks::onKeyUp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onTextInputEvent) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onTextInputEvent)
-        )
+        "Offset of field: GameActivityCallbacks::onTextInputEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onWindowInsetsChanged) as usize - ptr as usize },
         68usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onWindowInsetsChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onWindowInsetsChanged"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onContentRectChanged) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onContentRectChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onContentRectChanged"
+    );
+    assert_eq!(
+        unsafe {
+            ::std::ptr::addr_of!((*ptr).onSoftwareKeyboardVisibilityChanged) as usize - ptr as usize
+        },
+        76usize,
+        "Offset of field: GameActivityCallbacks::onSoftwareKeyboardVisibilityChanged"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).onEditorAction) as usize - ptr as usize },
+        80usize,
+        "Offset of field: GameActivityCallbacks::onEditorAction"
     );
 }
 #[doc = " This is the function that must be in the native code to instantiate the\n application's native activity.  It is called with the activity instance (see\n above); if the code is being instantiated from a previously saved instance,\n the savedState will be non-NULL and point to the saved data.  You must make\n any copy of this data you need -- it will be released after you return from\n this function."]
@@ -3605,7 +3369,7 @@ pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_TURN_SCREEN_ON: GameActiv
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DISMISS_KEYGUARD:
     GameActivitySetWindowFlags = 4194304;
 #[doc = " Flags for GameActivity_setWindowFlags,\n as per the Java API at android.view.WindowManager.LayoutParams."]
-pub type GameActivitySetWindowFlags = ::std::os::raw::c_uint;
+pub type GameActivitySetWindowFlags = u32;
 extern "C" {
     #[doc = " Change the window flags of the given activity.  Calls getWindow().setFlags()\n of the given activity.\n Note that some flags must be set before the window decoration is created,\n see\n https://developer.android.com/reference/android/view/Window#setFlags(int,%20int).\n Note also that this method can be called from\n *any* thread; it will send a message to the main thread of the process\n where the Java finish call will take place."]
     pub fn GameActivity_setWindowFlags(
@@ -3621,11 +3385,15 @@ pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT:
 pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED:
     GameActivityShowSoftInputFlags = 2;
 #[doc = " Flags for GameActivity_showSoftInput; see the Java InputMethodManager\n API for documentation."]
-pub type GameActivityShowSoftInputFlags = ::std::os::raw::c_uint;
+pub type GameActivityShowSoftInputFlags = u8;
 extern "C" {
     #[doc = " Show the IME while in the given activity.  Calls\n InputMethodManager.showSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java call will take place."]
     pub fn GameActivity_showSoftInput(activity: *mut GameActivity, flags: u32);
 }
+extern "C" {
+    #[doc = " Restarts the input method. Calls InputMethodManager.restartInput().\n Note that this method can be called from *any* thread; it will send a message\n to the main thread of the process where the Java call will take place."]
+    pub fn GameActivity_restartInput(activity: *mut GameActivity);
+}
 extern "C" {
     #[doc = " Set the text entry state (see documentation of the GameTextInputState struct\n in the Game Text Input library reference).\n\n Ownership of the state is maintained by the caller."]
     pub fn GameActivity_setTextInputState(
@@ -3652,7 +3420,7 @@ pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_O
 pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS:
     GameActivityHideSoftInputFlags = 2;
 #[doc = " Flags for GameActivity_hideSoftInput; see the Java InputMethodManager\n API for documentation."]
-pub type GameActivityHideSoftInputFlags = ::std::os::raw::c_uint;
+pub type GameActivityHideSoftInputFlags = u16;
 extern "C" {
     #[doc = " Hide the IME while in the given activity.  Calls\n InputMethodManager.hideSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java finish call will take place."]
     pub fn GameActivity_hideSoftInput(activity: *mut GameActivity, flags: u32);
@@ -3666,12 +3434,16 @@ extern "C" {
     );
 }
 extern "C" {
-    #[doc = " Set options on how the IME behaves when it is requested for text input.\n See\n https://developer.android.com/reference/android/view/inputmethod/EditorInfo\n for the meaning of inputType, actionId and imeOptions.\n\n Note that this function will attach the current thread to the JVM if it is\n not already attached, so the caller must detach the thread from the JVM\n before the thread is destroyed using DetachCurrentThread."]
+    #[doc = " Tells whether the software keyboard is visible or not."]
+    pub fn GameActivity_isSoftwareKeyboardVisible(activity: *mut GameActivity) -> bool;
+}
+extern "C" {
+    #[doc = " Set options on how the IME behaves when it is requested for text input.\n See\n https://developer.android.com/reference/android/view/inputmethod/EditorInfo\n for the meaning of inputType, actionId and imeOptions.\n\n <b>Note:</b> currently only TYPE_NULL AND TYPE_CLASS_NUMBER are supported."]
     pub fn GameActivity_setImeEditorInfo(
         activity: *mut GameActivity,
-        inputType: ::std::os::raw::c_int,
-        actionId: ::std::os::raw::c_int,
-        imeOptions: ::std::os::raw::c_int,
+        inputType: GameTextInputType,
+        actionId: GameTextInputActionType,
+        imeOptions: GameTextInputImeOptions,
     );
 }
 extern "C" {
@@ -3702,6 +3474,9 @@ extern "C" {
 extern "C" {
     pub fn GameActivity_getKeyboardHidden(activity: *mut GameActivity) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn GameActivity_getLocalesCount(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
 extern "C" {
     pub fn GameActivity_getMcc(activity: *mut GameActivity) -> ::std::os::raw::c_int;
 }
@@ -3734,6 +3509,39 @@ extern "C" {
 extern "C" {
     pub fn GameActivity_getUIMode(activity: *mut GameActivity) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    #[doc = " The functions below return Java locale information.\n\n In simple cases there will be just one locale, but it's possible tha\n there are more than one locale objects. Users are encouraged to write code\n that handles all locales and not just the first one.\n\n The functions in the block below return string values in the provided buffer.\n Return value is zero if there were no errors, otherwise it's non-zero.\n If the return value is zero, `dst` will contain a null-terminated string:\n strlen(dst) <= dst_size - 1.\n If the return value is non-zero, the content of dst is undefined.\n\n Parameters:\n\n dst, dst_size: define a receiver buffer. Locale string can be something\n short like \"EN/EN\", but it may be longer. You should be safe with a buffer\n size of 256 bytes.\n\n If the buffer is too small, ENOBUFS is returned. Try allocating a larger\n buffer in this case.\n\n localeIdx must be between 0 and the value of GameActivity_getLocalesCount().\n If localeIdx is out of range, EINVAL is returned.\n\n Refer to Java documentation of locales for more information."]
+    pub fn GameActivity_getLocaleLanguage(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getLocaleScript(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getLocaleCountry(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getLocaleVariant(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
 pub const ACONFIGURATION_ORIENTATION_ANY: _bindgen_ty_21 = 0;
 pub const ACONFIGURATION_ORIENTATION_PORT: _bindgen_ty_21 = 1;
 pub const ACONFIGURATION_ORIENTATION_LAND: _bindgen_ty_21 = 2;
@@ -3832,45 +3640,26 @@ pub struct pollfd {
 fn bindgen_test_layout_pollfd() {
     const UNINIT: ::std::mem::MaybeUninit<pollfd> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<pollfd>(),
-        8usize,
-        concat!("Size of: ", stringify!(pollfd))
-    );
+    assert_eq!(::std::mem::size_of::<pollfd>(), 8usize, "Size of pollfd");
     assert_eq!(
         ::std::mem::align_of::<pollfd>(),
         4usize,
-        concat!("Alignment of ", stringify!(pollfd))
+        "Alignment of pollfd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(pollfd),
-            "::",
-            stringify!(fd)
-        )
+        "Offset of field: pollfd::fd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).events) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(pollfd),
-            "::",
-            stringify!(events)
-        )
+        "Offset of field: pollfd::events"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).revents) as usize - ptr as usize },
         6usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(pollfd),
-            "::",
-            stringify!(revents)
-        )
+        "Offset of field: pollfd::revents"
     );
 }
 #[repr(C)]
@@ -3905,222 +3694,117 @@ fn bindgen_test_layout_sigcontext() {
     assert_eq!(
         ::std::mem::size_of::<sigcontext>(),
         84usize,
-        concat!("Size of: ", stringify!(sigcontext))
+        "Size of sigcontext"
     );
     assert_eq!(
         ::std::mem::align_of::<sigcontext>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigcontext))
+        "Alignment of sigcontext"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).trap_no) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(trap_no)
-        )
+        "Offset of field: sigcontext::trap_no"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).error_code) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(error_code)
-        )
+        "Offset of field: sigcontext::error_code"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(oldmask)
-        )
+        "Offset of field: sigcontext::oldmask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_r0) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_r0)
-        )
+        "Offset of field: sigcontext::arm_r0"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_r1) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_r1)
-        )
+        "Offset of field: sigcontext::arm_r1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_r2) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_r2)
-        )
+        "Offset of field: sigcontext::arm_r2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_r3) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_r3)
-        )
+        "Offset of field: sigcontext::arm_r3"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_r4) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_r4)
-        )
+        "Offset of field: sigcontext::arm_r4"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_r5) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_r5)
-        )
+        "Offset of field: sigcontext::arm_r5"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_r6) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_r6)
-        )
+        "Offset of field: sigcontext::arm_r6"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_r7) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_r7)
-        )
+        "Offset of field: sigcontext::arm_r7"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_r8) as usize - ptr as usize },
         44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_r8)
-        )
+        "Offset of field: sigcontext::arm_r8"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_r9) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_r9)
-        )
+        "Offset of field: sigcontext::arm_r9"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_r10) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_r10)
-        )
+        "Offset of field: sigcontext::arm_r10"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_fp) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_fp)
-        )
+        "Offset of field: sigcontext::arm_fp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_ip) as usize - ptr as usize },
         60usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_ip)
-        )
+        "Offset of field: sigcontext::arm_ip"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_sp) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_sp)
-        )
+        "Offset of field: sigcontext::arm_sp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_lr) as usize - ptr as usize },
         68usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_lr)
-        )
+        "Offset of field: sigcontext::arm_lr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_pc) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_pc)
-        )
+        "Offset of field: sigcontext::arm_pc"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).arm_cpsr) as usize - ptr as usize },
         76usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(arm_cpsr)
-        )
+        "Offset of field: sigcontext::arm_cpsr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fault_address) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(fault_address)
-        )
+        "Offset of field: sigcontext::fault_address"
     );
 }
 pub type sigset_t = ::std::os::raw::c_ulong;
@@ -4156,35 +3840,22 @@ fn bindgen_test_layout___kernel_sigaction__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_sigaction__bindgen_ty_1>(),
         4usize,
-        concat!("Size of: ", stringify!(__kernel_sigaction__bindgen_ty_1))
+        "Size of __kernel_sigaction__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_sigaction__bindgen_ty_1>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__kernel_sigaction__bindgen_ty_1)
-        )
+        "Alignment of __kernel_sigaction__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sa_handler) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction__bindgen_ty_1),
-            "::",
-            stringify!(_sa_handler)
-        )
+        "Offset of field: __kernel_sigaction__bindgen_ty_1::_sa_handler"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sa_sigaction) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction__bindgen_ty_1),
-            "::",
-            stringify!(_sa_sigaction)
-        )
+        "Offset of field: __kernel_sigaction__bindgen_ty_1::_sa_sigaction"
     );
 }
 #[test]
@@ -4194,52 +3865,32 @@ fn bindgen_test_layout___kernel_sigaction() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_sigaction>(),
         16usize,
-        concat!("Size of: ", stringify!(__kernel_sigaction))
+        "Size of __kernel_sigaction"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_sigaction>(),
         4usize,
-        concat!("Alignment of ", stringify!(__kernel_sigaction))
+        "Alignment of __kernel_sigaction"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._u) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(_u)
-        )
+        "Offset of field: __kernel_sigaction::_u"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(sa_mask)
-        )
+        "Offset of field: __kernel_sigaction::sa_mask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(sa_flags)
-        )
+        "Offset of field: __kernel_sigaction::sa_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(sa_restorer)
-        )
+        "Offset of field: __kernel_sigaction::sa_restorer"
     );
 }
 #[repr(C)]
@@ -4256,42 +3907,27 @@ fn bindgen_test_layout_sigaltstack() {
     assert_eq!(
         ::std::mem::size_of::<sigaltstack>(),
         12usize,
-        concat!("Size of: ", stringify!(sigaltstack))
+        "Size of sigaltstack"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaltstack>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigaltstack))
+        "Alignment of sigaltstack"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss_sp) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaltstack),
-            "::",
-            stringify!(ss_sp)
-        )
+        "Offset of field: sigaltstack::ss_sp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss_flags) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaltstack),
-            "::",
-            stringify!(ss_flags)
-        )
+        "Offset of field: sigaltstack::ss_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss_size) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaltstack),
-            "::",
-            stringify!(ss_size)
-        )
+        "Offset of field: sigaltstack::ss_size"
     );
 }
 pub type stack_t = sigaltstack;
@@ -4305,35 +3941,21 @@ pub union sigval {
 fn bindgen_test_layout_sigval() {
     const UNINIT: ::std::mem::MaybeUninit<sigval> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<sigval>(),
-        4usize,
-        concat!("Size of: ", stringify!(sigval))
-    );
+    assert_eq!(::std::mem::size_of::<sigval>(), 4usize, "Size of sigval");
     assert_eq!(
         ::std::mem::align_of::<sigval>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigval))
+        "Alignment of sigval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sival_int) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigval),
-            "::",
-            stringify!(sival_int)
-        )
+        "Offset of field: sigval::sival_int"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sival_ptr) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigval),
-            "::",
-            stringify!(sival_ptr)
-        )
+        "Offset of field: sigval::sival_ptr"
     );
 }
 pub type sigval_t = sigval;
@@ -4362,32 +3984,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_1>(),
         8usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_1))
+        "Size of __sifields__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_1))
+        "Alignment of __sifields__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_1),
-            "::",
-            stringify!(_pid)
-        )
+        "Offset of field: __sifields__bindgen_ty_1::_pid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_1),
-            "::",
-            stringify!(_uid)
-        )
+        "Offset of field: __sifields__bindgen_ty_1::_uid"
     );
 }
 #[repr(C)]
@@ -4406,52 +4018,32 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_2>(),
         16usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_2))
+        "Size of __sifields__bindgen_ty_2"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_2>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_2))
+        "Alignment of __sifields__bindgen_ty_2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_tid)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._overrun) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_overrun)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_overrun"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_sigval)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_sigval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sys_private) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_sys_private)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_sys_private"
     );
 }
 #[repr(C)]
@@ -4469,42 +4061,27 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_3>(),
         12usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_3))
+        "Size of __sifields__bindgen_ty_3"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_3>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_3))
+        "Alignment of __sifields__bindgen_ty_3"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_3),
-            "::",
-            stringify!(_pid)
-        )
+        "Offset of field: __sifields__bindgen_ty_3::_pid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_3),
-            "::",
-            stringify!(_uid)
-        )
+        "Offset of field: __sifields__bindgen_ty_3::_uid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_3),
-            "::",
-            stringify!(_sigval)
-        )
+        "Offset of field: __sifields__bindgen_ty_3::_sigval"
     );
 }
 #[repr(C)]
@@ -4524,62 +4101,37 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_4>(),
         20usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_4))
+        "Size of __sifields__bindgen_ty_4"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_4>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_4))
+        "Alignment of __sifields__bindgen_ty_4"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_pid)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_pid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_uid)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_uid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._status) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_status)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_status"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._utime) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_utime)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_utime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._stime) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_stime)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_stime"
     );
 }
 #[repr(C)]
@@ -4612,48 +4164,27 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>(),
         12usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._dummy_bnd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_dummy_bnd)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1::_dummy_bnd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._lower) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_lower)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1::_lower"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._upper) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_upper)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1::_upper"
     );
 }
 #[repr(C)]
@@ -4670,38 +4201,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>(),
         8usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2)
-        )
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._dummy_pkey) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2),
-            "::",
-            stringify!(_dummy_pkey)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2::_dummy_pkey"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pkey) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2),
-            "::",
-            stringify!(_pkey)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2::_pkey"
     );
 }
 #[repr(C)]
@@ -4709,6 +4224,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
 pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3 {
     pub _data: ::std::os::raw::c_ulong,
     pub _type: __u32,
+    pub _flags: __u32,
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3() {
@@ -4717,39 +4233,28 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3() {
     let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
-        8usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
-        )
+        12usize,
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._data) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
-            "::",
-            stringify!(_data)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3::_data"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._type) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
-            "::",
-            stringify!(_type)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3::_type"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._flags) as usize - ptr as usize },
+        8usize,
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3::_flags"
     );
 }
 #[test]
@@ -4760,68 +4265,37 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1>(),
         12usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1)
-        )
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._trapno) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_trapno)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_trapno"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr_lsb) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_addr_lsb)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_addr_lsb"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr_bnd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_addr_bnd)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_addr_bnd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr_pkey) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_addr_pkey)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_addr_pkey"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._perf) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_perf)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_perf"
     );
 }
 #[test]
@@ -4832,22 +4306,17 @@ fn bindgen_test_layout___sifields__bindgen_ty_5() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5>(),
         16usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_5))
+        "Size of __sifields__bindgen_ty_5"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_5))
+        "Alignment of __sifields__bindgen_ty_5"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5),
-            "::",
-            stringify!(_addr)
-        )
+        "Offset of field: __sifields__bindgen_ty_5::_addr"
     );
 }
 #[repr(C)]
@@ -4864,32 +4333,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_6() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_6>(),
         8usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_6))
+        "Size of __sifields__bindgen_ty_6"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_6>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_6))
+        "Alignment of __sifields__bindgen_ty_6"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._band) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_6),
-            "::",
-            stringify!(_band)
-        )
+        "Offset of field: __sifields__bindgen_ty_6::_band"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._fd) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_6),
-            "::",
-            stringify!(_fd)
-        )
+        "Offset of field: __sifields__bindgen_ty_6::_fd"
     );
 }
 #[repr(C)]
@@ -4907,42 +4366,27 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_7>(),
         12usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_7))
+        "Size of __sifields__bindgen_ty_7"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_7>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_7))
+        "Alignment of __sifields__bindgen_ty_7"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._call_addr) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_7),
-            "::",
-            stringify!(_call_addr)
-        )
+        "Offset of field: __sifields__bindgen_ty_7::_call_addr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._syscall) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_7),
-            "::",
-            stringify!(_syscall)
-        )
+        "Offset of field: __sifields__bindgen_ty_7::_syscall"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._arch) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_7),
-            "::",
-            stringify!(_arch)
-        )
+        "Offset of field: __sifields__bindgen_ty_7::_arch"
     );
 }
 #[test]
@@ -4952,82 +4396,47 @@ fn bindgen_test_layout___sifields() {
     assert_eq!(
         ::std::mem::size_of::<__sifields>(),
         20usize,
-        concat!("Size of: ", stringify!(__sifields))
+        "Size of __sifields"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields))
+        "Alignment of __sifields"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._kill) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_kill)
-        )
+        "Offset of field: __sifields::_kill"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._timer) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_timer)
-        )
+        "Offset of field: __sifields::_timer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._rt) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_rt)
-        )
+        "Offset of field: __sifields::_rt"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigchld) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigchld)
-        )
+        "Offset of field: __sifields::_sigchld"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigfault) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigfault)
-        )
+        "Offset of field: __sifields::_sigfault"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigpoll) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigpoll)
-        )
+        "Offset of field: __sifields::_sigpoll"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigsys) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigsys)
-        )
+        "Offset of field: __sifields::_sigsys"
     );
 }
 #[repr(C)]
@@ -5057,55 +4466,32 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1__bindgen_ty_1>(),
         32usize,
-        concat!("Size of: ", stringify!(siginfo__bindgen_ty_1__bindgen_ty_1))
+        "Size of siginfo__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<siginfo__bindgen_ty_1__bindgen_ty_1>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Alignment of siginfo__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si_signo) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(si_signo)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::si_signo"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si_errno) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(si_errno)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::si_errno"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si_code) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(si_code)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::si_code"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sifields) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_sifields)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::_sifields"
     );
 }
 #[test]
@@ -5116,22 +4502,17 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1>(),
         128usize,
-        concat!("Size of: ", stringify!(siginfo__bindgen_ty_1))
+        "Size of siginfo__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<siginfo__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(siginfo__bindgen_ty_1))
+        "Alignment of siginfo__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._si_pad) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1),
-            "::",
-            stringify!(_si_pad)
-        )
+        "Offset of field: siginfo__bindgen_ty_1::_si_pad"
     );
 }
 #[test]
@@ -5139,12 +4520,12 @@ fn bindgen_test_layout_siginfo() {
     assert_eq!(
         ::std::mem::size_of::<siginfo>(),
         128usize,
-        concat!("Size of: ", stringify!(siginfo))
+        "Size of siginfo"
     );
     assert_eq!(
         ::std::mem::align_of::<siginfo>(),
         4usize,
-        concat!("Alignment of ", stringify!(siginfo))
+        "Alignment of siginfo"
     );
 }
 pub type siginfo_t = siginfo;
@@ -5177,38 +4558,22 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1__bindgen_ty_1>(),
         8usize,
-        concat!(
-            "Size of: ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Size of sigevent__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigevent__bindgen_ty_1__bindgen_ty_1>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Alignment of sigevent__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._function) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_function)
-        )
+        "Offset of field: sigevent__bindgen_ty_1__bindgen_ty_1::_function"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._attribute) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_attribute)
-        )
+        "Offset of field: sigevent__bindgen_ty_1__bindgen_ty_1::_attribute"
     );
 }
 #[test]
@@ -5219,42 +4584,27 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1>(),
         52usize,
-        concat!("Size of: ", stringify!(sigevent__bindgen_ty_1))
+        "Size of sigevent__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigevent__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigevent__bindgen_ty_1))
+        "Alignment of sigevent__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pad) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1),
-            "::",
-            stringify!(_pad)
-        )
+        "Offset of field: sigevent__bindgen_ty_1::_pad"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1),
-            "::",
-            stringify!(_tid)
-        )
+        "Offset of field: sigevent__bindgen_ty_1::_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigev_thread) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1),
-            "::",
-            stringify!(_sigev_thread)
-        )
+        "Offset of field: sigevent__bindgen_ty_1::_sigev_thread"
     );
 }
 #[test]
@@ -5264,52 +4614,32 @@ fn bindgen_test_layout_sigevent() {
     assert_eq!(
         ::std::mem::size_of::<sigevent>(),
         64usize,
-        concat!("Size of: ", stringify!(sigevent))
+        "Size of sigevent"
     );
     assert_eq!(
         ::std::mem::align_of::<sigevent>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigevent))
+        "Alignment of sigevent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sigev_value) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(sigev_value)
-        )
+        "Offset of field: sigevent::sigev_value"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sigev_signo) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(sigev_signo)
-        )
+        "Offset of field: sigevent::sigev_signo"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sigev_notify) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(sigev_notify)
-        )
+        "Offset of field: sigevent::sigev_notify"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigev_un) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(_sigev_un)
-        )
+        "Offset of field: sigevent::_sigev_un"
     );
 }
 pub type sigevent_t = sigevent;
@@ -5328,22 +4658,17 @@ fn bindgen_test_layout_sigset64_t() {
     assert_eq!(
         ::std::mem::size_of::<sigset64_t>(),
         8usize,
-        concat!("Size of: ", stringify!(sigset64_t))
+        "Size of sigset64_t"
     );
     assert_eq!(
         ::std::mem::align_of::<sigset64_t>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigset64_t))
+        "Alignment of sigset64_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__bits) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigset64_t),
-            "::",
-            stringify!(__bits)
-        )
+        "Offset of field: sigset64_t::__bits"
     );
 }
 #[repr(C)]
@@ -5374,32 +4699,22 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigaction__bindgen_ty_1>(),
         4usize,
-        concat!("Size of: ", stringify!(sigaction__bindgen_ty_1))
+        "Size of sigaction__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigaction__bindgen_ty_1))
+        "Alignment of sigaction__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction__bindgen_ty_1),
-            "::",
-            stringify!(sa_handler)
-        )
+        "Offset of field: sigaction__bindgen_ty_1::sa_handler"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction__bindgen_ty_1),
-            "::",
-            stringify!(sa_sigaction)
-        )
+        "Offset of field: sigaction__bindgen_ty_1::sa_sigaction"
     );
 }
 #[test]
@@ -5409,42 +4724,27 @@ fn bindgen_test_layout_sigaction() {
     assert_eq!(
         ::std::mem::size_of::<sigaction>(),
         16usize,
-        concat!("Size of: ", stringify!(sigaction))
+        "Size of sigaction"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigaction))
+        "Alignment of sigaction"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction),
-            "::",
-            stringify!(sa_mask)
-        )
+        "Offset of field: sigaction::sa_mask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction),
-            "::",
-            stringify!(sa_flags)
-        )
+        "Offset of field: sigaction::sa_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction),
-            "::",
-            stringify!(sa_restorer)
-        )
+        "Offset of field: sigaction::sa_restorer"
     );
 }
 #[repr(C)]
@@ -5475,32 +4775,22 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigaction64__bindgen_ty_1>(),
         4usize,
-        concat!("Size of: ", stringify!(sigaction64__bindgen_ty_1))
+        "Size of sigaction64__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction64__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigaction64__bindgen_ty_1))
+        "Alignment of sigaction64__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64__bindgen_ty_1),
-            "::",
-            stringify!(sa_handler)
-        )
+        "Offset of field: sigaction64__bindgen_ty_1::sa_handler"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64__bindgen_ty_1),
-            "::",
-            stringify!(sa_sigaction)
-        )
+        "Offset of field: sigaction64__bindgen_ty_1::sa_sigaction"
     );
 }
 #[test]
@@ -5510,42 +4800,27 @@ fn bindgen_test_layout_sigaction64() {
     assert_eq!(
         ::std::mem::size_of::<sigaction64>(),
         20usize,
-        concat!("Size of: ", stringify!(sigaction64))
+        "Size of sigaction64"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction64>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigaction64))
+        "Alignment of sigaction64"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64),
-            "::",
-            stringify!(sa_flags)
-        )
+        "Offset of field: sigaction64::sa_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64),
-            "::",
-            stringify!(sa_restorer)
-        )
+        "Offset of field: sigaction64::sa_restorer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64),
-            "::",
-            stringify!(sa_mask)
-        )
+        "Offset of field: sigaction64::sa_mask"
     );
 }
 #[repr(C)]
@@ -5561,32 +4836,22 @@ fn bindgen_test_layout_timespec() {
     assert_eq!(
         ::std::mem::size_of::<timespec>(),
         8usize,
-        concat!("Size of: ", stringify!(timespec))
+        "Size of timespec"
     );
     assert_eq!(
         ::std::mem::align_of::<timespec>(),
         4usize,
-        concat!("Alignment of ", stringify!(timespec))
+        "Alignment of timespec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timespec),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: timespec::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timespec),
-            "::",
-            stringify!(tv_nsec)
-        )
+        "Offset of field: timespec::tv_nsec"
     );
 }
 #[repr(C)]
@@ -5599,7 +4864,6 @@ pub struct user_fpregs {
     pub init_flag: ::std::os::raw::c_uint,
 }
 #[repr(C)]
-#[repr(align(4))]
 #[derive(Debug, Copy, Clone)]
 pub struct user_fpregs_fp_reg {
     pub _bitfield_align_1: [u32; 0],
@@ -5610,12 +4874,12 @@ fn bindgen_test_layout_user_fpregs_fp_reg() {
     assert_eq!(
         ::std::mem::size_of::<user_fpregs_fp_reg>(),
         12usize,
-        concat!("Size of: ", stringify!(user_fpregs_fp_reg))
+        "Size of user_fpregs_fp_reg"
     );
     assert_eq!(
         ::std::mem::align_of::<user_fpregs_fp_reg>(),
         4usize,
-        concat!("Alignment of ", stringify!(user_fpregs_fp_reg))
+        "Alignment of user_fpregs_fp_reg"
     );
 }
 impl user_fpregs_fp_reg {
@@ -5631,6 +4895,28 @@ impl user_fpregs_fp_reg {
         }
     }
     #[inline]
+    pub unsafe fn sign1_raw(this: *const Self) -> ::std::os::raw::c_uint {
+        unsafe {
+            ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 12usize]>>::raw_get(
+                ::std::ptr::addr_of!((*this)._bitfield_1),
+                0usize,
+                1u8,
+            ) as u32)
+        }
+    }
+    #[inline]
+    pub unsafe fn set_sign1_raw(this: *mut Self, val: ::std::os::raw::c_uint) {
+        unsafe {
+            let val: u32 = ::std::mem::transmute(val);
+            <__BindgenBitfieldUnit<[u8; 12usize]>>::raw_set(
+                ::std::ptr::addr_of_mut!((*this)._bitfield_1),
+                0usize,
+                1u8,
+                val as u64,
+            )
+        }
+    }
+    #[inline]
     pub fn unused(&self) -> ::std::os::raw::c_uint {
         unsafe { ::std::mem::transmute(self._bitfield_1.get(1usize, 15u8) as u32) }
     }
@@ -5642,6 +4928,28 @@ impl user_fpregs_fp_reg {
         }
     }
     #[inline]
+    pub unsafe fn unused_raw(this: *const Self) -> ::std::os::raw::c_uint {
+        unsafe {
+            ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 12usize]>>::raw_get(
+                ::std::ptr::addr_of!((*this)._bitfield_1),
+                1usize,
+                15u8,
+            ) as u32)
+        }
+    }
+    #[inline]
+    pub unsafe fn set_unused_raw(this: *mut Self, val: ::std::os::raw::c_uint) {
+        unsafe {
+            let val: u32 = ::std::mem::transmute(val);
+            <__BindgenBitfieldUnit<[u8; 12usize]>>::raw_set(
+                ::std::ptr::addr_of_mut!((*this)._bitfield_1),
+                1usize,
+                15u8,
+                val as u64,
+            )
+        }
+    }
+    #[inline]
     pub fn sign2(&self) -> ::std::os::raw::c_uint {
         unsafe { ::std::mem::transmute(self._bitfield_1.get(16usize, 1u8) as u32) }
     }
@@ -5653,6 +4961,28 @@ impl user_fpregs_fp_reg {
         }
     }
     #[inline]
+    pub unsafe fn sign2_raw(this: *const Self) -> ::std::os::raw::c_uint {
+        unsafe {
+            ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 12usize]>>::raw_get(
+                ::std::ptr::addr_of!((*this)._bitfield_1),
+                16usize,
+                1u8,
+            ) as u32)
+        }
+    }
+    #[inline]
+    pub unsafe fn set_sign2_raw(this: *mut Self, val: ::std::os::raw::c_uint) {
+        unsafe {
+            let val: u32 = ::std::mem::transmute(val);
+            <__BindgenBitfieldUnit<[u8; 12usize]>>::raw_set(
+                ::std::ptr::addr_of_mut!((*this)._bitfield_1),
+                16usize,
+                1u8,
+                val as u64,
+            )
+        }
+    }
+    #[inline]
     pub fn exponent(&self) -> ::std::os::raw::c_uint {
         unsafe { ::std::mem::transmute(self._bitfield_1.get(17usize, 14u8) as u32) }
     }
@@ -5664,6 +4994,28 @@ impl user_fpregs_fp_reg {
         }
     }
     #[inline]
+    pub unsafe fn exponent_raw(this: *const Self) -> ::std::os::raw::c_uint {
+        unsafe {
+            ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 12usize]>>::raw_get(
+                ::std::ptr::addr_of!((*this)._bitfield_1),
+                17usize,
+                14u8,
+            ) as u32)
+        }
+    }
+    #[inline]
+    pub unsafe fn set_exponent_raw(this: *mut Self, val: ::std::os::raw::c_uint) {
+        unsafe {
+            let val: u32 = ::std::mem::transmute(val);
+            <__BindgenBitfieldUnit<[u8; 12usize]>>::raw_set(
+                ::std::ptr::addr_of_mut!((*this)._bitfield_1),
+                17usize,
+                14u8,
+                val as u64,
+            )
+        }
+    }
+    #[inline]
     pub fn j(&self) -> ::std::os::raw::c_uint {
         unsafe { ::std::mem::transmute(self._bitfield_1.get(31usize, 1u8) as u32) }
     }
@@ -5675,6 +5027,28 @@ impl user_fpregs_fp_reg {
         }
     }
     #[inline]
+    pub unsafe fn j_raw(this: *const Self) -> ::std::os::raw::c_uint {
+        unsafe {
+            ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 12usize]>>::raw_get(
+                ::std::ptr::addr_of!((*this)._bitfield_1),
+                31usize,
+                1u8,
+            ) as u32)
+        }
+    }
+    #[inline]
+    pub unsafe fn set_j_raw(this: *mut Self, val: ::std::os::raw::c_uint) {
+        unsafe {
+            let val: u32 = ::std::mem::transmute(val);
+            <__BindgenBitfieldUnit<[u8; 12usize]>>::raw_set(
+                ::std::ptr::addr_of_mut!((*this)._bitfield_1),
+                31usize,
+                1u8,
+                val as u64,
+            )
+        }
+    }
+    #[inline]
     pub fn mantissa1(&self) -> ::std::os::raw::c_uint {
         unsafe { ::std::mem::transmute(self._bitfield_1.get(32usize, 31u8) as u32) }
     }
@@ -5686,6 +5060,28 @@ impl user_fpregs_fp_reg {
         }
     }
     #[inline]
+    pub unsafe fn mantissa1_raw(this: *const Self) -> ::std::os::raw::c_uint {
+        unsafe {
+            ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 12usize]>>::raw_get(
+                ::std::ptr::addr_of!((*this)._bitfield_1),
+                32usize,
+                31u8,
+            ) as u32)
+        }
+    }
+    #[inline]
+    pub unsafe fn set_mantissa1_raw(this: *mut Self, val: ::std::os::raw::c_uint) {
+        unsafe {
+            let val: u32 = ::std::mem::transmute(val);
+            <__BindgenBitfieldUnit<[u8; 12usize]>>::raw_set(
+                ::std::ptr::addr_of_mut!((*this)._bitfield_1),
+                32usize,
+                31u8,
+                val as u64,
+            )
+        }
+    }
+    #[inline]
     pub fn mantissa0(&self) -> ::std::os::raw::c_uint {
         unsafe { ::std::mem::transmute(self._bitfield_1.get(64usize, 32u8) as u32) }
     }
@@ -5697,6 +5093,28 @@ impl user_fpregs_fp_reg {
         }
     }
     #[inline]
+    pub unsafe fn mantissa0_raw(this: *const Self) -> ::std::os::raw::c_uint {
+        unsafe {
+            ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 12usize]>>::raw_get(
+                ::std::ptr::addr_of!((*this)._bitfield_1),
+                64usize,
+                32u8,
+            ) as u32)
+        }
+    }
+    #[inline]
+    pub unsafe fn set_mantissa0_raw(this: *mut Self, val: ::std::os::raw::c_uint) {
+        unsafe {
+            let val: u32 = ::std::mem::transmute(val);
+            <__BindgenBitfieldUnit<[u8; 12usize]>>::raw_set(
+                ::std::ptr::addr_of_mut!((*this)._bitfield_1),
+                64usize,
+                32u8,
+                val as u64,
+            )
+        }
+    }
+    #[inline]
     pub fn new_bitfield_1(
         sign1: ::std::os::raw::c_uint,
         unused: ::std::os::raw::c_uint,
@@ -5745,42 +5163,27 @@ fn bindgen_test_layout_user_fpregs() {
     assert_eq!(
         ::std::mem::size_of::<user_fpregs>(),
         116usize,
-        concat!("Size of: ", stringify!(user_fpregs))
+        "Size of user_fpregs"
     );
     assert_eq!(
         ::std::mem::align_of::<user_fpregs>(),
         4usize,
-        concat!("Alignment of ", stringify!(user_fpregs))
+        "Alignment of user_fpregs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpregs) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs),
-            "::",
-            stringify!(fpregs)
-        )
+        "Offset of field: user_fpregs::fpregs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ftype) as usize - ptr as usize },
         104usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs),
-            "::",
-            stringify!(ftype)
-        )
+        "Offset of field: user_fpregs::ftype"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).init_flag) as usize - ptr as usize },
         112usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs),
-            "::",
-            stringify!(init_flag)
-        )
+        "Offset of field: user_fpregs::init_flag"
     );
 }
 impl user_fpregs {
@@ -5796,6 +5199,28 @@ impl user_fpregs {
         }
     }
     #[inline]
+    pub unsafe fn fpsr_raw(this: *const Self) -> ::std::os::raw::c_uint {
+        unsafe {
+            ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_get(
+                ::std::ptr::addr_of!((*this)._bitfield_1),
+                0usize,
+                32u8,
+            ) as u32)
+        }
+    }
+    #[inline]
+    pub unsafe fn set_fpsr_raw(this: *mut Self, val: ::std::os::raw::c_uint) {
+        unsafe {
+            let val: u32 = ::std::mem::transmute(val);
+            <__BindgenBitfieldUnit<[u8; 8usize]>>::raw_set(
+                ::std::ptr::addr_of_mut!((*this)._bitfield_1),
+                0usize,
+                32u8,
+                val as u64,
+            )
+        }
+    }
+    #[inline]
     pub fn fpcr(&self) -> ::std::os::raw::c_uint {
         unsafe { ::std::mem::transmute(self._bitfield_1.get(32usize, 32u8) as u32) }
     }
@@ -5807,6 +5232,28 @@ impl user_fpregs {
         }
     }
     #[inline]
+    pub unsafe fn fpcr_raw(this: *const Self) -> ::std::os::raw::c_uint {
+        unsafe {
+            ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_get(
+                ::std::ptr::addr_of!((*this)._bitfield_1),
+                32usize,
+                32u8,
+            ) as u32)
+        }
+    }
+    #[inline]
+    pub unsafe fn set_fpcr_raw(this: *mut Self, val: ::std::os::raw::c_uint) {
+        unsafe {
+            let val: u32 = ::std::mem::transmute(val);
+            <__BindgenBitfieldUnit<[u8; 8usize]>>::raw_set(
+                ::std::ptr::addr_of_mut!((*this)._bitfield_1),
+                32usize,
+                32u8,
+                val as u64,
+            )
+        }
+    }
+    #[inline]
     pub fn new_bitfield_1(
         fpsr: ::std::os::raw::c_uint,
         fpcr: ::std::os::raw::c_uint,
@@ -5835,22 +5282,17 @@ fn bindgen_test_layout_user_regs() {
     assert_eq!(
         ::std::mem::size_of::<user_regs>(),
         72usize,
-        concat!("Size of: ", stringify!(user_regs))
+        "Size of user_regs"
     );
     assert_eq!(
         ::std::mem::align_of::<user_regs>(),
         4usize,
-        concat!("Alignment of ", stringify!(user_regs))
+        "Alignment of user_regs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uregs) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs),
-            "::",
-            stringify!(uregs)
-        )
+        "Offset of field: user_regs::uregs"
     );
 }
 #[repr(C)]
@@ -5866,32 +5308,22 @@ fn bindgen_test_layout_user_vfp() {
     assert_eq!(
         ::std::mem::size_of::<user_vfp>(),
         264usize,
-        concat!("Size of: ", stringify!(user_vfp))
+        "Size of user_vfp"
     );
     assert_eq!(
         ::std::mem::align_of::<user_vfp>(),
         8usize,
-        concat!("Alignment of ", stringify!(user_vfp))
+        "Alignment of user_vfp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpregs) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_vfp),
-            "::",
-            stringify!(fpregs)
-        )
+        "Offset of field: user_vfp::fpregs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpscr) as usize - ptr as usize },
         256usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_vfp),
-            "::",
-            stringify!(fpscr)
-        )
+        "Offset of field: user_vfp::fpscr"
     );
 }
 #[repr(C)]
@@ -5908,42 +5340,27 @@ fn bindgen_test_layout_user_vfp_exc() {
     assert_eq!(
         ::std::mem::size_of::<user_vfp_exc>(),
         12usize,
-        concat!("Size of: ", stringify!(user_vfp_exc))
+        "Size of user_vfp_exc"
     );
     assert_eq!(
         ::std::mem::align_of::<user_vfp_exc>(),
         4usize,
-        concat!("Alignment of ", stringify!(user_vfp_exc))
+        "Alignment of user_vfp_exc"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpexc) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_vfp_exc),
-            "::",
-            stringify!(fpexc)
-        )
+        "Offset of field: user_vfp_exc::fpexc"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpinst) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_vfp_exc),
-            "::",
-            stringify!(fpinst)
-        )
+        "Offset of field: user_vfp_exc::fpinst"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpinst2) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_vfp_exc),
-            "::",
-            stringify!(fpinst2)
-        )
+        "Offset of field: user_vfp_exc::fpinst2"
     );
 }
 #[repr(C)]
@@ -5969,165 +5386,82 @@ pub struct user {
 fn bindgen_test_layout_user() {
     const UNINIT: ::std::mem::MaybeUninit<user> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<user>(),
-        296usize,
-        concat!("Size of: ", stringify!(user))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<user>(),
-        4usize,
-        concat!("Alignment of ", stringify!(user))
-    );
+    assert_eq!(::std::mem::size_of::<user>(), 296usize, "Size of user");
+    assert_eq!(::std::mem::align_of::<user>(), 4usize, "Alignment of user");
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).regs) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(regs)
-        )
+        "Offset of field: user::regs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_fpvalid) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_fpvalid)
-        )
+        "Offset of field: user::u_fpvalid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_tsize) as usize - ptr as usize },
         76usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_tsize)
-        )
+        "Offset of field: user::u_tsize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_dsize) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_dsize)
-        )
+        "Offset of field: user::u_dsize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_ssize) as usize - ptr as usize },
         84usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_ssize)
-        )
+        "Offset of field: user::u_ssize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).start_code) as usize - ptr as usize },
         88usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(start_code)
-        )
+        "Offset of field: user::start_code"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).start_stack) as usize - ptr as usize },
         92usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(start_stack)
-        )
+        "Offset of field: user::start_stack"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).signal) as usize - ptr as usize },
         96usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(signal)
-        )
+        "Offset of field: user::signal"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved) as usize - ptr as usize },
         100usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(reserved)
-        )
+        "Offset of field: user::reserved"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_ar0) as usize - ptr as usize },
         104usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_ar0)
-        )
+        "Offset of field: user::u_ar0"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).magic) as usize - ptr as usize },
         108usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(magic)
-        )
+        "Offset of field: user::magic"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_comm) as usize - ptr as usize },
         112usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_comm)
-        )
+        "Offset of field: user::u_comm"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_debugreg) as usize - ptr as usize },
         144usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_debugreg)
-        )
+        "Offset of field: user::u_debugreg"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_fp) as usize - ptr as usize },
         176usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_fp)
-        )
+        "Offset of field: user::u_fp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_fp0) as usize - ptr as usize },
         292usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_fp0)
-        )
+        "Offset of field: user::u_fp0"
     );
 }
 pub const REG_R0: _bindgen_ty_22 = 0;
@@ -6183,38 +5517,22 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<ucontext__bindgen_ty_1__bindgen_ty_1>(),
         8usize,
-        concat!(
-            "Size of: ",
-            stringify!(ucontext__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Size of ucontext__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<ucontext__bindgen_ty_1__bindgen_ty_1>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(ucontext__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Alignment of ucontext__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(uc_sigmask)
-        )
+        "Offset of field: ucontext__bindgen_ty_1__bindgen_ty_1::uc_sigmask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__padding_rt_sigset) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(__padding_rt_sigset)
-        )
+        "Offset of field: ucontext__bindgen_ty_1__bindgen_ty_1::__padding_rt_sigset"
     );
 }
 #[test]
@@ -6225,22 +5543,17 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<ucontext__bindgen_ty_1>(),
         8usize,
-        concat!("Size of: ", stringify!(ucontext__bindgen_ty_1))
+        "Size of ucontext__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<ucontext__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(ucontext__bindgen_ty_1))
+        "Alignment of ucontext__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask64) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext__bindgen_ty_1),
-            "::",
-            stringify!(uc_sigmask64)
-        )
+        "Offset of field: ucontext__bindgen_ty_1::uc_sigmask64"
     );
 }
 #[test]
@@ -6250,72 +5563,42 @@ fn bindgen_test_layout_ucontext() {
     assert_eq!(
         ::std::mem::size_of::<ucontext>(),
         744usize,
-        concat!("Size of: ", stringify!(ucontext))
+        "Size of ucontext"
     );
     assert_eq!(
         ::std::mem::align_of::<ucontext>(),
         8usize,
-        concat!("Alignment of ", stringify!(ucontext))
+        "Alignment of ucontext"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_flags) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_flags)
-        )
+        "Offset of field: ucontext::uc_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_link) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_link)
-        )
+        "Offset of field: ucontext::uc_link"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_stack) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_stack)
-        )
+        "Offset of field: ucontext::uc_stack"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_mcontext) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_mcontext)
-        )
+        "Offset of field: ucontext::uc_mcontext"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__padding) as usize - ptr as usize },
         112usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(__padding)
-        )
+        "Offset of field: ucontext::__padding"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_regspace) as usize - ptr as usize },
         232usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_regspace)
-        )
+        "Offset of field: ucontext::uc_regspace"
     );
 }
 pub type ucontext_t = ucontext;
@@ -6527,32 +5810,22 @@ fn bindgen_test_layout___kernel_timespec() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_timespec>(),
         16usize,
-        concat!("Size of: ", stringify!(__kernel_timespec))
+        "Size of __kernel_timespec"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_timespec>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_timespec))
+        "Alignment of __kernel_timespec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_timespec),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: __kernel_timespec::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_timespec),
-            "::",
-            stringify!(tv_nsec)
-        )
+        "Offset of field: __kernel_timespec::tv_nsec"
     );
 }
 #[repr(C)]
@@ -6568,32 +5841,22 @@ fn bindgen_test_layout___kernel_itimerspec() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_itimerspec>(),
         32usize,
-        concat!("Size of: ", stringify!(__kernel_itimerspec))
+        "Size of __kernel_itimerspec"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_itimerspec>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_itimerspec))
+        "Alignment of __kernel_itimerspec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_itimerspec),
-            "::",
-            stringify!(it_interval)
-        )
+        "Offset of field: __kernel_itimerspec::it_interval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_itimerspec),
-            "::",
-            stringify!(it_value)
-        )
+        "Offset of field: __kernel_itimerspec::it_value"
     );
 }
 #[repr(C)]
@@ -6610,32 +5873,22 @@ fn bindgen_test_layout___kernel_old_timespec() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_old_timespec>(),
         8usize,
-        concat!("Size of: ", stringify!(__kernel_old_timespec))
+        "Size of __kernel_old_timespec"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_old_timespec>(),
         4usize,
-        concat!("Alignment of ", stringify!(__kernel_old_timespec))
+        "Alignment of __kernel_old_timespec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_old_timespec),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: __kernel_old_timespec::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_old_timespec),
-            "::",
-            stringify!(tv_nsec)
-        )
+        "Offset of field: __kernel_old_timespec::tv_nsec"
     );
 }
 #[repr(C)]
@@ -6652,32 +5905,22 @@ fn bindgen_test_layout___kernel_sock_timeval() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_sock_timeval>(),
         16usize,
-        concat!("Size of: ", stringify!(__kernel_sock_timeval))
+        "Size of __kernel_sock_timeval"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_sock_timeval>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_sock_timeval))
+        "Alignment of __kernel_sock_timeval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sock_timeval),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: __kernel_sock_timeval::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sock_timeval),
-            "::",
-            stringify!(tv_usec)
-        )
+        "Offset of field: __kernel_sock_timeval::tv_usec"
     );
 }
 #[repr(C)]
@@ -6690,35 +5933,21 @@ pub struct timeval {
 fn bindgen_test_layout_timeval() {
     const UNINIT: ::std::mem::MaybeUninit<timeval> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<timeval>(),
-        8usize,
-        concat!("Size of: ", stringify!(timeval))
-    );
+    assert_eq!(::std::mem::size_of::<timeval>(), 8usize, "Size of timeval");
     assert_eq!(
         ::std::mem::align_of::<timeval>(),
         4usize,
-        concat!("Alignment of ", stringify!(timeval))
+        "Alignment of timeval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timeval),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: timeval::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timeval),
-            "::",
-            stringify!(tv_usec)
-        )
+        "Offset of field: timeval::tv_usec"
     );
 }
 #[repr(C)]
@@ -6734,32 +5963,22 @@ fn bindgen_test_layout_itimerspec() {
     assert_eq!(
         ::std::mem::size_of::<itimerspec>(),
         16usize,
-        concat!("Size of: ", stringify!(itimerspec))
+        "Size of itimerspec"
     );
     assert_eq!(
         ::std::mem::align_of::<itimerspec>(),
         4usize,
-        concat!("Alignment of ", stringify!(itimerspec))
+        "Alignment of itimerspec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerspec),
-            "::",
-            stringify!(it_interval)
-        )
+        "Offset of field: itimerspec::it_interval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerspec),
-            "::",
-            stringify!(it_value)
-        )
+        "Offset of field: itimerspec::it_value"
     );
 }
 #[repr(C)]
@@ -6775,32 +5994,22 @@ fn bindgen_test_layout_itimerval() {
     assert_eq!(
         ::std::mem::size_of::<itimerval>(),
         16usize,
-        concat!("Size of: ", stringify!(itimerval))
+        "Size of itimerval"
     );
     assert_eq!(
         ::std::mem::align_of::<itimerval>(),
         4usize,
-        concat!("Alignment of ", stringify!(itimerval))
+        "Alignment of itimerval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerval),
-            "::",
-            stringify!(it_interval)
-        )
+        "Offset of field: itimerval::it_interval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerval),
-            "::",
-            stringify!(it_value)
-        )
+        "Offset of field: itimerval::it_value"
     );
 }
 #[repr(C)]
@@ -6816,32 +6025,22 @@ fn bindgen_test_layout_timezone() {
     assert_eq!(
         ::std::mem::size_of::<timezone>(),
         8usize,
-        concat!("Size of: ", stringify!(timezone))
+        "Size of timezone"
     );
     assert_eq!(
         ::std::mem::align_of::<timezone>(),
         4usize,
-        concat!("Alignment of ", stringify!(timezone))
+        "Alignment of timezone"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tz_minuteswest) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_minuteswest)
-        )
+        "Offset of field: timezone::tz_minuteswest"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tz_dsttime) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_dsttime)
-        )
+        "Offset of field: timezone::tz_dsttime"
     );
 }
 pub type fd_mask = ::std::os::raw::c_ulong;
@@ -6854,25 +6053,16 @@ pub struct fd_set {
 fn bindgen_test_layout_fd_set() {
     const UNINIT: ::std::mem::MaybeUninit<fd_set> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<fd_set>(),
-        128usize,
-        concat!("Size of: ", stringify!(fd_set))
-    );
+    assert_eq!(::std::mem::size_of::<fd_set>(), 128usize, "Size of fd_set");
     assert_eq!(
         ::std::mem::align_of::<fd_set>(),
         4usize,
-        concat!("Alignment of ", stringify!(fd_set))
+        "Alignment of fd_set"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(fd_set),
-            "::",
-            stringify!(fds_bits)
-        )
+        "Offset of field: fd_set::fds_bits"
     );
 }
 extern "C" {
@@ -6976,125 +6166,62 @@ pub struct tm {
 fn bindgen_test_layout_tm() {
     const UNINIT: ::std::mem::MaybeUninit<tm> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<tm>(),
-        44usize,
-        concat!("Size of: ", stringify!(tm))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<tm>(),
-        4usize,
-        concat!("Alignment of ", stringify!(tm))
-    );
+    assert_eq!(::std::mem::size_of::<tm>(), 44usize, "Size of tm");
+    assert_eq!(::std::mem::align_of::<tm>(), 4usize, "Alignment of tm");
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_sec)
-        )
+        "Offset of field: tm::tm_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_min) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_min)
-        )
+        "Offset of field: tm::tm_min"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_hour) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_hour)
-        )
+        "Offset of field: tm::tm_hour"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_mday) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_mday)
-        )
+        "Offset of field: tm::tm_mday"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_mon) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_mon)
-        )
+        "Offset of field: tm::tm_mon"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_year) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_year)
-        )
+        "Offset of field: tm::tm_year"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_wday) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_wday)
-        )
+        "Offset of field: tm::tm_wday"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_yday) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_yday)
-        )
+        "Offset of field: tm::tm_yday"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_isdst) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_isdst)
-        )
+        "Offset of field: tm::tm_isdst"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_gmtoff) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_gmtoff)
-        )
+        "Offset of field: tm::tm_gmtoff"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_zone) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_zone)
-        )
+        "Offset of field: tm::tm_zone"
     );
 }
 extern "C" {
@@ -7127,12 +6254,18 @@ extern "C" {
 extern "C" {
     pub fn localtime_r(__t: *const time_t, __tm: *mut tm) -> *mut tm;
 }
+extern "C" {
+    pub fn timelocal(__tm: *mut tm) -> time_t;
+}
 extern "C" {
     pub fn gmtime(__t: *const time_t) -> *mut tm;
 }
 extern "C" {
     pub fn gmtime_r(__t: *const time_t, __tm: *mut tm) -> *mut tm;
 }
+extern "C" {
+    pub fn timegm(__tm: *mut tm) -> time_t;
+}
 extern "C" {
     pub fn strptime(
         __s: *const ::std::os::raw::c_char,
@@ -7219,19 +6352,19 @@ extern "C" {
     ) -> ::std::os::raw::c_int;
 }
 extern "C" {
-    pub fn timer_gettime(__timer: timer_t, __ts: *mut itimerspec) -> ::std::os::raw::c_int;
+    pub fn timer_gettime(_timer: timer_t, __ts: *mut itimerspec) -> ::std::os::raw::c_int;
 }
 extern "C" {
     pub fn timer_getoverrun(__timer: timer_t) -> ::std::os::raw::c_int;
 }
 extern "C" {
-    pub fn timelocal(__tm: *mut tm) -> time_t;
-}
-extern "C" {
-    pub fn timegm(__tm: *mut tm) -> time_t;
+    pub fn timespec_get(
+        __ts: *mut timespec,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_int;
 }
 extern "C" {
-    pub fn timespec_get(
+    pub fn timespec_getres(
         __ts: *mut timespec,
         __base: ::std::os::raw::c_int,
     ) -> ::std::os::raw::c_int;
@@ -7282,122 +6415,67 @@ fn bindgen_test_layout_clone_args() {
     assert_eq!(
         ::std::mem::size_of::<clone_args>(),
         88usize,
-        concat!("Size of: ", stringify!(clone_args))
+        "Size of clone_args"
     );
     assert_eq!(
         ::std::mem::align_of::<clone_args>(),
         8usize,
-        concat!("Alignment of ", stringify!(clone_args))
+        "Alignment of clone_args"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: clone_args::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pidfd) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(pidfd)
-        )
+        "Offset of field: clone_args::pidfd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).child_tid) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(child_tid)
-        )
+        "Offset of field: clone_args::child_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).parent_tid) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(parent_tid)
-        )
+        "Offset of field: clone_args::parent_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).exit_signal) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(exit_signal)
-        )
+        "Offset of field: clone_args::exit_signal"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stack) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(stack)
-        )
+        "Offset of field: clone_args::stack"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stack_size) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(stack_size)
-        )
+        "Offset of field: clone_args::stack_size"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tls) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(tls)
-        )
+        "Offset of field: clone_args::tls"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).set_tid) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(set_tid)
-        )
+        "Offset of field: clone_args::set_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).set_tid_size) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(set_tid_size)
-        )
+        "Offset of field: clone_args::set_tid_size"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cgroup) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(cgroup)
-        )
+        "Offset of field: clone_args::cgroup"
     );
 }
 #[repr(C)]
@@ -7412,22 +6490,17 @@ fn bindgen_test_layout_sched_param() {
     assert_eq!(
         ::std::mem::size_of::<sched_param>(),
         4usize,
-        concat!("Size of: ", stringify!(sched_param))
+        "Size of sched_param"
     );
     assert_eq!(
         ::std::mem::align_of::<sched_param>(),
         4usize,
-        concat!("Alignment of ", stringify!(sched_param))
+        "Alignment of sched_param"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sched_priority) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sched_param),
-            "::",
-            stringify!(sched_priority)
-        )
+        "Offset of field: sched_param::sched_priority"
     );
 }
 extern "C" {
@@ -7468,13 +6541,12 @@ pub type _bindgen_ty_23 = ::std::os::raw::c_uint;
 pub const PTHREAD_RWLOCK_PREFER_READER_NP: _bindgen_ty_24 = 0;
 pub const PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP: _bindgen_ty_24 = 1;
 pub type _bindgen_ty_24 = ::std::os::raw::c_uint;
-pub type __pthread_cleanup_func_t =
-    ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct __pthread_cleanup_t {
     pub __cleanup_prev: *mut __pthread_cleanup_t,
-    pub __cleanup_routine: __pthread_cleanup_func_t,
+    pub __cleanup_routine:
+        ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>,
     pub __cleanup_arg: *mut ::std::os::raw::c_void,
 }
 #[test]
@@ -7484,48 +6556,33 @@ fn bindgen_test_layout___pthread_cleanup_t() {
     assert_eq!(
         ::std::mem::size_of::<__pthread_cleanup_t>(),
         12usize,
-        concat!("Size of: ", stringify!(__pthread_cleanup_t))
+        "Size of __pthread_cleanup_t"
     );
     assert_eq!(
         ::std::mem::align_of::<__pthread_cleanup_t>(),
         4usize,
-        concat!("Alignment of ", stringify!(__pthread_cleanup_t))
+        "Alignment of __pthread_cleanup_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_prev) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__pthread_cleanup_t),
-            "::",
-            stringify!(__cleanup_prev)
-        )
+        "Offset of field: __pthread_cleanup_t::__cleanup_prev"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_routine) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__pthread_cleanup_t),
-            "::",
-            stringify!(__cleanup_routine)
-        )
+        "Offset of field: __pthread_cleanup_t::__cleanup_routine"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_arg) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__pthread_cleanup_t),
-            "::",
-            stringify!(__cleanup_arg)
-        )
+        "Offset of field: __pthread_cleanup_t::__cleanup_arg"
     );
 }
 extern "C" {
     pub fn __pthread_cleanup_push(
         c: *mut __pthread_cleanup_t,
-        arg1: __pthread_cleanup_func_t,
+        arg1: ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>,
         arg2: *mut ::std::os::raw::c_void,
     );
 }
@@ -7552,42 +6609,27 @@ fn bindgen_test_layout_android_poll_source() {
     assert_eq!(
         ::std::mem::size_of::<android_poll_source>(),
         12usize,
-        concat!("Size of: ", stringify!(android_poll_source))
+        "Size of android_poll_source"
     );
     assert_eq!(
         ::std::mem::align_of::<android_poll_source>(),
         4usize,
-        concat!("Alignment of ", stringify!(android_poll_source))
+        "Alignment of android_poll_source"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_poll_source),
-            "::",
-            stringify!(id)
-        )
+        "Offset of field: android_poll_source::id"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).app) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_poll_source),
-            "::",
-            stringify!(app)
-        )
+        "Offset of field: android_poll_source::app"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).process) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_poll_source),
-            "::",
-            stringify!(process)
-        )
+        "Offset of field: android_poll_source::process"
     );
 }
 #[repr(C)]
@@ -7613,72 +6655,42 @@ fn bindgen_test_layout_android_input_buffer() {
     assert_eq!(
         ::std::mem::size_of::<android_input_buffer>(),
         48usize,
-        concat!("Size of: ", stringify!(android_input_buffer))
+        "Size of android_input_buffer"
     );
     assert_eq!(
         ::std::mem::align_of::<android_input_buffer>(),
         8usize,
-        concat!("Alignment of ", stringify!(android_input_buffer))
+        "Alignment of android_input_buffer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEvents) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(motionEvents)
-        )
+        "Offset of field: android_input_buffer::motionEvents"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEventsCount) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(motionEventsCount)
-        )
+        "Offset of field: android_input_buffer::motionEventsCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEventsBufferSize) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(motionEventsBufferSize)
-        )
+        "Offset of field: android_input_buffer::motionEventsBufferSize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEvents) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(keyEvents)
-        )
+        "Offset of field: android_input_buffer::keyEvents"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEventsCount) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(keyEventsCount)
-        )
+        "Offset of field: android_input_buffer::keyEventsCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEventsBufferSize) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(keyEventsBufferSize)
-        )
+        "Offset of field: android_input_buffer::keyEventsBufferSize"
     );
 }
 #[doc = " Function pointer declaration for the filtering of key events.\n A function with this signature should be passed to\n android_app_set_key_event_filter and return false for any events that should\n not be handled by android_native_app_glue. These events will be handled by\n the system instead."]
@@ -7708,6 +6720,10 @@ pub struct android_app {
     pub window: *mut ANativeWindow,
     #[doc = " Current content rectangle of the window; this is the area where the\n window's content should be placed to be seen by the user."]
     pub contentRect: ARect,
+    #[doc = " Whether the software keyboard is visible or not."]
+    pub softwareKeyboardVisible: bool,
+    #[doc = " Last editor action. Valid within APP_CMD_SOFTWARE_KB_VIS_CHANGED handler.\n\n Note: the upstream comment above isn't accurate.\n - `APP_CMD_SOFTWARE_KB_VIS_CHANGED` is associated with `softwareKeyboardVisible`\n   changes, not `editorAction`.\n - `APP_CMD_EDITOR_ACTION` is associated with this state but unlike for\n   `window` state there's no synchonization that blocks the Java main\n   thread, so we can't say that this is only valid within the `APP_CMD_` handler."]
+    pub editorAction: ::std::os::raw::c_int,
     #[doc = " Current state of the app's activity.  May be either APP_CMD_START,\n APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP."]
     pub activityState: ::std::os::raw::c_int,
     #[doc = " This is non-zero when the application's GameActivity is being\n destroyed and waiting for the app thread to complete."]
@@ -7741,313 +6757,173 @@ fn bindgen_test_layout_android_app() {
     let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_app>(),
-        240usize,
-        concat!("Size of: ", stringify!(android_app))
+        248usize,
+        "Size of android_app"
     );
     assert_eq!(
         ::std::mem::align_of::<android_app>(),
         8usize,
-        concat!("Alignment of ", stringify!(android_app))
+        "Alignment of android_app"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).userData) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(userData)
-        )
+        "Offset of field: android_app::userData"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onAppCmd) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(onAppCmd)
-        )
+        "Offset of field: android_app::onAppCmd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).activity) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(activity)
-        )
+        "Offset of field: android_app::activity"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).config) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(config)
-        )
+        "Offset of field: android_app::config"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).savedState) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(savedState)
-        )
+        "Offset of field: android_app::savedState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).savedStateSize) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(savedStateSize)
-        )
+        "Offset of field: android_app::savedStateSize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).looper) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(looper)
-        )
+        "Offset of field: android_app::looper"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).window) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(window)
-        )
+        "Offset of field: android_app::window"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).contentRect) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(contentRect)
-        )
+        "Offset of field: android_app::contentRect"
     );
     assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).activityState) as usize - ptr as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).softwareKeyboardVisible) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(activityState)
-        )
+        "Offset of field: android_app::softwareKeyboardVisible"
     );
     assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).destroyRequested) as usize - ptr as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).editorAction) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(destroyRequested)
-        )
+        "Offset of field: android_app::editorAction"
     );
     assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).inputBuffers) as usize - ptr as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).activityState) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(inputBuffers)
-        )
+        "Offset of field: android_app::activityState"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).destroyRequested) as usize - ptr as usize },
+        60usize,
+        "Offset of field: android_app::destroyRequested"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).inputBuffers) as usize - ptr as usize },
+        64usize,
+        "Offset of field: android_app::inputBuffers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).currentInputBuffer) as usize - ptr as usize },
-        152usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(currentInputBuffer)
-        )
+        160usize,
+        "Offset of field: android_app::currentInputBuffer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).textInputState) as usize - ptr as usize },
-        156usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(textInputState)
-        )
+        164usize,
+        "Offset of field: android_app::textInputState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).mutex) as usize - ptr as usize },
-        160usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(mutex)
-        )
+        168usize,
+        "Offset of field: android_app::mutex"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cond) as usize - ptr as usize },
-        164usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(cond)
-        )
+        172usize,
+        "Offset of field: android_app::cond"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).msgread) as usize - ptr as usize },
-        168usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(msgread)
-        )
+        176usize,
+        "Offset of field: android_app::msgread"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).msgwrite) as usize - ptr as usize },
-        172usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(msgwrite)
-        )
+        180usize,
+        "Offset of field: android_app::msgwrite"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).thread) as usize - ptr as usize },
-        176usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(thread)
-        )
+        184usize,
+        "Offset of field: android_app::thread"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cmdPollSource) as usize - ptr as usize },
-        180usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(cmdPollSource)
-        )
+        188usize,
+        "Offset of field: android_app::cmdPollSource"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).running) as usize - ptr as usize },
-        192usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(running)
-        )
+        200usize,
+        "Offset of field: android_app::running"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stateSaved) as usize - ptr as usize },
-        196usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(stateSaved)
-        )
+        204usize,
+        "Offset of field: android_app::stateSaved"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).destroyed) as usize - ptr as usize },
-        200usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(destroyed)
-        )
+        208usize,
+        "Offset of field: android_app::destroyed"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).redrawNeeded) as usize - ptr as usize },
-        204usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(redrawNeeded)
-        )
+        212usize,
+        "Offset of field: android_app::redrawNeeded"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pendingWindow) as usize - ptr as usize },
-        208usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(pendingWindow)
-        )
+        216usize,
+        "Offset of field: android_app::pendingWindow"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pendingContentRect) as usize - ptr as usize },
-        212usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(pendingContentRect)
-        )
+        220usize,
+        "Offset of field: android_app::pendingContentRect"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEventFilter) as usize - ptr as usize },
-        228usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(keyEventFilter)
-        )
+        236usize,
+        "Offset of field: android_app::keyEventFilter"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEventFilter) as usize - ptr as usize },
-        232usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(motionEventFilter)
-        )
+        240usize,
+        "Offset of field: android_app::motionEventFilter"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).inputAvailableWakeUp) as usize - ptr as usize },
-        236usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(inputAvailableWakeUp)
-        )
+        244usize,
+        "Offset of field: android_app::inputAvailableWakeUp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).inputSwapPending) as usize - ptr as usize },
-        237usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(inputSwapPending)
-        )
+        245usize,
+        "Offset of field: android_app::inputSwapPending"
     );
 }
 #[doc = " Looper data ID of commands coming from the app's main thread, which\n is returned as an identifier from ALooper_pollOnce().  The data for this\n identifier is a pointer to an android_poll_source structure.\n These can be retrieved and processed with android_app_read_cmd()\n and android_app_exec_cmd()."]
@@ -8057,7 +6933,7 @@ pub const NativeAppGlueLooperId_LOOPER_ID_INPUT: NativeAppGlueLooperId = 2;
 #[doc = " Start of user-defined ALooper identifiers."]
 pub const NativeAppGlueLooperId_LOOPER_ID_USER: NativeAppGlueLooperId = 3;
 #[doc = " Looper ID of commands coming from the app's main thread, an AInputQueue or\n user-defined sources."]
-pub type NativeAppGlueLooperId = ::std::os::raw::c_uint;
+pub type NativeAppGlueLooperId = i8;
 #[doc = " Unused. Reserved for future use when usage of AInputQueue will be\n supported."]
 pub const NativeAppGlueAppCmd_UNUSED_APP_CMD_INPUT_CHANGED: NativeAppGlueAppCmd = 0;
 #[doc = " Command from main thread: a new ANativeWindow is ready for use.  Upon\n receiving this command, android_app->window will contain the new window\n surface."]
@@ -8070,30 +6946,32 @@ pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_RESIZED: NativeAppGlueAppCmd = 3;
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_REDRAW_NEEDED: NativeAppGlueAppCmd = 4;
 #[doc = " Command from main thread: the content area of the window has changed,\n such as from the soft input window being shown or hidden.  You can\n find the new content rect in android_app::contentRect."]
 pub const NativeAppGlueAppCmd_APP_CMD_CONTENT_RECT_CHANGED: NativeAppGlueAppCmd = 5;
+#[doc = " Command from main thread: the software keyboard was shown or hidden."]
+pub const NativeAppGlueAppCmd_APP_CMD_SOFTWARE_KB_VIS_CHANGED: NativeAppGlueAppCmd = 6;
 #[doc = " Command from main thread: the app's activity window has gained\n input focus."]
-pub const NativeAppGlueAppCmd_APP_CMD_GAINED_FOCUS: NativeAppGlueAppCmd = 6;
+pub const NativeAppGlueAppCmd_APP_CMD_GAINED_FOCUS: NativeAppGlueAppCmd = 7;
 #[doc = " Command from main thread: the app's activity window has lost\n input focus."]
-pub const NativeAppGlueAppCmd_APP_CMD_LOST_FOCUS: NativeAppGlueAppCmd = 7;
+pub const NativeAppGlueAppCmd_APP_CMD_LOST_FOCUS: NativeAppGlueAppCmd = 8;
 #[doc = " Command from main thread: the current device configuration has changed."]
-pub const NativeAppGlueAppCmd_APP_CMD_CONFIG_CHANGED: NativeAppGlueAppCmd = 8;
+pub const NativeAppGlueAppCmd_APP_CMD_CONFIG_CHANGED: NativeAppGlueAppCmd = 9;
 #[doc = " Command from main thread: the system is running low on memory.\n Try to reduce your memory use."]
-pub const NativeAppGlueAppCmd_APP_CMD_LOW_MEMORY: NativeAppGlueAppCmd = 9;
+pub const NativeAppGlueAppCmd_APP_CMD_LOW_MEMORY: NativeAppGlueAppCmd = 10;
 #[doc = " Command from main thread: the app's activity has been started."]
-pub const NativeAppGlueAppCmd_APP_CMD_START: NativeAppGlueAppCmd = 10;
+pub const NativeAppGlueAppCmd_APP_CMD_START: NativeAppGlueAppCmd = 11;
 #[doc = " Command from main thread: the app's activity has been resumed."]
-pub const NativeAppGlueAppCmd_APP_CMD_RESUME: NativeAppGlueAppCmd = 11;
+pub const NativeAppGlueAppCmd_APP_CMD_RESUME: NativeAppGlueAppCmd = 12;
 #[doc = " Command from main thread: the app should generate a new saved state\n for itself, to restore from later if needed.  If you have saved state,\n allocate it with malloc and place it in android_app.savedState with\n the size in android_app.savedStateSize.  The will be freed for you\n later."]
-pub const NativeAppGlueAppCmd_APP_CMD_SAVE_STATE: NativeAppGlueAppCmd = 12;
+pub const NativeAppGlueAppCmd_APP_CMD_SAVE_STATE: NativeAppGlueAppCmd = 13;
 #[doc = " Command from main thread: the app's activity has been paused."]
-pub const NativeAppGlueAppCmd_APP_CMD_PAUSE: NativeAppGlueAppCmd = 13;
+pub const NativeAppGlueAppCmd_APP_CMD_PAUSE: NativeAppGlueAppCmd = 14;
 #[doc = " Command from main thread: the app's activity has been stopped."]
-pub const NativeAppGlueAppCmd_APP_CMD_STOP: NativeAppGlueAppCmd = 14;
+pub const NativeAppGlueAppCmd_APP_CMD_STOP: NativeAppGlueAppCmd = 15;
 #[doc = " Command from main thread: the app's activity is being destroyed,\n and waiting for the app thread to clean up and exit before proceeding."]
-pub const NativeAppGlueAppCmd_APP_CMD_DESTROY: NativeAppGlueAppCmd = 15;
+pub const NativeAppGlueAppCmd_APP_CMD_DESTROY: NativeAppGlueAppCmd = 16;
 #[doc = " Command from main thread: the app's insets have changed."]
-pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_INSETS_CHANGED: NativeAppGlueAppCmd = 16;
-#[doc = " Commands passed from the application's main Java thread to the game's thread."]
-pub type NativeAppGlueAppCmd = ::std::os::raw::c_uint;
+pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_INSETS_CHANGED: NativeAppGlueAppCmd = 17;
+#[doc = " Commands passed from the application's main Java thread to the game's thread.\n\n Values from 0 to 127 are reserved for this library; values from -128 to -1\n can be used for custom user's events."]
+pub type NativeAppGlueAppCmd = i8;
 extern "C" {
     #[doc = " Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next\n app command message."]
     pub fn android_app_read_cmd(android_app: *mut android_app) -> i8;
@@ -8138,6 +7016,10 @@ extern "C" {
         filter: android_motion_event_filter,
     );
 }
+extern "C" {
+    #[doc = " You can send your custom events using the function below.\n\n Make sure your custom codes do not overlap with this library's ones.\n\n Values from 0 to 127 are reserved for this library; values from -128 to -1\n can be used for custom user's events."]
+    pub fn android_app_write_cmd(android_app: *mut android_app, cmd: i8);
+}
 extern "C" {
     #[doc = " Determines if a looper wake up was due to new input becoming available"]
     pub fn android_app_input_available_wake_up(app: *mut android_app) -> bool;
diff --git a/android-activity/src/game_activity/ffi_i686.rs b/android-activity/src/game_activity/ffi_i686.rs
index d18082f..42426aa 100644
--- a/android-activity/src/game_activity/ffi_i686.rs
+++ b/android-activity/src/game_activity/ffi_i686.rs
@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.66.1 */
+/* automatically generated by rust-bindgen 0.71.1 */
 
 pub const __BIONIC__: u32 = 1;
 pub const __WORDSIZE: u32 = 32;
@@ -24,11 +24,12 @@ pub const __ANDROID_API_R__: u32 = 30;
 pub const __ANDROID_API_S__: u32 = 31;
 pub const __ANDROID_API_T__: u32 = 33;
 pub const __ANDROID_API_U__: u32 = 34;
+pub const __ANDROID_API_V__: u32 = 35;
 pub const __ANDROID_NDK__: u32 = 1;
-pub const __NDK_MAJOR__: u32 = 25;
-pub const __NDK_MINOR__: u32 = 2;
+pub const __NDK_MAJOR__: u32 = 26;
+pub const __NDK_MINOR__: u32 = 1;
 pub const __NDK_BETA__: u32 = 0;
-pub const __NDK_BUILD__: u32 = 9519653;
+pub const __NDK_BUILD__: u32 = 10909125;
 pub const __NDK_CANARY__: u32 = 0;
 pub const INT8_MIN: i32 = -128;
 pub const INT8_MAX: u32 = 127;
@@ -66,11 +67,10 @@ pub const PTRDIFF_MAX: u32 = 2147483647;
 pub const SIZE_MAX: u32 = 4294967295;
 pub const __BITS_PER_LONG: u32 = 32;
 pub const __FD_SETSIZE: u32 = 1024;
-pub const __GNUC_VA_LIST: u32 = 1;
 pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8;
+pub const __bool_true_false_are_defined: u32 = 1;
 pub const true_: u32 = 1;
 pub const false_: u32 = 0;
-pub const __bool_true_false_are_defined: u32 = 1;
 pub const __PRI_64_prefix: &[u8; 3] = b"ll\0";
 pub const PRId8: &[u8; 2] = b"d\0";
 pub const PRId16: &[u8; 2] = b"d\0";
@@ -94,6 +94,28 @@ pub const PRIiLEAST64: &[u8; 4] = b"lli\0";
 pub const PRIiFAST8: &[u8; 2] = b"i\0";
 pub const PRIiFAST64: &[u8; 4] = b"lli\0";
 pub const PRIiMAX: &[u8; 3] = b"ji\0";
+pub const PRIb8: &[u8; 2] = b"b\0";
+pub const PRIb16: &[u8; 2] = b"b\0";
+pub const PRIb32: &[u8; 2] = b"b\0";
+pub const PRIb64: &[u8; 4] = b"llb\0";
+pub const PRIbLEAST8: &[u8; 2] = b"b\0";
+pub const PRIbLEAST16: &[u8; 2] = b"b\0";
+pub const PRIbLEAST32: &[u8; 2] = b"b\0";
+pub const PRIbLEAST64: &[u8; 4] = b"llb\0";
+pub const PRIbFAST8: &[u8; 2] = b"b\0";
+pub const PRIbFAST64: &[u8; 4] = b"llb\0";
+pub const PRIbMAX: &[u8; 3] = b"jb\0";
+pub const PRIB8: &[u8; 2] = b"B\0";
+pub const PRIB16: &[u8; 2] = b"B\0";
+pub const PRIB32: &[u8; 2] = b"B\0";
+pub const PRIB64: &[u8; 4] = b"llB\0";
+pub const PRIBLEAST8: &[u8; 2] = b"B\0";
+pub const PRIBLEAST16: &[u8; 2] = b"B\0";
+pub const PRIBLEAST32: &[u8; 2] = b"B\0";
+pub const PRIBLEAST64: &[u8; 4] = b"llB\0";
+pub const PRIBFAST8: &[u8; 2] = b"B\0";
+pub const PRIBFAST64: &[u8; 4] = b"llB\0";
+pub const PRIBMAX: &[u8; 3] = b"jB\0";
 pub const PRIo8: &[u8; 2] = b"o\0";
 pub const PRIo16: &[u8; 2] = b"o\0";
 pub const PRIo32: &[u8; 2] = b"o\0";
@@ -160,6 +182,28 @@ pub const SCNiLEAST64: &[u8; 4] = b"lli\0";
 pub const SCNiFAST8: &[u8; 4] = b"hhi\0";
 pub const SCNiFAST64: &[u8; 4] = b"lli\0";
 pub const SCNiMAX: &[u8; 3] = b"ji\0";
+pub const SCNb8: &[u8; 4] = b"hhb\0";
+pub const SCNb16: &[u8; 3] = b"hb\0";
+pub const SCNb32: &[u8; 2] = b"b\0";
+pub const SCNb64: &[u8; 4] = b"llb\0";
+pub const SCNbLEAST8: &[u8; 4] = b"hhb\0";
+pub const SCNbLEAST16: &[u8; 3] = b"hb\0";
+pub const SCNbLEAST32: &[u8; 2] = b"b\0";
+pub const SCNbLEAST64: &[u8; 4] = b"llb\0";
+pub const SCNbFAST8: &[u8; 4] = b"hhb\0";
+pub const SCNbFAST64: &[u8; 4] = b"llb\0";
+pub const SCNbMAX: &[u8; 3] = b"jb\0";
+pub const SCNB8: &[u8; 4] = b"hhB\0";
+pub const SCNB16: &[u8; 3] = b"hB\0";
+pub const SCNB32: &[u8; 2] = b"B\0";
+pub const SCNB64: &[u8; 4] = b"llB\0";
+pub const SCNBLEAST8: &[u8; 4] = b"hhB\0";
+pub const SCNBLEAST16: &[u8; 3] = b"hB\0";
+pub const SCNBLEAST32: &[u8; 2] = b"B\0";
+pub const SCNBLEAST64: &[u8; 4] = b"llB\0";
+pub const SCNBFAST8: &[u8; 4] = b"hhB\0";
+pub const SCNBFAST64: &[u8; 4] = b"llB\0";
+pub const SCNBMAX: &[u8; 3] = b"jB\0";
 pub const SCNo8: &[u8; 4] = b"hho\0";
 pub const SCNo16: &[u8; 3] = b"ho\0";
 pub const SCNo32: &[u8; 2] = b"o\0";
@@ -195,12 +239,12 @@ pub const SCNxFAST64: &[u8; 4] = b"llx\0";
 pub const SCNxMAX: &[u8; 3] = b"jx\0";
 pub const GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT: u32 = 48;
 pub const GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT: u32 = 8;
-pub const GAMETEXTINPUT_MAJOR_VERSION: u32 = 2;
+pub const GAMETEXTINPUT_MAJOR_VERSION: u32 = 4;
 pub const GAMETEXTINPUT_MINOR_VERSION: u32 = 0;
 pub const GAMETEXTINPUT_BUGFIX_VERSION: u32 = 0;
-pub const GAMEACTIVITY_MAJOR_VERSION: u32 = 2;
+pub const GAMEACTIVITY_MAJOR_VERSION: u32 = 4;
 pub const GAMEACTIVITY_MINOR_VERSION: u32 = 0;
-pub const GAMEACTIVITY_BUGFIX_VERSION: u32 = 2;
+pub const GAMEACTIVITY_BUGFIX_VERSION: u32 = 0;
 pub const POLLIN: u32 = 1;
 pub const POLLPRI: u32 = 2;
 pub const POLLOUT: u32 = 4;
@@ -523,6 +567,7 @@ pub const TRAP_HWBKPT: u32 = 4;
 pub const TRAP_UNK: u32 = 5;
 pub const TRAP_PERF: u32 = 6;
 pub const NSIGTRAP: u32 = 6;
+pub const TRAP_PERF_FLAG_ASYNC: u32 = 1;
 pub const CLD_EXITED: u32 = 1;
 pub const CLD_KILLED: u32 = 2;
 pub const CLD_DUMPED: u32 = 3;
@@ -560,6 +605,9 @@ pub const UPAGES: u32 = 1;
 pub const FD_SETSIZE: u32 = 1024;
 pub const CLOCKS_PER_SEC: u32 = 1000000;
 pub const TIME_UTC: u32 = 1;
+pub const TIME_MONOTONIC: u32 = 2;
+pub const TIME_ACTIVE: u32 = 3;
+pub const TIME_THREAD_ACTIVE: u32 = 4;
 pub const CSIGNAL: u32 = 255;
 pub const CLONE_VM: u32 = 256;
 pub const CLONE_FS: u32 = 512;
@@ -644,32 +692,22 @@ fn bindgen_test_layout_max_align_t() {
     assert_eq!(
         ::std::mem::size_of::<max_align_t>(),
         16usize,
-        concat!("Size of: ", stringify!(max_align_t))
+        "Size of max_align_t"
     );
     assert_eq!(
         ::std::mem::align_of::<max_align_t>(),
         8usize,
-        concat!("Alignment of ", stringify!(max_align_t))
+        "Alignment of max_align_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce1) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(max_align_t),
-            "::",
-            stringify!(__clang_max_align_nonce1)
-        )
+        "Offset of field: max_align_t::__clang_max_align_nonce1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce2) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(max_align_t),
-            "::",
-            stringify!(__clang_max_align_nonce2)
-        )
+        "Offset of field: max_align_t::__clang_max_align_nonce2"
     );
 }
 pub type __int8_t = ::std::os::raw::c_schar;
@@ -720,22 +758,17 @@ fn bindgen_test_layout___kernel_fd_set() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_fd_set>(),
         128usize,
-        concat!("Size of: ", stringify!(__kernel_fd_set))
+        "Size of __kernel_fd_set"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_fd_set>(),
         4usize,
-        concat!("Alignment of ", stringify!(__kernel_fd_set))
+        "Alignment of __kernel_fd_set"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_fd_set),
-            "::",
-            stringify!(fds_bits)
-        )
+        "Offset of field: __kernel_fd_set::fds_bits"
     );
 }
 pub type __kernel_sighandler_t =
@@ -772,22 +805,17 @@ fn bindgen_test_layout___kernel_fsid_t() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_fsid_t>(),
         8usize,
-        concat!("Size of: ", stringify!(__kernel_fsid_t))
+        "Size of __kernel_fsid_t"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_fsid_t>(),
         4usize,
-        concat!("Alignment of ", stringify!(__kernel_fsid_t))
+        "Alignment of __kernel_fsid_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).val) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_fsid_t),
-            "::",
-            stringify!(val)
-        )
+        "Offset of field: __kernel_fsid_t::val"
     );
 }
 pub type __kernel_off_t = __kernel_long_t;
@@ -1155,6 +1183,22 @@ pub const AKEYCODE_REFRESH: _bindgen_ty_2 = 285;
 pub const AKEYCODE_THUMBS_UP: _bindgen_ty_2 = 286;
 pub const AKEYCODE_THUMBS_DOWN: _bindgen_ty_2 = 287;
 pub const AKEYCODE_PROFILE_SWITCH: _bindgen_ty_2 = 288;
+pub const AKEYCODE_VIDEO_APP_1: _bindgen_ty_2 = 289;
+pub const AKEYCODE_VIDEO_APP_2: _bindgen_ty_2 = 290;
+pub const AKEYCODE_VIDEO_APP_3: _bindgen_ty_2 = 291;
+pub const AKEYCODE_VIDEO_APP_4: _bindgen_ty_2 = 292;
+pub const AKEYCODE_VIDEO_APP_5: _bindgen_ty_2 = 293;
+pub const AKEYCODE_VIDEO_APP_6: _bindgen_ty_2 = 294;
+pub const AKEYCODE_VIDEO_APP_7: _bindgen_ty_2 = 295;
+pub const AKEYCODE_VIDEO_APP_8: _bindgen_ty_2 = 296;
+pub const AKEYCODE_FEATURED_APP_1: _bindgen_ty_2 = 297;
+pub const AKEYCODE_FEATURED_APP_2: _bindgen_ty_2 = 298;
+pub const AKEYCODE_FEATURED_APP_3: _bindgen_ty_2 = 299;
+pub const AKEYCODE_FEATURED_APP_4: _bindgen_ty_2 = 300;
+pub const AKEYCODE_DEMO_APP_1: _bindgen_ty_2 = 301;
+pub const AKEYCODE_DEMO_APP_2: _bindgen_ty_2 = 302;
+pub const AKEYCODE_DEMO_APP_3: _bindgen_ty_2 = 303;
+pub const AKEYCODE_DEMO_APP_4: _bindgen_ty_2 = 304;
 pub type _bindgen_ty_2 = ::std::os::raw::c_uint;
 pub const ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: _bindgen_ty_3 = 1;
 pub type _bindgen_ty_3 = ::std::os::raw::c_uint;
@@ -1169,8 +1213,8 @@ pub const ALOOPER_EVENT_ERROR: _bindgen_ty_5 = 4;
 pub const ALOOPER_EVENT_HANGUP: _bindgen_ty_5 = 8;
 pub const ALOOPER_EVENT_INVALID: _bindgen_ty_5 = 16;
 pub type _bindgen_ty_5 = ::std::os::raw::c_uint;
-pub type va_list = __builtin_va_list;
 pub type __gnuc_va_list = __builtin_va_list;
+pub type va_list = __builtin_va_list;
 #[repr(C)]
 pub struct JavaVMAttachArgs {
     pub version: jint,
@@ -1184,42 +1228,27 @@ fn bindgen_test_layout_JavaVMAttachArgs() {
     assert_eq!(
         ::std::mem::size_of::<JavaVMAttachArgs>(),
         12usize,
-        concat!("Size of: ", stringify!(JavaVMAttachArgs))
+        "Size of JavaVMAttachArgs"
     );
     assert_eq!(
         ::std::mem::align_of::<JavaVMAttachArgs>(),
         4usize,
-        concat!("Alignment of ", stringify!(JavaVMAttachArgs))
+        "Alignment of JavaVMAttachArgs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
-            "::",
-            stringify!(version)
-        )
+        "Offset of field: JavaVMAttachArgs::version"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).name) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
-            "::",
-            stringify!(name)
-        )
+        "Offset of field: JavaVMAttachArgs::name"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).group) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
-            "::",
-            stringify!(group)
-        )
+        "Offset of field: JavaVMAttachArgs::group"
     );
 }
 #[repr(C)]
@@ -1235,32 +1264,22 @@ fn bindgen_test_layout_JavaVMOption() {
     assert_eq!(
         ::std::mem::size_of::<JavaVMOption>(),
         8usize,
-        concat!("Size of: ", stringify!(JavaVMOption))
+        "Size of JavaVMOption"
     );
     assert_eq!(
         ::std::mem::align_of::<JavaVMOption>(),
         4usize,
-        concat!("Alignment of ", stringify!(JavaVMOption))
+        "Alignment of JavaVMOption"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).optionString) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMOption),
-            "::",
-            stringify!(optionString)
-        )
+        "Offset of field: JavaVMOption::optionString"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).extraInfo) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMOption),
-            "::",
-            stringify!(extraInfo)
-        )
+        "Offset of field: JavaVMOption::extraInfo"
     );
 }
 #[repr(C)]
@@ -1277,52 +1296,32 @@ fn bindgen_test_layout_JavaVMInitArgs() {
     assert_eq!(
         ::std::mem::size_of::<JavaVMInitArgs>(),
         16usize,
-        concat!("Size of: ", stringify!(JavaVMInitArgs))
+        "Size of JavaVMInitArgs"
     );
     assert_eq!(
         ::std::mem::align_of::<JavaVMInitArgs>(),
         4usize,
-        concat!("Alignment of ", stringify!(JavaVMInitArgs))
+        "Alignment of JavaVMInitArgs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(version)
-        )
+        "Offset of field: JavaVMInitArgs::version"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).nOptions) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(nOptions)
-        )
+        "Offset of field: JavaVMInitArgs::nOptions"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).options) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(options)
-        )
+        "Offset of field: JavaVMInitArgs::options"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ignoreUnrecognized) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(ignoreUnrecognized)
-        )
+        "Offset of field: JavaVMInitArgs::ignoreUnrecognized"
     );
 }
 pub const AKEY_STATE_UNKNOWN: _bindgen_ty_6 = -1;
@@ -1792,32 +1791,22 @@ fn bindgen_test_layout_imaxdiv_t() {
     assert_eq!(
         ::std::mem::size_of::<imaxdiv_t>(),
         16usize,
-        concat!("Size of: ", stringify!(imaxdiv_t))
+        "Size of imaxdiv_t"
     );
     assert_eq!(
         ::std::mem::align_of::<imaxdiv_t>(),
         4usize,
-        concat!("Alignment of ", stringify!(imaxdiv_t))
+        "Alignment of imaxdiv_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).quot) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(imaxdiv_t),
-            "::",
-            stringify!(quot)
-        )
+        "Offset of field: imaxdiv_t::quot"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rem) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(imaxdiv_t),
-            "::",
-            stringify!(rem)
-        )
+        "Offset of field: imaxdiv_t::rem"
     );
 }
 extern "C" {
@@ -1922,6 +1911,10 @@ pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = 35;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_YCbCr_P010: AHardwareBuffer_Format = 54;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8_UNORM: AHardwareBuffer_Format = 56;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R16_UINT: AHardwareBuffer_Format = 57;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R16G16_UINT: AHardwareBuffer_Format = 58;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R10G10B10A10_UNORM: AHardwareBuffer_Format =
+    59;
 pub type AHardwareBuffer_Format = ::std::os::raw::c_uint;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_NEVER:
     AHardwareBuffer_UsageFlags = 0;
@@ -1959,6 +1952,8 @@ pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP:
     AHardwareBuffer_UsageFlags = 33554432;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE:
     AHardwareBuffer_UsageFlags = 67108864;
+pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_FRONT_BUFFER:
+    AHardwareBuffer_UsageFlags = 2147483648;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_VENDOR_0: AHardwareBuffer_UsageFlags =
     268435456;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_VENDOR_1: AHardwareBuffer_UsageFlags =
@@ -2019,92 +2014,52 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Desc>(),
         40usize,
-        concat!("Size of: ", stringify!(AHardwareBuffer_Desc))
+        "Size of AHardwareBuffer_Desc"
     );
     assert_eq!(
         ::std::mem::align_of::<AHardwareBuffer_Desc>(),
         4usize,
-        concat!("Alignment of ", stringify!(AHardwareBuffer_Desc))
+        "Alignment of AHardwareBuffer_Desc"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).width) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(width)
-        )
+        "Offset of field: AHardwareBuffer_Desc::width"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).height) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(height)
-        )
+        "Offset of field: AHardwareBuffer_Desc::height"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).layers) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(layers)
-        )
+        "Offset of field: AHardwareBuffer_Desc::layers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).format) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(format)
-        )
+        "Offset of field: AHardwareBuffer_Desc::format"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).usage) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(usage)
-        )
+        "Offset of field: AHardwareBuffer_Desc::usage"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stride) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(stride)
-        )
+        "Offset of field: AHardwareBuffer_Desc::stride"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rfu0) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(rfu0)
-        )
+        "Offset of field: AHardwareBuffer_Desc::rfu0"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rfu1) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(rfu1)
-        )
+        "Offset of field: AHardwareBuffer_Desc::rfu1"
     );
 }
 #[repr(C)]
@@ -2122,42 +2077,27 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Plane>(),
         12usize,
-        concat!("Size of: ", stringify!(AHardwareBuffer_Plane))
+        "Size of AHardwareBuffer_Plane"
     );
     assert_eq!(
         ::std::mem::align_of::<AHardwareBuffer_Plane>(),
         4usize,
-        concat!("Alignment of ", stringify!(AHardwareBuffer_Plane))
+        "Alignment of AHardwareBuffer_Plane"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Plane),
-            "::",
-            stringify!(data)
-        )
+        "Offset of field: AHardwareBuffer_Plane::data"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pixelStride) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Plane),
-            "::",
-            stringify!(pixelStride)
-        )
+        "Offset of field: AHardwareBuffer_Plane::pixelStride"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rowStride) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Plane),
-            "::",
-            stringify!(rowStride)
-        )
+        "Offset of field: AHardwareBuffer_Plane::rowStride"
     );
 }
 #[repr(C)]
@@ -2174,32 +2114,22 @@ fn bindgen_test_layout_AHardwareBuffer_Planes() {
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Planes>(),
         52usize,
-        concat!("Size of: ", stringify!(AHardwareBuffer_Planes))
+        "Size of AHardwareBuffer_Planes"
     );
     assert_eq!(
         ::std::mem::align_of::<AHardwareBuffer_Planes>(),
         4usize,
-        concat!("Alignment of ", stringify!(AHardwareBuffer_Planes))
+        "Alignment of AHardwareBuffer_Planes"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).planeCount) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Planes),
-            "::",
-            stringify!(planeCount)
-        )
+        "Offset of field: AHardwareBuffer_Planes::planeCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).planes) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Planes),
-            "::",
-            stringify!(planes)
-        )
+        "Offset of field: AHardwareBuffer_Planes::planes"
     );
 }
 #[repr(C)]
@@ -2299,62 +2229,37 @@ fn bindgen_test_layout_GameActivityPointerAxes() {
     assert_eq!(
         ::std::mem::size_of::<GameActivityPointerAxes>(),
         208usize,
-        concat!("Size of: ", stringify!(GameActivityPointerAxes))
+        "Size of GameActivityPointerAxes"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityPointerAxes>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameActivityPointerAxes))
+        "Alignment of GameActivityPointerAxes"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(id)
-        )
+        "Offset of field: GameActivityPointerAxes::id"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).toolType) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(toolType)
-        )
+        "Offset of field: GameActivityPointerAxes::toolType"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).axisValues) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(axisValues)
-        )
+        "Offset of field: GameActivityPointerAxes::axisValues"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rawX) as usize - ptr as usize },
         200usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(rawX)
-        )
+        "Offset of field: GameActivityPointerAxes::rawX"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rawY) as usize - ptr as usize },
         204usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(rawY)
-        )
+        "Offset of field: GameActivityPointerAxes::rawY"
     );
 }
 extern "C" {
@@ -2404,202 +2309,107 @@ fn bindgen_test_layout_GameActivityMotionEvent() {
     assert_eq!(
         ::std::mem::size_of::<GameActivityMotionEvent>(),
         1744usize,
-        concat!("Size of: ", stringify!(GameActivityMotionEvent))
+        "Size of GameActivityMotionEvent"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityMotionEvent>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameActivityMotionEvent))
+        "Alignment of GameActivityMotionEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(deviceId)
-        )
+        "Offset of field: GameActivityMotionEvent::deviceId"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(source)
-        )
+        "Offset of field: GameActivityMotionEvent::source"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(action)
-        )
+        "Offset of field: GameActivityMotionEvent::action"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(eventTime)
-        )
+        "Offset of field: GameActivityMotionEvent::eventTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(downTime)
-        )
+        "Offset of field: GameActivityMotionEvent::downTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: GameActivityMotionEvent::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(metaState)
-        )
+        "Offset of field: GameActivityMotionEvent::metaState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).actionButton) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(actionButton)
-        )
+        "Offset of field: GameActivityMotionEvent::actionButton"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).buttonState) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(buttonState)
-        )
+        "Offset of field: GameActivityMotionEvent::buttonState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).classification) as usize - ptr as usize },
         44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(classification)
-        )
+        "Offset of field: GameActivityMotionEvent::classification"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).edgeFlags) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(edgeFlags)
-        )
+        "Offset of field: GameActivityMotionEvent::edgeFlags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pointerCount) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(pointerCount)
-        )
+        "Offset of field: GameActivityMotionEvent::pointerCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pointers) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(pointers)
-        )
+        "Offset of field: GameActivityMotionEvent::pointers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historySize) as usize - ptr as usize },
         1720usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historySize)
-        )
+        "Offset of field: GameActivityMotionEvent::historySize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesMillis) as usize - ptr as usize },
         1724usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalEventTimesMillis)
-        )
+        "Offset of field: GameActivityMotionEvent::historicalEventTimesMillis"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesNanos) as usize - ptr as usize },
         1728usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalEventTimesNanos)
-        )
+        "Offset of field: GameActivityMotionEvent::historicalEventTimesNanos"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historicalAxisValues) as usize - ptr as usize },
         1732usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalAxisValues)
-        )
+        "Offset of field: GameActivityMotionEvent::historicalAxisValues"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).precisionX) as usize - ptr as usize },
         1736usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(precisionX)
-        )
+        "Offset of field: GameActivityMotionEvent::precisionX"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).precisionY) as usize - ptr as usize },
         1740usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(precisionY)
-        )
+        "Offset of field: GameActivityMotionEvent::precisionY"
     );
 }
 extern "C" {
@@ -2614,14 +2424,6 @@ extern "C" {
     #[doc = " \\brief Handle the freeing of the GameActivityMotionEvent struct."]
     pub fn GameActivityMotionEvent_destroy(c_event: *mut GameActivityMotionEvent);
 }
-extern "C" {
-    #[doc = " \\brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`.\n\n This is done automatically by the GameActivity: see `onTouchEvent` to set\n a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityMotionEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityMotionEvent,
-    );
-}
 #[doc = " \\brief Describe a key event that happened on the GameActivity SurfaceView.\n\n This is 1:1 mapping to the information contained in a Java `KeyEvent`\n (see https://developer.android.com/reference/android/view/KeyEvent).\n The only exception is the event times, which are reported as\n nanoseconds in this struct."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -2645,146 +2447,69 @@ fn bindgen_test_layout_GameActivityKeyEvent() {
     assert_eq!(
         ::std::mem::size_of::<GameActivityKeyEvent>(),
         52usize,
-        concat!("Size of: ", stringify!(GameActivityKeyEvent))
+        "Size of GameActivityKeyEvent"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityKeyEvent>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameActivityKeyEvent))
+        "Alignment of GameActivityKeyEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(deviceId)
-        )
+        "Offset of field: GameActivityKeyEvent::deviceId"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(source)
-        )
+        "Offset of field: GameActivityKeyEvent::source"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(action)
-        )
+        "Offset of field: GameActivityKeyEvent::action"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(eventTime)
-        )
+        "Offset of field: GameActivityKeyEvent::eventTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(downTime)
-        )
+        "Offset of field: GameActivityKeyEvent::downTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: GameActivityKeyEvent::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(metaState)
-        )
+        "Offset of field: GameActivityKeyEvent::metaState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).modifiers) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(modifiers)
-        )
+        "Offset of field: GameActivityKeyEvent::modifiers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).repeatCount) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(repeatCount)
-        )
+        "Offset of field: GameActivityKeyEvent::repeatCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyCode) as usize - ptr as usize },
         44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(keyCode)
-        )
+        "Offset of field: GameActivityKeyEvent::keyCode"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).scanCode) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(scanCode)
-        )
+        "Offset of field: GameActivityKeyEvent::scanCode"
     );
 }
-extern "C" {
-    #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.\n\n This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`\n to set a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityKeyEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityKeyEvent,
-    );
-}
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
-    GameCommonInsetsType = 3;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
-#[doc = " The type of a component for which to retrieve insets. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
-pub type GameCommonInsetsType = ::std::os::raw::c_uint;
 #[doc = " This struct holds a span within a region of text from start (inclusive) to\n end (exclusive). An empty span or cursor position is specified with\n start==end. An undefined span is specified with start = end = SPAN_UNDEFINED."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -2801,37 +2526,27 @@ fn bindgen_test_layout_GameTextInputSpan() {
     assert_eq!(
         ::std::mem::size_of::<GameTextInputSpan>(),
         8usize,
-        concat!("Size of: ", stringify!(GameTextInputSpan))
+        "Size of GameTextInputSpan"
     );
     assert_eq!(
         ::std::mem::align_of::<GameTextInputSpan>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameTextInputSpan))
+        "Alignment of GameTextInputSpan"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).start) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputSpan),
-            "::",
-            stringify!(start)
-        )
+        "Offset of field: GameTextInputSpan::start"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).end) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputSpan),
-            "::",
-            stringify!(end)
-        )
+        "Offset of field: GameTextInputSpan::end"
     );
 }
 pub const GameTextInputSpanFlag_SPAN_UNDEFINED: GameTextInputSpanFlag = -1;
 #[doc = " Values with special meaning in a GameTextInputSpan."]
-pub type GameTextInputSpanFlag = ::std::os::raw::c_int;
+pub type GameTextInputSpanFlag = i32;
 #[doc = " This struct holds the state of an editable section of text.\n The text can have a selection and a composing region defined on it.\n A composing region is used by IMEs that allow input using multiple steps to\n compose a glyph or word. Use functions GameTextInput_getState and\n GameTextInput_setState to read and modify the state that an IME is editing."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -2852,52 +2567,32 @@ fn bindgen_test_layout_GameTextInputState() {
     assert_eq!(
         ::std::mem::size_of::<GameTextInputState>(),
         24usize,
-        concat!("Size of: ", stringify!(GameTextInputState))
+        "Size of GameTextInputState"
     );
     assert_eq!(
         ::std::mem::align_of::<GameTextInputState>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameTextInputState))
+        "Alignment of GameTextInputState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).text_UTF8) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(text_UTF8)
-        )
+        "Offset of field: GameTextInputState::text_UTF8"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).text_length) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(text_length)
-        )
+        "Offset of field: GameTextInputState::text_length"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).selection) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(selection)
-        )
+        "Offset of field: GameTextInputState::selection"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).composingRegion) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(composingRegion)
-        )
+        "Offset of field: GameTextInputState::composingRegion"
     );
 }
 #[doc = " A callback called by GameTextInput_getState.\n @param context User-defined context.\n @param state State, owned by the library, that will be valid for the duration\n of the callback."]
@@ -2929,7 +2624,7 @@ pub const ShowImeFlags_SHOW_IME_UNDEFINED: ShowImeFlags = 0;
 pub const ShowImeFlags_SHOW_IMPLICIT: ShowImeFlags = 1;
 pub const ShowImeFlags_SHOW_FORCED: ShowImeFlags = 2;
 #[doc = " Flags to be passed to GameTextInput_showIme."]
-pub type ShowImeFlags = ::std::os::raw::c_uint;
+pub type ShowImeFlags = u32;
 extern "C" {
     #[doc = " Show the IME. Calls InputMethodManager.showSoftInput().\n @param input A valid GameTextInput library handle.\n @param flags Defined in ShowImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
     pub fn GameTextInput_showIme(input: *mut GameTextInput, flags: u32);
@@ -2938,9 +2633,9 @@ pub const HideImeFlags_HIDE_IME_UNDEFINED: HideImeFlags = 0;
 pub const HideImeFlags_HIDE_IMPLICIT_ONLY: HideImeFlags = 1;
 pub const HideImeFlags_HIDE_NOT_ALWAYS: HideImeFlags = 2;
 #[doc = " Flags to be passed to GameTextInput_hideIme."]
-pub type HideImeFlags = ::std::os::raw::c_uint;
+pub type HideImeFlags = u32;
 extern "C" {
-    #[doc = " Show the IME. Calls InputMethodManager.hideSoftInputFromWindow().\n @param input A valid GameTextInput library handle.\n @param flags Defined in HideImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
+    #[doc = " Hide the IME. Calls InputMethodManager.hideSoftInputFromWindow().\n @param input A valid GameTextInput library handle.\n @param flags Defined in HideImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
     pub fn GameTextInput_hideIme(input: *mut GameTextInput, flags: u32);
 }
 extern "C" {
@@ -2967,7 +2662,7 @@ pub type GameTextInputEventCallback = ::std::option::Option<
     ),
 >;
 extern "C" {
-    #[doc = " Optionally set a callback to be called whenever the IME state changes.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME state changes.\n @param context Context passed as first argument to the callback."]
+    #[doc = " Optionally set a callback to be called whenever the IME state changes.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME state changes.\n @param context Context passed as first argument to the callback.\n <b>This function is deprecated. Don't perform any complex processing inside\n the callback other than copying the state variable. Using any synchronization\n primitives inside this callback may cause a deadlock.</b>"]
     pub fn GameTextInput_setEventCallback(
         input: *mut GameTextInput,
         callback: GameTextInputEventCallback,
@@ -3010,6 +2705,144 @@ extern "C" {
         context: *mut ::std::os::raw::c_void,
     );
 }
+#[doc = " Mask of bits that determine the overall class\n of text being given.  Currently supported classes are:\n {@link #TYPE_CLASS_TEXT}, {@link #TYPE_CLASS_NUMBER},\n {@link #TYPE_CLASS_PHONE}, {@link #TYPE_CLASS_DATETIME}.\n <p>IME authors: If the class is not one you\n understand, assume {@link #TYPE_CLASS_TEXT} with NO variation\n or flags.<p>"]
+pub const GameTextInputType_TYPE_MASK_CLASS: GameTextInputType = 15;
+#[doc = " Mask of bits that determine the variation of\n the base content class."]
+pub const GameTextInputType_TYPE_MASK_VARIATION: GameTextInputType = 4080;
+#[doc = " Mask of bits that provide addition bit flags\n of options."]
+pub const GameTextInputType_TYPE_MASK_FLAGS: GameTextInputType = 16773120;
+#[doc = " Special content type for when no explicit type has been specified.\n This should be interpreted to mean that the target input connection\n is not rich, it can not process and show things like candidate text nor\n retrieve the current text, so the input method will need to run in a\n limited \"generate key events\" mode, if it supports it. Note that some\n input methods may not support it, for example a voice-based input\n method will likely not be able to generate key events even if this\n flag is set."]
+pub const GameTextInputType_TYPE_NULL: GameTextInputType = 0;
+#[doc = " Class for normal text.  This class supports the following flags (only\n one of which should be set):\n {@link #TYPE_TEXT_FLAG_CAP_CHARACTERS},\n {@link #TYPE_TEXT_FLAG_CAP_WORDS}, and.\n {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}.  It also supports the\n following variations:\n {@link #TYPE_TEXT_VARIATION_NORMAL}, and\n {@link #TYPE_TEXT_VARIATION_URI}.  If you do not recognize the\n variation, normal should be assumed."]
+pub const GameTextInputType_TYPE_CLASS_TEXT: GameTextInputType = 1;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: capitalize all characters.  Overrides\n {@link #TYPE_TEXT_FLAG_CAP_WORDS} and\n {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}.  This value is explicitly defined\n to be the same as {@link TextUtils#CAP_MODE_CHARACTERS}. Of course,\n this only affects languages where there are upper-case and lower-case\n letters."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_CAP_CHARACTERS: GameTextInputType = 4096;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: capitalize the first character of\n every word.  Overrides {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}.  This\n value is explicitly defined\n to be the same as {@link TextUtils#CAP_MODE_WORDS}. Of course,\n this only affects languages where there are upper-case and lower-case\n letters."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_CAP_WORDS: GameTextInputType = 8192;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: capitalize the first character of\n each sentence.  This value is explicitly defined\n to be the same as {@link TextUtils#CAP_MODE_SENTENCES}. For example\n in English it means to capitalize after a period and a space (note that\n other languages may have different characters for period, or not use\n spaces, or use different grammatical rules). Of course, this only affects\n languages where there are upper-case and lower-case letters."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_CAP_SENTENCES: GameTextInputType = 16384;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the user is entering free-form\n text that should have auto-correction applied to it. Without this flag,\n the IME will not try to correct typos. You should always set this flag\n unless you really expect users to type non-words in this field, for\n example to choose a name for a character in a game.\n Contrast this with {@link #TYPE_TEXT_FLAG_AUTO_COMPLETE} and\n {@link #TYPE_TEXT_FLAG_NO_SUGGESTIONS}:\n {@code TYPE_TEXT_FLAG_AUTO_CORRECT} means that the IME will try to\n auto-correct typos as the user is typing, but does not define whether\n the IME offers an interface to show suggestions."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_AUTO_CORRECT: GameTextInputType = 32768;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the text editor (which means\n the application) is performing auto-completion of the text being entered\n based on its own semantics, which it will present to the user as they type.\n This generally means that the input method should not be showing\n candidates itself, but can expect the editor to supply its own\n completions/candidates from\n {@link android.view.inputmethod.InputMethodSession#displayCompletions\n InputMethodSession.displayCompletions()} as a result of the editor calling\n {@link android.view.inputmethod.InputMethodManager#displayCompletions\n InputMethodManager.displayCompletions()}.\n Note the contrast with {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} and\n {@link #TYPE_TEXT_FLAG_NO_SUGGESTIONS}:\n {@code TYPE_TEXT_FLAG_AUTO_COMPLETE} means the editor should show an\n interface for displaying suggestions, but instead of supplying its own\n it will rely on the Editor to pass completions/corrections."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_AUTO_COMPLETE: GameTextInputType = 65536;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: multiple lines of text can be\n entered into the field.  If this flag is not set, the text field\n will be constrained to a single line. The IME may also choose not to\n display an enter key when this flag is not set, as there should be no\n need to create new lines."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_MULTI_LINE: GameTextInputType = 131072;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the regular text view associated\n with this should not be multi-line, but when a fullscreen input method\n is providing text it should use multiple lines if it can."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_IME_MULTI_LINE: GameTextInputType = 262144;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the input method does not need to\n display any dictionary-based candidates. This is useful for text views that\n do not contain words from the language and do not benefit from any\n dictionary-based completions or corrections. It overrides the\n {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} value when set.\n Please avoid using this unless you are certain this is what you want.\n Many input methods need suggestions to work well, for example the ones\n based on gesture typing. Consider clearing\n {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} instead if you just do not\n want the IME to correct typos.\n Note the contrast with {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} and\n {@link #TYPE_TEXT_FLAG_AUTO_COMPLETE}:\n {@code TYPE_TEXT_FLAG_NO_SUGGESTIONS} means the IME does not need to\n show an interface to display suggestions. Most IMEs will also take this to\n mean they do not need to try to auto-correct what the user is typing."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_NO_SUGGESTIONS: GameTextInputType = 524288;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: Let the IME know the text conversion\n suggestions are required by the application. Text conversion suggestion is\n for the transliteration languages which has pronunciation characters and\n target characters. When the user is typing the pronunciation charactes, the\n IME could provide the possible target characters to the user. When this\n flag is set, the IME should insert the text conversion suggestions through\n {@link Builder#setTextConversionSuggestions(List)} and\n the {@link TextAttribute} with initialized with the text conversion\n suggestions is provided by the IME to the application. To receive the\n additional information, the application needs to implement {@link\n InputConnection#setComposingText(CharSequence, int, TextAttribute)},\n {@link InputConnection#setComposingRegion(int, int, TextAttribute)}, and\n {@link InputConnection#commitText(CharSequence, int, TextAttribute)}."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS: GameTextInputType =
+    1048576;
+#[doc = " Default variation of {@link #TYPE_CLASS_TEXT}: plain old normal text."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_NORMAL: GameTextInputType = 0;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a URI."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_URI: GameTextInputType = 16;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering an e-mail address."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_EMAIL_ADDRESS: GameTextInputType = 32;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering the subject line of\n an e-mail."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_EMAIL_SUBJECT: GameTextInputType = 48;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a short, possibly informal\n message such as an instant message or a text message."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_SHORT_MESSAGE: GameTextInputType = 64;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering the content of a long,\n possibly formal message such as the body of an e-mail."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_LONG_MESSAGE: GameTextInputType = 80;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering the name of a person."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_PERSON_NAME: GameTextInputType = 96;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a postal mailing address."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_POSTAL_ADDRESS: GameTextInputType = 112;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a password."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_PASSWORD: GameTextInputType = 128;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a password, which should\n be visible to the user."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_VISIBLE_PASSWORD: GameTextInputType = 144;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering text inside of a web form."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_WEB_EDIT_TEXT: GameTextInputType = 160;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering text to filter contents\n of a list etc."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_FILTER: GameTextInputType = 176;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering text for phonetic\n pronunciation, such as a phonetic name field in contacts. This is mostly\n useful for languages where one spelling may have several phonetic\n readings, like Japanese."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_PHONETIC: GameTextInputType = 192;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering e-mail address inside\n of a web form.  This was added in\n {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An IME must target\n this API version or later to see this input type; if it doesn't, a request\n for this type will be seen as {@link #TYPE_TEXT_VARIATION_EMAIL_ADDRESS}\n when passed through {@link\n android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS: GameTextInputType = 208;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering password inside\n of a web form.  This was added in\n {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An IME must target\n this API version or later to see this input type; if it doesn't, a request\n for this type will be seen as {@link #TYPE_TEXT_VARIATION_PASSWORD}\n when passed through {@link\n android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_WEB_PASSWORD: GameTextInputType = 224;
+#[doc = " Class for numeric text.  This class supports the following flags:\n {@link #TYPE_NUMBER_FLAG_SIGNED} and\n {@link #TYPE_NUMBER_FLAG_DECIMAL}.  It also supports the following\n variations: {@link #TYPE_NUMBER_VARIATION_NORMAL} and\n {@link #TYPE_NUMBER_VARIATION_PASSWORD}.\n <p>IME authors: If you do not recognize\n the variation, normal should be assumed.</p>"]
+pub const GameTextInputType_TYPE_CLASS_NUMBER: GameTextInputType = 2;
+#[doc = " Flag of {@link #TYPE_CLASS_NUMBER}: the number is signed, allowing\n a positive or negative sign at the start."]
+pub const GameTextInputType_TYPE_NUMBER_FLAG_SIGNED: GameTextInputType = 4096;
+#[doc = " Flag of {@link #TYPE_CLASS_NUMBER}: the number is decimal, allowing\n a decimal point to provide fractional values."]
+pub const GameTextInputType_TYPE_NUMBER_FLAG_DECIMAL: GameTextInputType = 8192;
+#[doc = " Default variation of {@link #TYPE_CLASS_NUMBER}: plain normal\n numeric text.  This was added in\n {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An IME must target\n this API version or later to see this input type; if it doesn't, a request\n for this type will be dropped when passed through\n {@link android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_NUMBER_VARIATION_NORMAL: GameTextInputType = 0;
+#[doc = " Variation of {@link #TYPE_CLASS_NUMBER}: entering a numeric password.\n This was added in {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An\n IME must target this API version or later to see this input type; if it\n doesn't, a request for this type will be dropped when passed\n through {@link android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_NUMBER_VARIATION_PASSWORD: GameTextInputType = 16;
+#[doc = " Class for a phone number.  This class currently supports no variations\n or flags."]
+pub const GameTextInputType_TYPE_CLASS_PHONE: GameTextInputType = 3;
+#[doc = " Class for dates and times.  It supports the\n following variations:\n {@link #TYPE_DATETIME_VARIATION_NORMAL}\n {@link #TYPE_DATETIME_VARIATION_DATE}, and\n {@link #TYPE_DATETIME_VARIATION_TIME}."]
+pub const GameTextInputType_TYPE_CLASS_DATETIME: GameTextInputType = 4;
+#[doc = " Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering\n both a date and time."]
+pub const GameTextInputType_TYPE_DATETIME_VARIATION_NORMAL: GameTextInputType = 0;
+#[doc = " Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering\n only a date."]
+pub const GameTextInputType_TYPE_DATETIME_VARIATION_DATE: GameTextInputType = 16;
+#[doc = " Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering\n only a time."]
+pub const GameTextInputType_TYPE_DATETIME_VARIATION_TIME: GameTextInputType = 32;
+#[doc = " Definitions for inputType argument of GameActivity_setImeEditorInfo()\n\n <pre>\n |-------|-------|-------|-------|\n                              1111 TYPE_MASK_CLASS\n                      11111111     TYPE_MASK_VARIATION\n          111111111111             TYPE_MASK_FLAGS\n |-------|-------|-------|-------|\n                                   TYPE_NULL\n |-------|-------|-------|-------|\n                                 1 TYPE_CLASS_TEXT\n                             1     TYPE_TEXT_VARIATION_URI\n                            1      TYPE_TEXT_VARIATION_EMAIL_ADDRESS\n                            11     TYPE_TEXT_VARIATION_EMAIL_SUBJECT\n                           1       TYPE_TEXT_VARIATION_SHORT_MESSAGE\n                           1 1     TYPE_TEXT_VARIATION_LONG_MESSAGE\n                           11      TYPE_TEXT_VARIATION_PERSON_NAME\n                           111     TYPE_TEXT_VARIATION_POSTAL_ADDRESS\n                          1        TYPE_TEXT_VARIATION_PASSWORD\n                          1  1     TYPE_TEXT_VARIATION_VISIBLE_PASSWORD\n                          1 1      TYPE_TEXT_VARIATION_WEB_EDIT_TEXT\n                          1 11     TYPE_TEXT_VARIATION_FILTER\n                          11       TYPE_TEXT_VARIATION_PHONETIC\n                          11 1     TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS\n                          111      TYPE_TEXT_VARIATION_WEB_PASSWORD\n                     1             TYPE_TEXT_FLAG_CAP_CHARACTERS\n                    1              TYPE_TEXT_FLAG_CAP_WORDS\n                   1               TYPE_TEXT_FLAG_CAP_SENTENCES\n                  1                TYPE_TEXT_FLAG_AUTO_CORRECT\n                 1                 TYPE_TEXT_FLAG_AUTO_COMPLETE\n                1                  TYPE_TEXT_FLAG_MULTI_LINE\n               1                   TYPE_TEXT_FLAG_IME_MULTI_LINE\n              1                    TYPE_TEXT_FLAG_NO_SUGGESTIONS\n             1 TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS\n |-------|-------|-------|-------|\n                                1  TYPE_CLASS_NUMBER\n                             1     TYPE_NUMBER_VARIATION_PASSWORD\n                     1             TYPE_NUMBER_FLAG_SIGNED\n                    1              TYPE_NUMBER_FLAG_DECIMAL\n |-------|-------|-------|-------|\n                                11 TYPE_CLASS_PHONE\n |-------|-------|-------|-------|\n                               1   TYPE_CLASS_DATETIME\n                             1     TYPE_DATETIME_VARIATION_DATE\n                            1      TYPE_DATETIME_VARIATION_TIME\n |-------|-------|-------|-------|</pre>"]
+pub type GameTextInputType = u32;
+#[doc = " Set of bits in {@link #imeOptions} that provide alternative actions\n associated with the \"enter\" key.  This both helps the IME provide\n better feedback about what the enter key will do, and also allows it\n to provide alternative mechanisms for providing that command."]
+pub const GameTextInputActionType_IME_MASK_ACTION: GameTextInputActionType = 255;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: no specific action has been\n associated with this editor, let the editor come up with its own if\n it can."]
+pub const GameTextInputActionType_IME_ACTION_UNSPECIFIED: GameTextInputActionType = 0;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: there is no available action."]
+pub const GameTextInputActionType_IME_ACTION_NONE: GameTextInputActionType = 1;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"go\"\n operation to take the user to the target of the text they typed.\n Typically used, for example, when entering a URL."]
+pub const GameTextInputActionType_IME_ACTION_GO: GameTextInputActionType = 2;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"search\"\n operation, taking the user to the results of searching for the text\n they have typed (in whatever context is appropriate)."]
+pub const GameTextInputActionType_IME_ACTION_SEARCH: GameTextInputActionType = 3;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"send\"\n operation, delivering the text to its target.  This is typically used\n when composing a message in IM or SMS where sending is immediate."]
+pub const GameTextInputActionType_IME_ACTION_SEND: GameTextInputActionType = 4;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"next\"\n operation, taking the user to the next field that will accept text."]
+pub const GameTextInputActionType_IME_ACTION_NEXT: GameTextInputActionType = 5;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"done\"\n operation, typically meaning there is nothing more to input and the\n IME will be closed."]
+pub const GameTextInputActionType_IME_ACTION_DONE: GameTextInputActionType = 6;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: like {@link #IME_ACTION_NEXT}, but\n for moving to the previous field.  This will normally not be used to\n specify an action (since it precludes {@link #IME_ACTION_NEXT}), but\n can be returned to the app if it sets {@link #IME_FLAG_NAVIGATE_PREVIOUS}."]
+pub const GameTextInputActionType_IME_ACTION_PREVIOUS: GameTextInputActionType = 7;
+#[doc = " actionId and imeOptions argument of GameActivity_setImeEditorInfo().\n\n <pre>\n |-------|-------|-------|-------|\n                              1111 IME_MASK_ACTION\n |-------|-------|-------|-------|\n                                   IME_ACTION_UNSPECIFIED\n                                 1 IME_ACTION_NONE\n                                1  IME_ACTION_GO\n                                11 IME_ACTION_SEARCH\n                               1   IME_ACTION_SEND\n                               1 1 IME_ACTION_NEXT\n                               11  IME_ACTION_DONE\n                               111 IME_ACTION_PREVIOUS\n         1                         IME_FLAG_NO_PERSONALIZED_LEARNING\n        1                          IME_FLAG_NO_FULLSCREEN\n       1                           IME_FLAG_NAVIGATE_PREVIOUS\n      1                            IME_FLAG_NAVIGATE_NEXT\n     1                             IME_FLAG_NO_EXTRACT_UI\n    1                              IME_FLAG_NO_ACCESSORY_ACTION\n   1                               IME_FLAG_NO_ENTER_ACTION\n  1                                IME_FLAG_FORCE_ASCII\n |-------|-------|-------|-------|</pre>"]
+pub type GameTextInputActionType = u32;
+#[doc = " Flag of {@link #imeOptions}: used to request that the IME should not update\n any personalized data such as typing history and personalized language\n model based on what the user typed on this text editing object.  Typical\n use cases are: <ul> <li>When the application is in a special mode, where\n user's activities are expected to be not recorded in the application's\n history.  Some web browsers and chat applications may have this kind of\n modes.</li> <li>When storing typing history does not make much sense.\n Specifying this flag in typing games may help to avoid typing history from\n being filled up with words that the user is less likely to type in their\n daily life.  Another example is that when the application already knows\n that the expected input is not a valid word (e.g. a promotion code that is\n     not a valid word in any natural language).</li>\n </ul>\n\n <p>Applications need to be aware that the flag is not a guarantee, and some\n IMEs may not respect it.</p>"]
+pub const GameTextInputImeOptions_IME_FLAG_NO_PERSONALIZED_LEARNING: GameTextInputImeOptions =
+    16777216;
+#[doc = " Flag of {@link #imeOptions}: used to request that the IME never go\n into fullscreen mode.\n By default, IMEs may go into full screen mode when they think\n it's appropriate, for example on small screens in landscape\n orientation where displaying a software keyboard may occlude\n such a large portion of the screen that the remaining part is\n too small to meaningfully display the application UI.\n If this flag is set, compliant IMEs will never go into full screen mode,\n and always leave some space to display the application UI.\n Applications need to be aware that the flag is not a guarantee, and\n some IMEs may ignore it."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_FULLSCREEN: GameTextInputImeOptions = 33554432;
+#[doc = " Flag of {@link #imeOptions}: like {@link #IME_FLAG_NAVIGATE_NEXT}, but\n specifies there is something interesting that a backward navigation\n can focus on.  If the user selects the IME's facility to backward\n navigate, this will show up in the application as an {@link\n #IME_ACTION_PREVIOUS} at {@link InputConnection#performEditorAction(int)\n InputConnection.performEditorAction(int)}."]
+pub const GameTextInputImeOptions_IME_FLAG_NAVIGATE_PREVIOUS: GameTextInputImeOptions = 67108864;
+#[doc = " Flag of {@link #imeOptions}: used to specify that there is something\n interesting that a forward navigation can focus on. This is like using\n {@link #IME_ACTION_NEXT}, except allows the IME to be multiline (with\n an enter key) as well as provide forward navigation.  Note that some\n IMEs may not be able to do this, especially when running on a small\n screen where there is little space.  In that case it does not need to\n present a UI for this option.  Like {@link #IME_ACTION_NEXT}, if the\n user selects the IME's facility to forward navigate, this will show up\n in the application at {@link InputConnection#performEditorAction(int)\n InputConnection.performEditorAction(int)}."]
+pub const GameTextInputImeOptions_IME_FLAG_NAVIGATE_NEXT: GameTextInputImeOptions = 134217728;
+#[doc = " Flag of {@link #imeOptions}: used to specify that the IME does not need\n to show its extracted text UI.  For input methods that may be fullscreen,\n often when in landscape mode, this allows them to be smaller and let part\n of the application be shown behind, through transparent UI parts in the\n fullscreen IME. The part of the UI visible to the user may not be\n responsive to touch because the IME will receive touch events, which may\n confuse the user; use {@link #IME_FLAG_NO_FULLSCREEN} instead for a better\n experience. Using this flag is discouraged and it may become deprecated in\n the future. Its meaning is unclear in some situations and it may not work\n appropriately on older versions of the platform."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_EXTRACT_UI: GameTextInputImeOptions = 268435456;
+#[doc = " Flag of {@link #imeOptions}: used in conjunction with one of the actions\n masked by {@link #IME_MASK_ACTION}, this indicates that the action\n should not be available as an accessory button on the right of the\n extracted text when the input method is full-screen. Note that by setting\n this flag, there can be cases where the action is simply never available to\n the user. Setting this generally means that you think that in fullscreen\n mode, where there is little space to show the text, it's not worth taking\n some screen real estate to display the action and it should be used instead\n to show more text."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_ACCESSORY_ACTION: GameTextInputImeOptions = 536870912;
+#[doc = " Flag of {@link #imeOptions}: used in conjunction with one of the actions\n masked by {@link #IME_MASK_ACTION}. If this flag is not set, IMEs will\n normally replace the \"enter\" key with the action supplied. This flag\n indicates that the action should not be available in-line as a replacement\n for the \"enter\" key. Typically this is because the action has such a\n significant impact or is not recoverable enough that accidentally hitting\n it should be avoided, such as sending a message. Note that\n {@link android.widget.TextView} will automatically set this flag for you\n on multi-line text views."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_ENTER_ACTION: GameTextInputImeOptions = 1073741824;
+#[doc = " Flag of {@link #imeOptions}: used to request an IME that is capable of\n inputting ASCII characters.  The intention of this flag is to ensure that\n the user can type Roman alphabet characters in a {@link\n android.widget.TextView}. It is typically used for an account ID or\n password input. A lot of the time, IMEs are already able to input ASCII\n even without being told so (such IMEs already respect this flag in a\n sense), but there are cases when this is not the default. For instance,\n users of languages using a different script like Arabic, Greek, Hebrew or\n Russian typically have a keyboard that can't input ASCII characters by\n default. Applications need to be aware that the flag is not a guarantee,\n and some IMEs may not respect it. However, it is strongly recommended for\n IME authors to respect this flag especially when their IME could end up\n with a state where only languages using non-ASCII are enabled."]
+pub const GameTextInputImeOptions_IME_FLAG_FORCE_ASCII: GameTextInputImeOptions = 2147483648;
+#[doc = " Flag of {@link #internalImeOptions}: flag is set when app window containing\n this\n {@link EditorInfo} is using {@link Configuration#ORIENTATION_PORTRAIT}\n mode.\n @hide"]
+pub const GameTextInputImeOptions_IME_INTERNAL_FLAG_APP_WINDOW_PORTRAIT: GameTextInputImeOptions =
+    1;
+#[doc = " Generic unspecified type for {@link #imeOptions}."]
+pub const GameTextInputImeOptions_IME_NULL: GameTextInputImeOptions = 0;
+pub type GameTextInputImeOptions = u32;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
+    GameCommonInsetsType = 3;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
+#[doc = " The type of a component for which to retrieve insets. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
+pub type GameCommonInsetsType = u8;
 #[doc = " This structure defines the native side of an android.app.GameActivity.\n It is created by the framework, and handed to the application's native\n code as it is being launched."]
 #[repr(C)]
 pub struct GameActivity {
@@ -3041,112 +2874,62 @@ fn bindgen_test_layout_GameActivity() {
     assert_eq!(
         ::std::mem::size_of::<GameActivity>(),
         40usize,
-        concat!("Size of: ", stringify!(GameActivity))
+        "Size of GameActivity"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivity>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameActivity))
+        "Alignment of GameActivity"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).callbacks) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(callbacks)
-        )
+        "Offset of field: GameActivity::callbacks"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).vm) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(vm)
-        )
+        "Offset of field: GameActivity::vm"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).env) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(env)
-        )
+        "Offset of field: GameActivity::env"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).javaGameActivity) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(javaGameActivity)
-        )
+        "Offset of field: GameActivity::javaGameActivity"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).internalDataPath) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(internalDataPath)
-        )
+        "Offset of field: GameActivity::internalDataPath"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).externalDataPath) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(externalDataPath)
-        )
+        "Offset of field: GameActivity::externalDataPath"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sdkVersion) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(sdkVersion)
-        )
+        "Offset of field: GameActivity::sdkVersion"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).instance) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(instance)
-        )
+        "Offset of field: GameActivity::instance"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).assetManager) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(assetManager)
-        )
+        "Offset of field: GameActivity::assetManager"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).obbPath) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(obbPath)
-        )
+        "Offset of field: GameActivity::obbPath"
     );
 }
 #[doc = " A function the user should call from their callback with the data, its length\n and the library- supplied context."]
@@ -3203,7 +2986,7 @@ pub struct GameActivityCallbacks {
     pub onNativeWindowDestroyed: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The current device AConfiguration has changed.  The new configuration can\n be retrieved from assetManager."]
+    #[doc = " The current device AConfiguration has changed. The new configuration can\n be retrieved from assetManager."]
     pub onConfigurationChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
     #[doc = " The system is running low on memory.  Use this callback to release\n resources you do not need, to help the system avoid killing more\n important processes."]
@@ -3242,6 +3025,13 @@ pub struct GameActivityCallbacks {
     pub onContentRectChanged: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, rect: *const ARect),
     >,
+    #[doc = " Callback called when the software keyboard is shown or hidden."]
+    pub onSoftwareKeyboardVisibilityChanged:
+        ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity, visible: bool)>,
+    #[doc = " Callback called when the software keyboard is shown or hidden."]
+    pub onEditorAction: ::std::option::Option<
+        unsafe extern "C" fn(activity: *mut GameActivity, action: ::std::os::raw::c_int) -> bool,
+    >,
 }
 #[test]
 fn bindgen_test_layout_GameActivityCallbacks() {
@@ -3250,203 +3040,120 @@ fn bindgen_test_layout_GameActivityCallbacks() {
     let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<GameActivityCallbacks>(),
-        76usize,
-        concat!("Size of: ", stringify!(GameActivityCallbacks))
+        84usize,
+        "Size of GameActivityCallbacks"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityCallbacks>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameActivityCallbacks))
+        "Alignment of GameActivityCallbacks"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onStart) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onStart)
-        )
+        "Offset of field: GameActivityCallbacks::onStart"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onResume) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onResume)
-        )
+        "Offset of field: GameActivityCallbacks::onResume"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onSaveInstanceState) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onSaveInstanceState)
-        )
+        "Offset of field: GameActivityCallbacks::onSaveInstanceState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onPause) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onPause)
-        )
+        "Offset of field: GameActivityCallbacks::onPause"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onStop) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onStop)
-        )
+        "Offset of field: GameActivityCallbacks::onStop"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onDestroy) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onDestroy)
-        )
+        "Offset of field: GameActivityCallbacks::onDestroy"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onWindowFocusChanged) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onWindowFocusChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onWindowFocusChanged"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowCreated) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowCreated)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowCreated"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowResized) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowResized)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowResized"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowRedrawNeeded) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowRedrawNeeded)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowRedrawNeeded"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowDestroyed) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowDestroyed)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowDestroyed"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onConfigurationChanged) as usize - ptr as usize },
         44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onConfigurationChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onConfigurationChanged"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onTrimMemory) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onTrimMemory)
-        )
+        "Offset of field: GameActivityCallbacks::onTrimMemory"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onTouchEvent) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onTouchEvent)
-        )
+        "Offset of field: GameActivityCallbacks::onTouchEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onKeyDown) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onKeyDown)
-        )
+        "Offset of field: GameActivityCallbacks::onKeyDown"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onKeyUp) as usize - ptr as usize },
         60usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onKeyUp)
-        )
+        "Offset of field: GameActivityCallbacks::onKeyUp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onTextInputEvent) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onTextInputEvent)
-        )
+        "Offset of field: GameActivityCallbacks::onTextInputEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onWindowInsetsChanged) as usize - ptr as usize },
         68usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onWindowInsetsChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onWindowInsetsChanged"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onContentRectChanged) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onContentRectChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onContentRectChanged"
+    );
+    assert_eq!(
+        unsafe {
+            ::std::ptr::addr_of!((*ptr).onSoftwareKeyboardVisibilityChanged) as usize - ptr as usize
+        },
+        76usize,
+        "Offset of field: GameActivityCallbacks::onSoftwareKeyboardVisibilityChanged"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).onEditorAction) as usize - ptr as usize },
+        80usize,
+        "Offset of field: GameActivityCallbacks::onEditorAction"
     );
 }
 #[doc = " This is the function that must be in the native code to instantiate the\n application's native activity.  It is called with the activity instance (see\n above); if the code is being instantiated from a previously saved instance,\n the savedState will be non-NULL and point to the saved data.  You must make\n any copy of this data you need -- it will be released after you return from\n this function."]
@@ -3526,7 +3233,7 @@ pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_TURN_SCREEN_ON: GameActiv
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DISMISS_KEYGUARD:
     GameActivitySetWindowFlags = 4194304;
 #[doc = " Flags for GameActivity_setWindowFlags,\n as per the Java API at android.view.WindowManager.LayoutParams."]
-pub type GameActivitySetWindowFlags = ::std::os::raw::c_uint;
+pub type GameActivitySetWindowFlags = u32;
 extern "C" {
     #[doc = " Change the window flags of the given activity.  Calls getWindow().setFlags()\n of the given activity.\n Note that some flags must be set before the window decoration is created,\n see\n https://developer.android.com/reference/android/view/Window#setFlags(int,%20int).\n Note also that this method can be called from\n *any* thread; it will send a message to the main thread of the process\n where the Java finish call will take place."]
     pub fn GameActivity_setWindowFlags(
@@ -3542,11 +3249,15 @@ pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT:
 pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED:
     GameActivityShowSoftInputFlags = 2;
 #[doc = " Flags for GameActivity_showSoftInput; see the Java InputMethodManager\n API for documentation."]
-pub type GameActivityShowSoftInputFlags = ::std::os::raw::c_uint;
+pub type GameActivityShowSoftInputFlags = u8;
 extern "C" {
     #[doc = " Show the IME while in the given activity.  Calls\n InputMethodManager.showSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java call will take place."]
     pub fn GameActivity_showSoftInput(activity: *mut GameActivity, flags: u32);
 }
+extern "C" {
+    #[doc = " Restarts the input method. Calls InputMethodManager.restartInput().\n Note that this method can be called from *any* thread; it will send a message\n to the main thread of the process where the Java call will take place."]
+    pub fn GameActivity_restartInput(activity: *mut GameActivity);
+}
 extern "C" {
     #[doc = " Set the text entry state (see documentation of the GameTextInputState struct\n in the Game Text Input library reference).\n\n Ownership of the state is maintained by the caller."]
     pub fn GameActivity_setTextInputState(
@@ -3573,7 +3284,7 @@ pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_O
 pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS:
     GameActivityHideSoftInputFlags = 2;
 #[doc = " Flags for GameActivity_hideSoftInput; see the Java InputMethodManager\n API for documentation."]
-pub type GameActivityHideSoftInputFlags = ::std::os::raw::c_uint;
+pub type GameActivityHideSoftInputFlags = u16;
 extern "C" {
     #[doc = " Hide the IME while in the given activity.  Calls\n InputMethodManager.hideSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java finish call will take place."]
     pub fn GameActivity_hideSoftInput(activity: *mut GameActivity, flags: u32);
@@ -3587,12 +3298,16 @@ extern "C" {
     );
 }
 extern "C" {
-    #[doc = " Set options on how the IME behaves when it is requested for text input.\n See\n https://developer.android.com/reference/android/view/inputmethod/EditorInfo\n for the meaning of inputType, actionId and imeOptions.\n\n Note that this function will attach the current thread to the JVM if it is\n not already attached, so the caller must detach the thread from the JVM\n before the thread is destroyed using DetachCurrentThread."]
+    #[doc = " Tells whether the software keyboard is visible or not."]
+    pub fn GameActivity_isSoftwareKeyboardVisible(activity: *mut GameActivity) -> bool;
+}
+extern "C" {
+    #[doc = " Set options on how the IME behaves when it is requested for text input.\n See\n https://developer.android.com/reference/android/view/inputmethod/EditorInfo\n for the meaning of inputType, actionId and imeOptions.\n\n <b>Note:</b> currently only TYPE_NULL AND TYPE_CLASS_NUMBER are supported."]
     pub fn GameActivity_setImeEditorInfo(
         activity: *mut GameActivity,
-        inputType: ::std::os::raw::c_int,
-        actionId: ::std::os::raw::c_int,
-        imeOptions: ::std::os::raw::c_int,
+        inputType: GameTextInputType,
+        actionId: GameTextInputActionType,
+        imeOptions: GameTextInputImeOptions,
     );
 }
 extern "C" {
@@ -3623,6 +3338,9 @@ extern "C" {
 extern "C" {
     pub fn GameActivity_getKeyboardHidden(activity: *mut GameActivity) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn GameActivity_getLocalesCount(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
 extern "C" {
     pub fn GameActivity_getMcc(activity: *mut GameActivity) -> ::std::os::raw::c_int;
 }
@@ -3655,6 +3373,39 @@ extern "C" {
 extern "C" {
     pub fn GameActivity_getUIMode(activity: *mut GameActivity) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    #[doc = " The functions below return Java locale information.\n\n In simple cases there will be just one locale, but it's possible tha\n there are more than one locale objects. Users are encouraged to write code\n that handles all locales and not just the first one.\n\n The functions in the block below return string values in the provided buffer.\n Return value is zero if there were no errors, otherwise it's non-zero.\n If the return value is zero, `dst` will contain a null-terminated string:\n strlen(dst) <= dst_size - 1.\n If the return value is non-zero, the content of dst is undefined.\n\n Parameters:\n\n dst, dst_size: define a receiver buffer. Locale string can be something\n short like \"EN/EN\", but it may be longer. You should be safe with a buffer\n size of 256 bytes.\n\n If the buffer is too small, ENOBUFS is returned. Try allocating a larger\n buffer in this case.\n\n localeIdx must be between 0 and the value of GameActivity_getLocalesCount().\n If localeIdx is out of range, EINVAL is returned.\n\n Refer to Java documentation of locales for more information."]
+    pub fn GameActivity_getLocaleLanguage(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getLocaleScript(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getLocaleCountry(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getLocaleVariant(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
 pub const ACONFIGURATION_ORIENTATION_ANY: _bindgen_ty_21 = 0;
 pub const ACONFIGURATION_ORIENTATION_PORT: _bindgen_ty_21 = 1;
 pub const ACONFIGURATION_ORIENTATION_LAND: _bindgen_ty_21 = 2;
@@ -3753,45 +3504,26 @@ pub struct pollfd {
 fn bindgen_test_layout_pollfd() {
     const UNINIT: ::std::mem::MaybeUninit<pollfd> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<pollfd>(),
-        8usize,
-        concat!("Size of: ", stringify!(pollfd))
-    );
+    assert_eq!(::std::mem::size_of::<pollfd>(), 8usize, "Size of pollfd");
     assert_eq!(
         ::std::mem::align_of::<pollfd>(),
         4usize,
-        concat!("Alignment of ", stringify!(pollfd))
+        "Alignment of pollfd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(pollfd),
-            "::",
-            stringify!(fd)
-        )
+        "Offset of field: pollfd::fd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).events) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(pollfd),
-            "::",
-            stringify!(events)
-        )
+        "Offset of field: pollfd::events"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).revents) as usize - ptr as usize },
         6usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(pollfd),
-            "::",
-            stringify!(revents)
-        )
+        "Offset of field: pollfd::revents"
     );
 }
 #[repr(C)]
@@ -3810,62 +3542,37 @@ fn bindgen_test_layout__fpx_sw_bytes() {
     assert_eq!(
         ::std::mem::size_of::<_fpx_sw_bytes>(),
         48usize,
-        concat!("Size of: ", stringify!(_fpx_sw_bytes))
+        "Size of _fpx_sw_bytes"
     );
     assert_eq!(
         ::std::mem::align_of::<_fpx_sw_bytes>(),
         4usize,
-        concat!("Alignment of ", stringify!(_fpx_sw_bytes))
+        "Alignment of _fpx_sw_bytes"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).magic1) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpx_sw_bytes),
-            "::",
-            stringify!(magic1)
-        )
+        "Offset of field: _fpx_sw_bytes::magic1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).extended_size) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpx_sw_bytes),
-            "::",
-            stringify!(extended_size)
-        )
+        "Offset of field: _fpx_sw_bytes::extended_size"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xfeatures) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpx_sw_bytes),
-            "::",
-            stringify!(xfeatures)
-        )
+        "Offset of field: _fpx_sw_bytes::xfeatures"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xstate_size) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpx_sw_bytes),
-            "::",
-            stringify!(xstate_size)
-        )
+        "Offset of field: _fpx_sw_bytes::xstate_size"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpx_sw_bytes),
-            "::",
-            stringify!(padding)
-        )
+        "Offset of field: _fpx_sw_bytes::padding"
     );
 }
 #[repr(C)]
@@ -3878,35 +3585,21 @@ pub struct _fpreg {
 fn bindgen_test_layout__fpreg() {
     const UNINIT: ::std::mem::MaybeUninit<_fpreg> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<_fpreg>(),
-        10usize,
-        concat!("Size of: ", stringify!(_fpreg))
-    );
+    assert_eq!(::std::mem::size_of::<_fpreg>(), 10usize, "Size of _fpreg");
     assert_eq!(
         ::std::mem::align_of::<_fpreg>(),
         2usize,
-        concat!("Alignment of ", stringify!(_fpreg))
+        "Alignment of _fpreg"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).significand) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpreg),
-            "::",
-            stringify!(significand)
-        )
+        "Offset of field: _fpreg::significand"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).exponent) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpreg),
-            "::",
-            stringify!(exponent)
-        )
+        "Offset of field: _fpreg::exponent"
     );
 }
 #[repr(C)]
@@ -3920,45 +3613,26 @@ pub struct _fpxreg {
 fn bindgen_test_layout__fpxreg() {
     const UNINIT: ::std::mem::MaybeUninit<_fpxreg> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<_fpxreg>(),
-        16usize,
-        concat!("Size of: ", stringify!(_fpxreg))
-    );
+    assert_eq!(::std::mem::size_of::<_fpxreg>(), 16usize, "Size of _fpxreg");
     assert_eq!(
         ::std::mem::align_of::<_fpxreg>(),
         2usize,
-        concat!("Alignment of ", stringify!(_fpxreg))
+        "Alignment of _fpxreg"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).significand) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpxreg),
-            "::",
-            stringify!(significand)
-        )
+        "Offset of field: _fpxreg::significand"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).exponent) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpxreg),
-            "::",
-            stringify!(exponent)
-        )
+        "Offset of field: _fpxreg::exponent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         10usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpxreg),
-            "::",
-            stringify!(padding)
-        )
+        "Offset of field: _fpxreg::padding"
     );
 }
 #[repr(C)]
@@ -3970,25 +3644,16 @@ pub struct _xmmreg {
 fn bindgen_test_layout__xmmreg() {
     const UNINIT: ::std::mem::MaybeUninit<_xmmreg> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<_xmmreg>(),
-        16usize,
-        concat!("Size of: ", stringify!(_xmmreg))
-    );
+    assert_eq!(::std::mem::size_of::<_xmmreg>(), 16usize, "Size of _xmmreg");
     assert_eq!(
         ::std::mem::align_of::<_xmmreg>(),
         4usize,
-        concat!("Alignment of ", stringify!(_xmmreg))
+        "Alignment of _xmmreg"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).element) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_xmmreg),
-            "::",
-            stringify!(element)
-        )
+        "Offset of field: _xmmreg::element"
     );
 }
 #[repr(C)]
@@ -4026,32 +3691,22 @@ fn bindgen_test_layout__fpstate_32__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<_fpstate_32__bindgen_ty_1>(),
         176usize,
-        concat!("Size of: ", stringify!(_fpstate_32__bindgen_ty_1))
+        "Size of _fpstate_32__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<_fpstate_32__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(_fpstate_32__bindgen_ty_1))
+        "Alignment of _fpstate_32__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).padding1) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32__bindgen_ty_1),
-            "::",
-            stringify!(padding1)
-        )
+        "Offset of field: _fpstate_32__bindgen_ty_1::padding1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32__bindgen_ty_1),
-            "::",
-            stringify!(padding)
-        )
+        "Offset of field: _fpstate_32__bindgen_ty_1::padding"
     );
 }
 #[repr(C)]
@@ -4068,32 +3723,22 @@ fn bindgen_test_layout__fpstate_32__bindgen_ty_2() {
     assert_eq!(
         ::std::mem::size_of::<_fpstate_32__bindgen_ty_2>(),
         48usize,
-        concat!("Size of: ", stringify!(_fpstate_32__bindgen_ty_2))
+        "Size of _fpstate_32__bindgen_ty_2"
     );
     assert_eq!(
         ::std::mem::align_of::<_fpstate_32__bindgen_ty_2>(),
         4usize,
-        concat!("Alignment of ", stringify!(_fpstate_32__bindgen_ty_2))
+        "Alignment of _fpstate_32__bindgen_ty_2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).padding2) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32__bindgen_ty_2),
-            "::",
-            stringify!(padding2)
-        )
+        "Offset of field: _fpstate_32__bindgen_ty_2::padding2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sw_reserved) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32__bindgen_ty_2),
-            "::",
-            stringify!(sw_reserved)
-        )
+        "Offset of field: _fpstate_32__bindgen_ty_2::sw_reserved"
     );
 }
 #[test]
@@ -4103,162 +3748,87 @@ fn bindgen_test_layout__fpstate_32() {
     assert_eq!(
         ::std::mem::size_of::<_fpstate_32>(),
         624usize,
-        concat!("Size of: ", stringify!(_fpstate_32))
+        "Size of _fpstate_32"
     );
     assert_eq!(
         ::std::mem::align_of::<_fpstate_32>(),
         4usize,
-        concat!("Alignment of ", stringify!(_fpstate_32))
+        "Alignment of _fpstate_32"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cw) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(cw)
-        )
+        "Offset of field: _fpstate_32::cw"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sw) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(sw)
-        )
+        "Offset of field: _fpstate_32::sw"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tag) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(tag)
-        )
+        "Offset of field: _fpstate_32::tag"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ipoff) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(ipoff)
-        )
+        "Offset of field: _fpstate_32::ipoff"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cssel) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(cssel)
-        )
+        "Offset of field: _fpstate_32::cssel"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).dataoff) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(dataoff)
-        )
+        "Offset of field: _fpstate_32::dataoff"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).datasel) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(datasel)
-        )
+        "Offset of field: _fpstate_32::datasel"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._st) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(_st)
-        )
+        "Offset of field: _fpstate_32::_st"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).status) as usize - ptr as usize },
         108usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(status)
-        )
+        "Offset of field: _fpstate_32::status"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).magic) as usize - ptr as usize },
         110usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(magic)
-        )
+        "Offset of field: _fpstate_32::magic"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._fxsr_env) as usize - ptr as usize },
         112usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(_fxsr_env)
-        )
+        "Offset of field: _fpstate_32::_fxsr_env"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).mxcsr) as usize - ptr as usize },
         136usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(mxcsr)
-        )
+        "Offset of field: _fpstate_32::mxcsr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved) as usize - ptr as usize },
         140usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(reserved)
-        )
+        "Offset of field: _fpstate_32::reserved"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._fxsr_st) as usize - ptr as usize },
         144usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(_fxsr_st)
-        )
+        "Offset of field: _fpstate_32::_fxsr_st"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._xmm) as usize - ptr as usize },
         272usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(_xmm)
-        )
+        "Offset of field: _fpstate_32::_xmm"
     );
 }
 #[repr(C)]
@@ -4291,32 +3861,22 @@ fn bindgen_test_layout__fpstate_64__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<_fpstate_64__bindgen_ty_1>(),
         48usize,
-        concat!("Size of: ", stringify!(_fpstate_64__bindgen_ty_1))
+        "Size of _fpstate_64__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<_fpstate_64__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(_fpstate_64__bindgen_ty_1))
+        "Alignment of _fpstate_64__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved3) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64__bindgen_ty_1),
-            "::",
-            stringify!(reserved3)
-        )
+        "Offset of field: _fpstate_64__bindgen_ty_1::reserved3"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sw_reserved) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64__bindgen_ty_1),
-            "::",
-            stringify!(sw_reserved)
-        )
+        "Offset of field: _fpstate_64__bindgen_ty_1::sw_reserved"
     );
 }
 #[test]
@@ -4326,122 +3886,67 @@ fn bindgen_test_layout__fpstate_64() {
     assert_eq!(
         ::std::mem::size_of::<_fpstate_64>(),
         512usize,
-        concat!("Size of: ", stringify!(_fpstate_64))
+        "Size of _fpstate_64"
     );
     assert_eq!(
         ::std::mem::align_of::<_fpstate_64>(),
         4usize,
-        concat!("Alignment of ", stringify!(_fpstate_64))
+        "Alignment of _fpstate_64"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cwd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(cwd)
-        )
+        "Offset of field: _fpstate_64::cwd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).swd) as usize - ptr as usize },
         2usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(swd)
-        )
+        "Offset of field: _fpstate_64::swd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).twd) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(twd)
-        )
+        "Offset of field: _fpstate_64::twd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fop) as usize - ptr as usize },
         6usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(fop)
-        )
+        "Offset of field: _fpstate_64::fop"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rip) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(rip)
-        )
+        "Offset of field: _fpstate_64::rip"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rdp) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(rdp)
-        )
+        "Offset of field: _fpstate_64::rdp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).mxcsr) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(mxcsr)
-        )
+        "Offset of field: _fpstate_64::mxcsr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).mxcsr_mask) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(mxcsr_mask)
-        )
+        "Offset of field: _fpstate_64::mxcsr_mask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).st_space) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(st_space)
-        )
+        "Offset of field: _fpstate_64::st_space"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xmm_space) as usize - ptr as usize },
         160usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(xmm_space)
-        )
+        "Offset of field: _fpstate_64::xmm_space"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved2) as usize - ptr as usize },
         416usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(reserved2)
-        )
+        "Offset of field: _fpstate_64::reserved2"
     );
 }
 #[repr(C)]
@@ -4455,45 +3960,26 @@ pub struct _header {
 fn bindgen_test_layout__header() {
     const UNINIT: ::std::mem::MaybeUninit<_header> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<_header>(),
-        64usize,
-        concat!("Size of: ", stringify!(_header))
-    );
+    assert_eq!(::std::mem::size_of::<_header>(), 64usize, "Size of _header");
     assert_eq!(
         ::std::mem::align_of::<_header>(),
         4usize,
-        concat!("Alignment of ", stringify!(_header))
+        "Alignment of _header"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xfeatures) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_header),
-            "::",
-            stringify!(xfeatures)
-        )
+        "Offset of field: _header::xfeatures"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved1) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_header),
-            "::",
-            stringify!(reserved1)
-        )
+        "Offset of field: _header::reserved1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved2) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_header),
-            "::",
-            stringify!(reserved2)
-        )
+        "Offset of field: _header::reserved2"
     );
 }
 #[repr(C)]
@@ -4508,22 +3994,17 @@ fn bindgen_test_layout__ymmh_state() {
     assert_eq!(
         ::std::mem::size_of::<_ymmh_state>(),
         256usize,
-        concat!("Size of: ", stringify!(_ymmh_state))
+        "Size of _ymmh_state"
     );
     assert_eq!(
         ::std::mem::align_of::<_ymmh_state>(),
         4usize,
-        concat!("Alignment of ", stringify!(_ymmh_state))
+        "Alignment of _ymmh_state"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ymmh_space) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_ymmh_state),
-            "::",
-            stringify!(ymmh_space)
-        )
+        "Offset of field: _ymmh_state::ymmh_space"
     );
 }
 #[repr(C)]
@@ -4540,42 +4021,27 @@ fn bindgen_test_layout__xstate() {
     assert_eq!(
         ::std::mem::size_of::<_xstate>(),
         944usize,
-        concat!("Size of: ", stringify!(_xstate))
+        "Size of _xstate"
     );
     assert_eq!(
         ::std::mem::align_of::<_xstate>(),
         4usize,
-        concat!("Alignment of ", stringify!(_xstate))
+        "Alignment of _xstate"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_xstate),
-            "::",
-            stringify!(fpstate)
-        )
+        "Offset of field: _xstate::fpstate"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xstate_hdr) as usize - ptr as usize },
         624usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_xstate),
-            "::",
-            stringify!(xstate_hdr)
-        )
+        "Offset of field: _xstate::xstate_hdr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ymmh) as usize - ptr as usize },
         688usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_xstate),
-            "::",
-            stringify!(ymmh)
-        )
+        "Offset of field: _xstate::ymmh"
     );
 }
 #[repr(C)]
@@ -4617,292 +4083,152 @@ fn bindgen_test_layout_sigcontext_32() {
     assert_eq!(
         ::std::mem::size_of::<sigcontext_32>(),
         88usize,
-        concat!("Size of: ", stringify!(sigcontext_32))
+        "Size of sigcontext_32"
     );
     assert_eq!(
         ::std::mem::align_of::<sigcontext_32>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigcontext_32))
+        "Alignment of sigcontext_32"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).gs) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(gs)
-        )
+        "Offset of field: sigcontext_32::gs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__gsh) as usize - ptr as usize },
         2usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(__gsh)
-        )
+        "Offset of field: sigcontext_32::__gsh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fs) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(fs)
-        )
+        "Offset of field: sigcontext_32::fs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__fsh) as usize - ptr as usize },
         6usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(__fsh)
-        )
+        "Offset of field: sigcontext_32::__fsh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).es) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(es)
-        )
+        "Offset of field: sigcontext_32::es"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__esh) as usize - ptr as usize },
         10usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(__esh)
-        )
+        "Offset of field: sigcontext_32::__esh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ds) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(ds)
-        )
+        "Offset of field: sigcontext_32::ds"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__dsh) as usize - ptr as usize },
         14usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(__dsh)
-        )
+        "Offset of field: sigcontext_32::__dsh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).di) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(di)
-        )
+        "Offset of field: sigcontext_32::di"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(si)
-        )
+        "Offset of field: sigcontext_32::si"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).bp) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(bp)
-        )
+        "Offset of field: sigcontext_32::bp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sp) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(sp)
-        )
+        "Offset of field: sigcontext_32::sp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).bx) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(bx)
-        )
+        "Offset of field: sigcontext_32::bx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).dx) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(dx)
-        )
+        "Offset of field: sigcontext_32::dx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cx) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(cx)
-        )
+        "Offset of field: sigcontext_32::cx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ax) as usize - ptr as usize },
         44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(ax)
-        )
+        "Offset of field: sigcontext_32::ax"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).trapno) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(trapno)
-        )
+        "Offset of field: sigcontext_32::trapno"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).err) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(err)
-        )
+        "Offset of field: sigcontext_32::err"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ip) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(ip)
-        )
+        "Offset of field: sigcontext_32::ip"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cs) as usize - ptr as usize },
         60usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(cs)
-        )
+        "Offset of field: sigcontext_32::cs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__csh) as usize - ptr as usize },
         62usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(__csh)
-        )
+        "Offset of field: sigcontext_32::__csh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: sigcontext_32::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sp_at_signal) as usize - ptr as usize },
         68usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(sp_at_signal)
-        )
+        "Offset of field: sigcontext_32::sp_at_signal"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(ss)
-        )
+        "Offset of field: sigcontext_32::ss"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__ssh) as usize - ptr as usize },
         74usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(__ssh)
-        )
+        "Offset of field: sigcontext_32::__ssh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         76usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(fpstate)
-        )
+        "Offset of field: sigcontext_32::fpstate"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(oldmask)
-        )
+        "Offset of field: sigcontext_32::oldmask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cr2) as usize - ptr as usize },
         84usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(cr2)
-        )
+        "Offset of field: sigcontext_32::cr2"
     );
 }
 #[repr(C)]
@@ -4944,292 +4270,152 @@ fn bindgen_test_layout_sigcontext_64() {
     assert_eq!(
         ::std::mem::size_of::<sigcontext_64>(),
         256usize,
-        concat!("Size of: ", stringify!(sigcontext_64))
+        "Size of sigcontext_64"
     );
     assert_eq!(
         ::std::mem::align_of::<sigcontext_64>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigcontext_64))
+        "Alignment of sigcontext_64"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r8) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r8)
-        )
+        "Offset of field: sigcontext_64::r8"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r9) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r9)
-        )
+        "Offset of field: sigcontext_64::r9"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r10) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r10)
-        )
+        "Offset of field: sigcontext_64::r10"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r11) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r11)
-        )
+        "Offset of field: sigcontext_64::r11"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r12) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r12)
-        )
+        "Offset of field: sigcontext_64::r12"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r13) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r13)
-        )
+        "Offset of field: sigcontext_64::r13"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r14) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r14)
-        )
+        "Offset of field: sigcontext_64::r14"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r15) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r15)
-        )
+        "Offset of field: sigcontext_64::r15"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).di) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(di)
-        )
+        "Offset of field: sigcontext_64::di"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(si)
-        )
+        "Offset of field: sigcontext_64::si"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).bp) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(bp)
-        )
+        "Offset of field: sigcontext_64::bp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).bx) as usize - ptr as usize },
         88usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(bx)
-        )
+        "Offset of field: sigcontext_64::bx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).dx) as usize - ptr as usize },
         96usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(dx)
-        )
+        "Offset of field: sigcontext_64::dx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ax) as usize - ptr as usize },
         104usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(ax)
-        )
+        "Offset of field: sigcontext_64::ax"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cx) as usize - ptr as usize },
         112usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(cx)
-        )
+        "Offset of field: sigcontext_64::cx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sp) as usize - ptr as usize },
         120usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(sp)
-        )
+        "Offset of field: sigcontext_64::sp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ip) as usize - ptr as usize },
         128usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(ip)
-        )
+        "Offset of field: sigcontext_64::ip"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         136usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: sigcontext_64::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cs) as usize - ptr as usize },
         144usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(cs)
-        )
+        "Offset of field: sigcontext_64::cs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).gs) as usize - ptr as usize },
         146usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(gs)
-        )
+        "Offset of field: sigcontext_64::gs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fs) as usize - ptr as usize },
         148usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(fs)
-        )
+        "Offset of field: sigcontext_64::fs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss) as usize - ptr as usize },
         150usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(ss)
-        )
+        "Offset of field: sigcontext_64::ss"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).err) as usize - ptr as usize },
         152usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(err)
-        )
+        "Offset of field: sigcontext_64::err"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).trapno) as usize - ptr as usize },
         160usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(trapno)
-        )
+        "Offset of field: sigcontext_64::trapno"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         168usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(oldmask)
-        )
+        "Offset of field: sigcontext_64::oldmask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cr2) as usize - ptr as usize },
         176usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(cr2)
-        )
+        "Offset of field: sigcontext_64::cr2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         184usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(fpstate)
-        )
+        "Offset of field: sigcontext_64::fpstate"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved1) as usize - ptr as usize },
         192usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(reserved1)
-        )
+        "Offset of field: sigcontext_64::reserved1"
     );
 }
 #[repr(C)]
@@ -5271,292 +4457,183 @@ fn bindgen_test_layout_sigcontext() {
     assert_eq!(
         ::std::mem::size_of::<sigcontext>(),
         88usize,
-        concat!("Size of: ", stringify!(sigcontext))
+        "Size of sigcontext"
     );
     assert_eq!(
         ::std::mem::align_of::<sigcontext>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigcontext))
+        "Alignment of sigcontext"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).gs) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(gs)
-        )
+        "Offset of field: sigcontext::gs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__gsh) as usize - ptr as usize },
         2usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(__gsh)
-        )
+        "Offset of field: sigcontext::__gsh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fs) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(fs)
-        )
+        "Offset of field: sigcontext::fs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__fsh) as usize - ptr as usize },
         6usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(__fsh)
-        )
+        "Offset of field: sigcontext::__fsh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).es) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(es)
-        )
+        "Offset of field: sigcontext::es"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__esh) as usize - ptr as usize },
         10usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(__esh)
-        )
+        "Offset of field: sigcontext::__esh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ds) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(ds)
-        )
+        "Offset of field: sigcontext::ds"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__dsh) as usize - ptr as usize },
         14usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(__dsh)
-        )
+        "Offset of field: sigcontext::__dsh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).edi) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(edi)
-        )
+        "Offset of field: sigcontext::edi"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).esi) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(esi)
-        )
+        "Offset of field: sigcontext::esi"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ebp) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(ebp)
-        )
+        "Offset of field: sigcontext::ebp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).esp) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(esp)
-        )
+        "Offset of field: sigcontext::esp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ebx) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(ebx)
-        )
+        "Offset of field: sigcontext::ebx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).edx) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(edx)
-        )
+        "Offset of field: sigcontext::edx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ecx) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(ecx)
-        )
+        "Offset of field: sigcontext::ecx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eax) as usize - ptr as usize },
         44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(eax)
-        )
+        "Offset of field: sigcontext::eax"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).trapno) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(trapno)
-        )
+        "Offset of field: sigcontext::trapno"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).err) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(err)
-        )
+        "Offset of field: sigcontext::err"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eip) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(eip)
-        )
+        "Offset of field: sigcontext::eip"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cs) as usize - ptr as usize },
         60usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(cs)
-        )
+        "Offset of field: sigcontext::cs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__csh) as usize - ptr as usize },
         62usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(__csh)
-        )
+        "Offset of field: sigcontext::__csh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eflags) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(eflags)
-        )
+        "Offset of field: sigcontext::eflags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).esp_at_signal) as usize - ptr as usize },
         68usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(esp_at_signal)
-        )
+        "Offset of field: sigcontext::esp_at_signal"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(ss)
-        )
+        "Offset of field: sigcontext::ss"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__ssh) as usize - ptr as usize },
         74usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(__ssh)
-        )
+        "Offset of field: sigcontext::__ssh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         76usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(fpstate)
-        )
+        "Offset of field: sigcontext::fpstate"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(oldmask)
-        )
+        "Offset of field: sigcontext::oldmask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cr2) as usize - ptr as usize },
         84usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(cr2)
-        )
+        "Offset of field: sigcontext::cr2"
+    );
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct timespec {
+    pub tv_sec: time_t,
+    pub tv_nsec: ::std::os::raw::c_long,
+}
+#[test]
+fn bindgen_test_layout_timespec() {
+    const UNINIT: ::std::mem::MaybeUninit<timespec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<timespec>(),
+        8usize,
+        "Size of timespec"
+    );
+    assert_eq!(
+        ::std::mem::align_of::<timespec>(),
+        4usize,
+        "Alignment of timespec"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
+        0usize,
+        "Offset of field: timespec::tv_sec"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
+        4usize,
+        "Offset of field: timespec::tv_nsec"
     );
 }
 #[repr(C)]
@@ -5572,32 +4649,22 @@ fn bindgen_test_layout___kernel_timespec() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_timespec>(),
         16usize,
-        concat!("Size of: ", stringify!(__kernel_timespec))
+        "Size of __kernel_timespec"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_timespec>(),
         4usize,
-        concat!("Alignment of ", stringify!(__kernel_timespec))
+        "Alignment of __kernel_timespec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_timespec),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: __kernel_timespec::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_timespec),
-            "::",
-            stringify!(tv_nsec)
-        )
+        "Offset of field: __kernel_timespec::tv_nsec"
     );
 }
 #[repr(C)]
@@ -5613,32 +4680,22 @@ fn bindgen_test_layout___kernel_itimerspec() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_itimerspec>(),
         32usize,
-        concat!("Size of: ", stringify!(__kernel_itimerspec))
+        "Size of __kernel_itimerspec"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_itimerspec>(),
         4usize,
-        concat!("Alignment of ", stringify!(__kernel_itimerspec))
+        "Alignment of __kernel_itimerspec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_itimerspec),
-            "::",
-            stringify!(it_interval)
-        )
+        "Offset of field: __kernel_itimerspec::it_interval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_itimerspec),
-            "::",
-            stringify!(it_value)
-        )
+        "Offset of field: __kernel_itimerspec::it_value"
     );
 }
 #[repr(C)]
@@ -5655,32 +4712,22 @@ fn bindgen_test_layout___kernel_old_timespec() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_old_timespec>(),
         8usize,
-        concat!("Size of: ", stringify!(__kernel_old_timespec))
+        "Size of __kernel_old_timespec"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_old_timespec>(),
         4usize,
-        concat!("Alignment of ", stringify!(__kernel_old_timespec))
+        "Alignment of __kernel_old_timespec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_old_timespec),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: __kernel_old_timespec::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_old_timespec),
-            "::",
-            stringify!(tv_nsec)
-        )
+        "Offset of field: __kernel_old_timespec::tv_nsec"
     );
 }
 #[repr(C)]
@@ -5697,73 +4744,22 @@ fn bindgen_test_layout___kernel_sock_timeval() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_sock_timeval>(),
         16usize,
-        concat!("Size of: ", stringify!(__kernel_sock_timeval))
+        "Size of __kernel_sock_timeval"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_sock_timeval>(),
         4usize,
-        concat!("Alignment of ", stringify!(__kernel_sock_timeval))
+        "Alignment of __kernel_sock_timeval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sock_timeval),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: __kernel_sock_timeval::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sock_timeval),
-            "::",
-            stringify!(tv_usec)
-        )
-    );
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct timespec {
-    pub tv_sec: __kernel_old_time_t,
-    pub tv_nsec: ::std::os::raw::c_long,
-}
-#[test]
-fn bindgen_test_layout_timespec() {
-    const UNINIT: ::std::mem::MaybeUninit<timespec> = ::std::mem::MaybeUninit::uninit();
-    let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<timespec>(),
-        8usize,
-        concat!("Size of: ", stringify!(timespec))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<timespec>(),
-        4usize,
-        concat!("Alignment of ", stringify!(timespec))
-    );
-    assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timespec),
-            "::",
-            stringify!(tv_sec)
-        )
-    );
-    assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timespec),
-            "::",
-            stringify!(tv_nsec)
-        )
+        "Offset of field: __kernel_sock_timeval::tv_usec"
     );
 }
 #[repr(C)]
@@ -5776,35 +4772,21 @@ pub struct timeval {
 fn bindgen_test_layout_timeval() {
     const UNINIT: ::std::mem::MaybeUninit<timeval> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<timeval>(),
-        8usize,
-        concat!("Size of: ", stringify!(timeval))
-    );
+    assert_eq!(::std::mem::size_of::<timeval>(), 8usize, "Size of timeval");
     assert_eq!(
         ::std::mem::align_of::<timeval>(),
         4usize,
-        concat!("Alignment of ", stringify!(timeval))
+        "Alignment of timeval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timeval),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: timeval::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timeval),
-            "::",
-            stringify!(tv_usec)
-        )
+        "Offset of field: timeval::tv_usec"
     );
 }
 #[repr(C)]
@@ -5820,32 +4802,22 @@ fn bindgen_test_layout_itimerspec() {
     assert_eq!(
         ::std::mem::size_of::<itimerspec>(),
         16usize,
-        concat!("Size of: ", stringify!(itimerspec))
+        "Size of itimerspec"
     );
     assert_eq!(
         ::std::mem::align_of::<itimerspec>(),
         4usize,
-        concat!("Alignment of ", stringify!(itimerspec))
+        "Alignment of itimerspec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerspec),
-            "::",
-            stringify!(it_interval)
-        )
+        "Offset of field: itimerspec::it_interval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerspec),
-            "::",
-            stringify!(it_value)
-        )
+        "Offset of field: itimerspec::it_value"
     );
 }
 #[repr(C)]
@@ -5861,32 +4833,22 @@ fn bindgen_test_layout_itimerval() {
     assert_eq!(
         ::std::mem::size_of::<itimerval>(),
         16usize,
-        concat!("Size of: ", stringify!(itimerval))
+        "Size of itimerval"
     );
     assert_eq!(
         ::std::mem::align_of::<itimerval>(),
         4usize,
-        concat!("Alignment of ", stringify!(itimerval))
+        "Alignment of itimerval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerval),
-            "::",
-            stringify!(it_interval)
-        )
+        "Offset of field: itimerval::it_interval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerval),
-            "::",
-            stringify!(it_value)
-        )
+        "Offset of field: itimerval::it_value"
     );
 }
 #[repr(C)]
@@ -5902,32 +4864,22 @@ fn bindgen_test_layout_timezone() {
     assert_eq!(
         ::std::mem::size_of::<timezone>(),
         8usize,
-        concat!("Size of: ", stringify!(timezone))
+        "Size of timezone"
     );
     assert_eq!(
         ::std::mem::align_of::<timezone>(),
         4usize,
-        concat!("Alignment of ", stringify!(timezone))
+        "Alignment of timezone"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tz_minuteswest) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_minuteswest)
-        )
+        "Offset of field: timezone::tz_minuteswest"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tz_dsttime) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_dsttime)
-        )
+        "Offset of field: timezone::tz_dsttime"
     );
 }
 pub type sigset_t = ::std::os::raw::c_ulong;
@@ -5963,35 +4915,22 @@ fn bindgen_test_layout___kernel_sigaction__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_sigaction__bindgen_ty_1>(),
         4usize,
-        concat!("Size of: ", stringify!(__kernel_sigaction__bindgen_ty_1))
+        "Size of __kernel_sigaction__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_sigaction__bindgen_ty_1>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__kernel_sigaction__bindgen_ty_1)
-        )
+        "Alignment of __kernel_sigaction__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sa_handler) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction__bindgen_ty_1),
-            "::",
-            stringify!(_sa_handler)
-        )
+        "Offset of field: __kernel_sigaction__bindgen_ty_1::_sa_handler"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sa_sigaction) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction__bindgen_ty_1),
-            "::",
-            stringify!(_sa_sigaction)
-        )
+        "Offset of field: __kernel_sigaction__bindgen_ty_1::_sa_sigaction"
     );
 }
 #[test]
@@ -6001,52 +4940,32 @@ fn bindgen_test_layout___kernel_sigaction() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_sigaction>(),
         16usize,
-        concat!("Size of: ", stringify!(__kernel_sigaction))
+        "Size of __kernel_sigaction"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_sigaction>(),
         4usize,
-        concat!("Alignment of ", stringify!(__kernel_sigaction))
+        "Alignment of __kernel_sigaction"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._u) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(_u)
-        )
+        "Offset of field: __kernel_sigaction::_u"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(sa_mask)
-        )
+        "Offset of field: __kernel_sigaction::sa_mask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(sa_flags)
-        )
+        "Offset of field: __kernel_sigaction::sa_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(sa_restorer)
-        )
+        "Offset of field: __kernel_sigaction::sa_restorer"
     );
 }
 #[repr(C)]
@@ -6063,42 +4982,27 @@ fn bindgen_test_layout_sigaltstack() {
     assert_eq!(
         ::std::mem::size_of::<sigaltstack>(),
         12usize,
-        concat!("Size of: ", stringify!(sigaltstack))
+        "Size of sigaltstack"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaltstack>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigaltstack))
+        "Alignment of sigaltstack"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss_sp) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaltstack),
-            "::",
-            stringify!(ss_sp)
-        )
+        "Offset of field: sigaltstack::ss_sp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss_flags) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaltstack),
-            "::",
-            stringify!(ss_flags)
-        )
+        "Offset of field: sigaltstack::ss_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss_size) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaltstack),
-            "::",
-            stringify!(ss_size)
-        )
+        "Offset of field: sigaltstack::ss_size"
     );
 }
 pub type stack_t = sigaltstack;
@@ -6112,35 +5016,21 @@ pub union sigval {
 fn bindgen_test_layout_sigval() {
     const UNINIT: ::std::mem::MaybeUninit<sigval> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<sigval>(),
-        4usize,
-        concat!("Size of: ", stringify!(sigval))
-    );
+    assert_eq!(::std::mem::size_of::<sigval>(), 4usize, "Size of sigval");
     assert_eq!(
         ::std::mem::align_of::<sigval>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigval))
+        "Alignment of sigval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sival_int) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigval),
-            "::",
-            stringify!(sival_int)
-        )
+        "Offset of field: sigval::sival_int"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sival_ptr) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigval),
-            "::",
-            stringify!(sival_ptr)
-        )
+        "Offset of field: sigval::sival_ptr"
     );
 }
 pub type sigval_t = sigval;
@@ -6169,32 +5059,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_1>(),
         8usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_1))
+        "Size of __sifields__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_1))
+        "Alignment of __sifields__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_1),
-            "::",
-            stringify!(_pid)
-        )
+        "Offset of field: __sifields__bindgen_ty_1::_pid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_1),
-            "::",
-            stringify!(_uid)
-        )
+        "Offset of field: __sifields__bindgen_ty_1::_uid"
     );
 }
 #[repr(C)]
@@ -6213,52 +5093,32 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_2>(),
         16usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_2))
+        "Size of __sifields__bindgen_ty_2"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_2>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_2))
+        "Alignment of __sifields__bindgen_ty_2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_tid)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._overrun) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_overrun)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_overrun"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_sigval)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_sigval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sys_private) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_sys_private)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_sys_private"
     );
 }
 #[repr(C)]
@@ -6276,42 +5136,27 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_3>(),
         12usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_3))
+        "Size of __sifields__bindgen_ty_3"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_3>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_3))
+        "Alignment of __sifields__bindgen_ty_3"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_3),
-            "::",
-            stringify!(_pid)
-        )
+        "Offset of field: __sifields__bindgen_ty_3::_pid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_3),
-            "::",
-            stringify!(_uid)
-        )
+        "Offset of field: __sifields__bindgen_ty_3::_uid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_3),
-            "::",
-            stringify!(_sigval)
-        )
+        "Offset of field: __sifields__bindgen_ty_3::_sigval"
     );
 }
 #[repr(C)]
@@ -6331,62 +5176,37 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_4>(),
         20usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_4))
+        "Size of __sifields__bindgen_ty_4"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_4>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_4))
+        "Alignment of __sifields__bindgen_ty_4"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_pid)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_pid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_uid)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_uid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._status) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_status)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_status"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._utime) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_utime)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_utime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._stime) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_stime)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_stime"
     );
 }
 #[repr(C)]
@@ -6419,48 +5239,27 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>(),
         12usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._dummy_bnd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_dummy_bnd)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1::_dummy_bnd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._lower) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_lower)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1::_lower"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._upper) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_upper)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1::_upper"
     );
 }
 #[repr(C)]
@@ -6477,38 +5276,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>(),
         8usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2)
-        )
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._dummy_pkey) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2),
-            "::",
-            stringify!(_dummy_pkey)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2::_dummy_pkey"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pkey) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2),
-            "::",
-            stringify!(_pkey)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2::_pkey"
     );
 }
 #[repr(C)]
@@ -6516,6 +5299,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
 pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3 {
     pub _data: ::std::os::raw::c_ulong,
     pub _type: __u32,
+    pub _flags: __u32,
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3() {
@@ -6524,39 +5308,28 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3() {
     let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
-        8usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
-        )
+        12usize,
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._data) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
-            "::",
-            stringify!(_data)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3::_data"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._type) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
-            "::",
-            stringify!(_type)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3::_type"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._flags) as usize - ptr as usize },
+        8usize,
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3::_flags"
     );
 }
 #[test]
@@ -6567,68 +5340,37 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1>(),
         12usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1)
-        )
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._trapno) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_trapno)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_trapno"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr_lsb) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_addr_lsb)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_addr_lsb"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr_bnd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_addr_bnd)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_addr_bnd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr_pkey) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_addr_pkey)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_addr_pkey"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._perf) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_perf)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_perf"
     );
 }
 #[test]
@@ -6639,22 +5381,17 @@ fn bindgen_test_layout___sifields__bindgen_ty_5() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5>(),
         16usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_5))
+        "Size of __sifields__bindgen_ty_5"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_5))
+        "Alignment of __sifields__bindgen_ty_5"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5),
-            "::",
-            stringify!(_addr)
-        )
+        "Offset of field: __sifields__bindgen_ty_5::_addr"
     );
 }
 #[repr(C)]
@@ -6671,32 +5408,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_6() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_6>(),
         8usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_6))
+        "Size of __sifields__bindgen_ty_6"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_6>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_6))
+        "Alignment of __sifields__bindgen_ty_6"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._band) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_6),
-            "::",
-            stringify!(_band)
-        )
+        "Offset of field: __sifields__bindgen_ty_6::_band"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._fd) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_6),
-            "::",
-            stringify!(_fd)
-        )
+        "Offset of field: __sifields__bindgen_ty_6::_fd"
     );
 }
 #[repr(C)]
@@ -6714,42 +5441,27 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_7>(),
         12usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_7))
+        "Size of __sifields__bindgen_ty_7"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_7>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_7))
+        "Alignment of __sifields__bindgen_ty_7"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._call_addr) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_7),
-            "::",
-            stringify!(_call_addr)
-        )
+        "Offset of field: __sifields__bindgen_ty_7::_call_addr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._syscall) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_7),
-            "::",
-            stringify!(_syscall)
-        )
+        "Offset of field: __sifields__bindgen_ty_7::_syscall"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._arch) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_7),
-            "::",
-            stringify!(_arch)
-        )
+        "Offset of field: __sifields__bindgen_ty_7::_arch"
     );
 }
 #[test]
@@ -6759,82 +5471,47 @@ fn bindgen_test_layout___sifields() {
     assert_eq!(
         ::std::mem::size_of::<__sifields>(),
         20usize,
-        concat!("Size of: ", stringify!(__sifields))
+        "Size of __sifields"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields))
+        "Alignment of __sifields"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._kill) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_kill)
-        )
+        "Offset of field: __sifields::_kill"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._timer) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_timer)
-        )
+        "Offset of field: __sifields::_timer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._rt) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_rt)
-        )
+        "Offset of field: __sifields::_rt"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigchld) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigchld)
-        )
+        "Offset of field: __sifields::_sigchld"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigfault) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigfault)
-        )
+        "Offset of field: __sifields::_sigfault"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigpoll) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigpoll)
-        )
+        "Offset of field: __sifields::_sigpoll"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigsys) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigsys)
-        )
+        "Offset of field: __sifields::_sigsys"
     );
 }
 #[repr(C)]
@@ -6864,55 +5541,32 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1__bindgen_ty_1>(),
         32usize,
-        concat!("Size of: ", stringify!(siginfo__bindgen_ty_1__bindgen_ty_1))
+        "Size of siginfo__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<siginfo__bindgen_ty_1__bindgen_ty_1>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Alignment of siginfo__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si_signo) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(si_signo)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::si_signo"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si_errno) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(si_errno)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::si_errno"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si_code) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(si_code)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::si_code"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sifields) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_sifields)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::_sifields"
     );
 }
 #[test]
@@ -6923,22 +5577,17 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1>(),
         128usize,
-        concat!("Size of: ", stringify!(siginfo__bindgen_ty_1))
+        "Size of siginfo__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<siginfo__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(siginfo__bindgen_ty_1))
+        "Alignment of siginfo__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._si_pad) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1),
-            "::",
-            stringify!(_si_pad)
-        )
+        "Offset of field: siginfo__bindgen_ty_1::_si_pad"
     );
 }
 #[test]
@@ -6946,12 +5595,12 @@ fn bindgen_test_layout_siginfo() {
     assert_eq!(
         ::std::mem::size_of::<siginfo>(),
         128usize,
-        concat!("Size of: ", stringify!(siginfo))
+        "Size of siginfo"
     );
     assert_eq!(
         ::std::mem::align_of::<siginfo>(),
         4usize,
-        concat!("Alignment of ", stringify!(siginfo))
+        "Alignment of siginfo"
     );
 }
 pub type siginfo_t = siginfo;
@@ -6984,38 +5633,22 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1__bindgen_ty_1>(),
         8usize,
-        concat!(
-            "Size of: ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Size of sigevent__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigevent__bindgen_ty_1__bindgen_ty_1>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Alignment of sigevent__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._function) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_function)
-        )
+        "Offset of field: sigevent__bindgen_ty_1__bindgen_ty_1::_function"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._attribute) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_attribute)
-        )
+        "Offset of field: sigevent__bindgen_ty_1__bindgen_ty_1::_attribute"
     );
 }
 #[test]
@@ -7026,42 +5659,27 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1>(),
         52usize,
-        concat!("Size of: ", stringify!(sigevent__bindgen_ty_1))
+        "Size of sigevent__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigevent__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigevent__bindgen_ty_1))
+        "Alignment of sigevent__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pad) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1),
-            "::",
-            stringify!(_pad)
-        )
+        "Offset of field: sigevent__bindgen_ty_1::_pad"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1),
-            "::",
-            stringify!(_tid)
-        )
+        "Offset of field: sigevent__bindgen_ty_1::_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigev_thread) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1),
-            "::",
-            stringify!(_sigev_thread)
-        )
+        "Offset of field: sigevent__bindgen_ty_1::_sigev_thread"
     );
 }
 #[test]
@@ -7071,52 +5689,32 @@ fn bindgen_test_layout_sigevent() {
     assert_eq!(
         ::std::mem::size_of::<sigevent>(),
         64usize,
-        concat!("Size of: ", stringify!(sigevent))
+        "Size of sigevent"
     );
     assert_eq!(
         ::std::mem::align_of::<sigevent>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigevent))
+        "Alignment of sigevent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sigev_value) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(sigev_value)
-        )
+        "Offset of field: sigevent::sigev_value"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sigev_signo) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(sigev_signo)
-        )
+        "Offset of field: sigevent::sigev_signo"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sigev_notify) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(sigev_notify)
-        )
+        "Offset of field: sigevent::sigev_notify"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigev_un) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(_sigev_un)
-        )
+        "Offset of field: sigevent::_sigev_un"
     );
 }
 pub type sigevent_t = sigevent;
@@ -7135,22 +5733,17 @@ fn bindgen_test_layout_sigset64_t() {
     assert_eq!(
         ::std::mem::size_of::<sigset64_t>(),
         8usize,
-        concat!("Size of: ", stringify!(sigset64_t))
+        "Size of sigset64_t"
     );
     assert_eq!(
         ::std::mem::align_of::<sigset64_t>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigset64_t))
+        "Alignment of sigset64_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__bits) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigset64_t),
-            "::",
-            stringify!(__bits)
-        )
+        "Offset of field: sigset64_t::__bits"
     );
 }
 #[repr(C)]
@@ -7181,32 +5774,22 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigaction__bindgen_ty_1>(),
         4usize,
-        concat!("Size of: ", stringify!(sigaction__bindgen_ty_1))
+        "Size of sigaction__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigaction__bindgen_ty_1))
+        "Alignment of sigaction__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction__bindgen_ty_1),
-            "::",
-            stringify!(sa_handler)
-        )
+        "Offset of field: sigaction__bindgen_ty_1::sa_handler"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction__bindgen_ty_1),
-            "::",
-            stringify!(sa_sigaction)
-        )
+        "Offset of field: sigaction__bindgen_ty_1::sa_sigaction"
     );
 }
 #[test]
@@ -7216,42 +5799,27 @@ fn bindgen_test_layout_sigaction() {
     assert_eq!(
         ::std::mem::size_of::<sigaction>(),
         16usize,
-        concat!("Size of: ", stringify!(sigaction))
+        "Size of sigaction"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigaction))
+        "Alignment of sigaction"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction),
-            "::",
-            stringify!(sa_mask)
-        )
+        "Offset of field: sigaction::sa_mask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction),
-            "::",
-            stringify!(sa_flags)
-        )
+        "Offset of field: sigaction::sa_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction),
-            "::",
-            stringify!(sa_restorer)
-        )
+        "Offset of field: sigaction::sa_restorer"
     );
 }
 #[repr(C)]
@@ -7282,32 +5850,22 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigaction64__bindgen_ty_1>(),
         4usize,
-        concat!("Size of: ", stringify!(sigaction64__bindgen_ty_1))
+        "Size of sigaction64__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction64__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigaction64__bindgen_ty_1))
+        "Alignment of sigaction64__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64__bindgen_ty_1),
-            "::",
-            stringify!(sa_handler)
-        )
+        "Offset of field: sigaction64__bindgen_ty_1::sa_handler"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64__bindgen_ty_1),
-            "::",
-            stringify!(sa_sigaction)
-        )
+        "Offset of field: sigaction64__bindgen_ty_1::sa_sigaction"
     );
 }
 #[test]
@@ -7317,42 +5875,27 @@ fn bindgen_test_layout_sigaction64() {
     assert_eq!(
         ::std::mem::size_of::<sigaction64>(),
         20usize,
-        concat!("Size of: ", stringify!(sigaction64))
+        "Size of sigaction64"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction64>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigaction64))
+        "Alignment of sigaction64"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64),
-            "::",
-            stringify!(sa_flags)
-        )
+        "Offset of field: sigaction64::sa_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64),
-            "::",
-            stringify!(sa_restorer)
-        )
+        "Offset of field: sigaction64::sa_restorer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64),
-            "::",
-            stringify!(sa_mask)
-        )
+        "Offset of field: sigaction64::sa_mask"
     );
 }
 #[repr(C)]
@@ -7374,92 +5917,52 @@ fn bindgen_test_layout_user_fpregs_struct() {
     assert_eq!(
         ::std::mem::size_of::<user_fpregs_struct>(),
         108usize,
-        concat!("Size of: ", stringify!(user_fpregs_struct))
+        "Size of user_fpregs_struct"
     );
     assert_eq!(
         ::std::mem::align_of::<user_fpregs_struct>(),
         4usize,
-        concat!("Alignment of ", stringify!(user_fpregs_struct))
+        "Alignment of user_fpregs_struct"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cwd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(cwd)
-        )
+        "Offset of field: user_fpregs_struct::cwd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).swd) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(swd)
-        )
+        "Offset of field: user_fpregs_struct::swd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).twd) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(twd)
-        )
+        "Offset of field: user_fpregs_struct::twd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fip) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(fip)
-        )
+        "Offset of field: user_fpregs_struct::fip"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fcs) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(fcs)
-        )
+        "Offset of field: user_fpregs_struct::fcs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(foo)
-        )
+        "Offset of field: user_fpregs_struct::foo"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fos) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(fos)
-        )
+        "Offset of field: user_fpregs_struct::fos"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).st_space) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(st_space)
-        )
+        "Offset of field: user_fpregs_struct::st_space"
     );
 }
 #[repr(C)]
@@ -7486,142 +5989,77 @@ fn bindgen_test_layout_user_fpxregs_struct() {
     assert_eq!(
         ::std::mem::size_of::<user_fpxregs_struct>(),
         512usize,
-        concat!("Size of: ", stringify!(user_fpxregs_struct))
+        "Size of user_fpxregs_struct"
     );
     assert_eq!(
         ::std::mem::align_of::<user_fpxregs_struct>(),
         4usize,
-        concat!("Alignment of ", stringify!(user_fpxregs_struct))
+        "Alignment of user_fpxregs_struct"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cwd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpxregs_struct),
-            "::",
-            stringify!(cwd)
-        )
+        "Offset of field: user_fpxregs_struct::cwd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).swd) as usize - ptr as usize },
         2usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpxregs_struct),
-            "::",
-            stringify!(swd)
-        )
+        "Offset of field: user_fpxregs_struct::swd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).twd) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpxregs_struct),
-            "::",
-            stringify!(twd)
-        )
+        "Offset of field: user_fpxregs_struct::twd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fop) as usize - ptr as usize },
         6usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpxregs_struct),
-            "::",
-            stringify!(fop)
-        )
+        "Offset of field: user_fpxregs_struct::fop"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fip) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpxregs_struct),
-            "::",
-            stringify!(fip)
-        )
+        "Offset of field: user_fpxregs_struct::fip"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fcs) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpxregs_struct),
-            "::",
-            stringify!(fcs)
-        )
+        "Offset of field: user_fpxregs_struct::fcs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpxregs_struct),
-            "::",
-            stringify!(foo)
-        )
+        "Offset of field: user_fpxregs_struct::foo"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fos) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpxregs_struct),
-            "::",
-            stringify!(fos)
-        )
+        "Offset of field: user_fpxregs_struct::fos"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).mxcsr) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpxregs_struct),
-            "::",
-            stringify!(mxcsr)
-        )
+        "Offset of field: user_fpxregs_struct::mxcsr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpxregs_struct),
-            "::",
-            stringify!(reserved)
-        )
+        "Offset of field: user_fpxregs_struct::reserved"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).st_space) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpxregs_struct),
-            "::",
-            stringify!(st_space)
-        )
+        "Offset of field: user_fpxregs_struct::st_space"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xmm_space) as usize - ptr as usize },
         160usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpxregs_struct),
-            "::",
-            stringify!(xmm_space)
-        )
+        "Offset of field: user_fpxregs_struct::xmm_space"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         288usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpxregs_struct),
-            "::",
-            stringify!(padding)
-        )
+        "Offset of field: user_fpxregs_struct::padding"
     );
 }
 #[repr(C)]
@@ -7652,182 +6090,97 @@ fn bindgen_test_layout_user_regs_struct() {
     assert_eq!(
         ::std::mem::size_of::<user_regs_struct>(),
         68usize,
-        concat!("Size of: ", stringify!(user_regs_struct))
+        "Size of user_regs_struct"
     );
     assert_eq!(
         ::std::mem::align_of::<user_regs_struct>(),
         4usize,
-        concat!("Alignment of ", stringify!(user_regs_struct))
+        "Alignment of user_regs_struct"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ebx) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(ebx)
-        )
+        "Offset of field: user_regs_struct::ebx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ecx) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(ecx)
-        )
+        "Offset of field: user_regs_struct::ecx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).edx) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(edx)
-        )
+        "Offset of field: user_regs_struct::edx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).esi) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(esi)
-        )
+        "Offset of field: user_regs_struct::esi"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).edi) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(edi)
-        )
+        "Offset of field: user_regs_struct::edi"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ebp) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(ebp)
-        )
+        "Offset of field: user_regs_struct::ebp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eax) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(eax)
-        )
+        "Offset of field: user_regs_struct::eax"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xds) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(xds)
-        )
+        "Offset of field: user_regs_struct::xds"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xes) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(xes)
-        )
+        "Offset of field: user_regs_struct::xes"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xfs) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(xfs)
-        )
+        "Offset of field: user_regs_struct::xfs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xgs) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(xgs)
-        )
+        "Offset of field: user_regs_struct::xgs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).orig_eax) as usize - ptr as usize },
         44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(orig_eax)
-        )
+        "Offset of field: user_regs_struct::orig_eax"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eip) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(eip)
-        )
+        "Offset of field: user_regs_struct::eip"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xcs) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(xcs)
-        )
+        "Offset of field: user_regs_struct::xcs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eflags) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(eflags)
-        )
+        "Offset of field: user_regs_struct::eflags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).esp) as usize - ptr as usize },
         60usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(esp)
-        )
+        "Offset of field: user_regs_struct::esp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xss) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(xss)
-        )
+        "Offset of field: user_regs_struct::xss"
     );
 }
 #[repr(C)]
@@ -7853,165 +6206,82 @@ pub struct user {
 fn bindgen_test_layout_user() {
     const UNINIT: ::std::mem::MaybeUninit<user> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<user>(),
-        284usize,
-        concat!("Size of: ", stringify!(user))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<user>(),
-        4usize,
-        concat!("Alignment of ", stringify!(user))
-    );
+    assert_eq!(::std::mem::size_of::<user>(), 284usize, "Size of user");
+    assert_eq!(::std::mem::align_of::<user>(), 4usize, "Alignment of user");
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).regs) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(regs)
-        )
+        "Offset of field: user::regs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_fpvalid) as usize - ptr as usize },
         68usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_fpvalid)
-        )
+        "Offset of field: user::u_fpvalid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).i387) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(i387)
-        )
+        "Offset of field: user::i387"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_tsize) as usize - ptr as usize },
         180usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_tsize)
-        )
+        "Offset of field: user::u_tsize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_dsize) as usize - ptr as usize },
         184usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_dsize)
-        )
+        "Offset of field: user::u_dsize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_ssize) as usize - ptr as usize },
         188usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_ssize)
-        )
+        "Offset of field: user::u_ssize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).start_code) as usize - ptr as usize },
         192usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(start_code)
-        )
+        "Offset of field: user::start_code"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).start_stack) as usize - ptr as usize },
         196usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(start_stack)
-        )
+        "Offset of field: user::start_stack"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).signal) as usize - ptr as usize },
         200usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(signal)
-        )
+        "Offset of field: user::signal"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved) as usize - ptr as usize },
         204usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(reserved)
-        )
+        "Offset of field: user::reserved"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_ar0) as usize - ptr as usize },
         208usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_ar0)
-        )
+        "Offset of field: user::u_ar0"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_fpstate) as usize - ptr as usize },
         212usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_fpstate)
-        )
+        "Offset of field: user::u_fpstate"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).magic) as usize - ptr as usize },
         216usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(magic)
-        )
+        "Offset of field: user::magic"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_comm) as usize - ptr as usize },
         220usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_comm)
-        )
+        "Offset of field: user::u_comm"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_debugreg) as usize - ptr as usize },
         252usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_debugreg)
-        )
+        "Offset of field: user::u_debugreg"
     );
 }
 pub const REG_GS: _bindgen_ty_22 = 0;
@@ -8050,32 +6320,22 @@ fn bindgen_test_layout__libc_fpreg() {
     assert_eq!(
         ::std::mem::size_of::<_libc_fpreg>(),
         10usize,
-        concat!("Size of: ", stringify!(_libc_fpreg))
+        "Size of _libc_fpreg"
     );
     assert_eq!(
         ::std::mem::align_of::<_libc_fpreg>(),
         2usize,
-        concat!("Alignment of ", stringify!(_libc_fpreg))
+        "Alignment of _libc_fpreg"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).significand) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpreg),
-            "::",
-            stringify!(significand)
-        )
+        "Offset of field: _libc_fpreg::significand"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).exponent) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpreg),
-            "::",
-            stringify!(exponent)
-        )
+        "Offset of field: _libc_fpreg::exponent"
     );
 }
 #[repr(C)]
@@ -8098,102 +6358,57 @@ fn bindgen_test_layout__libc_fpstate() {
     assert_eq!(
         ::std::mem::size_of::<_libc_fpstate>(),
         112usize,
-        concat!("Size of: ", stringify!(_libc_fpstate))
+        "Size of _libc_fpstate"
     );
     assert_eq!(
         ::std::mem::align_of::<_libc_fpstate>(),
         4usize,
-        concat!("Alignment of ", stringify!(_libc_fpstate))
+        "Alignment of _libc_fpstate"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cw) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(cw)
-        )
+        "Offset of field: _libc_fpstate::cw"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sw) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(sw)
-        )
+        "Offset of field: _libc_fpstate::sw"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tag) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(tag)
-        )
+        "Offset of field: _libc_fpstate::tag"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ipoff) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(ipoff)
-        )
+        "Offset of field: _libc_fpstate::ipoff"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cssel) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(cssel)
-        )
+        "Offset of field: _libc_fpstate::cssel"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).dataoff) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(dataoff)
-        )
+        "Offset of field: _libc_fpstate::dataoff"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).datasel) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(datasel)
-        )
+        "Offset of field: _libc_fpstate::datasel"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._st) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(_st)
-        )
+        "Offset of field: _libc_fpstate::_st"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).status) as usize - ptr as usize },
         108usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(status)
-        )
+        "Offset of field: _libc_fpstate::status"
     );
 }
 pub type fpregset_t = *mut _libc_fpstate;
@@ -8212,52 +6427,32 @@ fn bindgen_test_layout_mcontext_t() {
     assert_eq!(
         ::std::mem::size_of::<mcontext_t>(),
         88usize,
-        concat!("Size of: ", stringify!(mcontext_t))
+        "Size of mcontext_t"
     );
     assert_eq!(
         ::std::mem::align_of::<mcontext_t>(),
         4usize,
-        concat!("Alignment of ", stringify!(mcontext_t))
+        "Alignment of mcontext_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).gregs) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(mcontext_t),
-            "::",
-            stringify!(gregs)
-        )
+        "Offset of field: mcontext_t::gregs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpregs) as usize - ptr as usize },
         76usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(mcontext_t),
-            "::",
-            stringify!(fpregs)
-        )
+        "Offset of field: mcontext_t::fpregs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(mcontext_t),
-            "::",
-            stringify!(oldmask)
-        )
+        "Offset of field: mcontext_t::oldmask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cr2) as usize - ptr as usize },
         84usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(mcontext_t),
-            "::",
-            stringify!(cr2)
-        )
+        "Offset of field: mcontext_t::cr2"
     );
 }
 #[repr(C)]
@@ -8290,38 +6485,22 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<ucontext__bindgen_ty_1__bindgen_ty_1>(),
         8usize,
-        concat!(
-            "Size of: ",
-            stringify!(ucontext__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Size of ucontext__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<ucontext__bindgen_ty_1__bindgen_ty_1>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(ucontext__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Alignment of ucontext__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(uc_sigmask)
-        )
+        "Offset of field: ucontext__bindgen_ty_1__bindgen_ty_1::uc_sigmask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__padding_rt_sigset) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(__padding_rt_sigset)
-        )
+        "Offset of field: ucontext__bindgen_ty_1__bindgen_ty_1::__padding_rt_sigset"
     );
 }
 #[test]
@@ -8332,22 +6511,17 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<ucontext__bindgen_ty_1>(),
         8usize,
-        concat!("Size of: ", stringify!(ucontext__bindgen_ty_1))
+        "Size of ucontext__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<ucontext__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(ucontext__bindgen_ty_1))
+        "Alignment of ucontext__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask64) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext__bindgen_ty_1),
-            "::",
-            stringify!(uc_sigmask64)
-        )
+        "Offset of field: ucontext__bindgen_ty_1::uc_sigmask64"
     );
 }
 #[test]
@@ -8357,62 +6531,37 @@ fn bindgen_test_layout_ucontext() {
     assert_eq!(
         ::std::mem::size_of::<ucontext>(),
         228usize,
-        concat!("Size of: ", stringify!(ucontext))
+        "Size of ucontext"
     );
     assert_eq!(
         ::std::mem::align_of::<ucontext>(),
         4usize,
-        concat!("Alignment of ", stringify!(ucontext))
+        "Alignment of ucontext"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_flags) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_flags)
-        )
+        "Offset of field: ucontext::uc_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_link) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_link)
-        )
+        "Offset of field: ucontext::uc_link"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_stack) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_stack)
-        )
+        "Offset of field: ucontext::uc_stack"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_mcontext) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_mcontext)
-        )
+        "Offset of field: ucontext::uc_mcontext"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__fpregs_mem) as usize - ptr as usize },
         116usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(__fpregs_mem)
-        )
+        "Offset of field: ucontext::__fpregs_mem"
     );
 }
 pub type ucontext_t = ucontext;
@@ -8621,25 +6770,16 @@ pub struct fd_set {
 fn bindgen_test_layout_fd_set() {
     const UNINIT: ::std::mem::MaybeUninit<fd_set> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<fd_set>(),
-        128usize,
-        concat!("Size of: ", stringify!(fd_set))
-    );
+    assert_eq!(::std::mem::size_of::<fd_set>(), 128usize, "Size of fd_set");
     assert_eq!(
         ::std::mem::align_of::<fd_set>(),
         4usize,
-        concat!("Alignment of ", stringify!(fd_set))
+        "Alignment of fd_set"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(fd_set),
-            "::",
-            stringify!(fds_bits)
-        )
+        "Offset of field: fd_set::fds_bits"
     );
 }
 extern "C" {
@@ -8743,125 +6883,62 @@ pub struct tm {
 fn bindgen_test_layout_tm() {
     const UNINIT: ::std::mem::MaybeUninit<tm> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<tm>(),
-        44usize,
-        concat!("Size of: ", stringify!(tm))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<tm>(),
-        4usize,
-        concat!("Alignment of ", stringify!(tm))
-    );
+    assert_eq!(::std::mem::size_of::<tm>(), 44usize, "Size of tm");
+    assert_eq!(::std::mem::align_of::<tm>(), 4usize, "Alignment of tm");
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_sec)
-        )
+        "Offset of field: tm::tm_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_min) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_min)
-        )
+        "Offset of field: tm::tm_min"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_hour) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_hour)
-        )
+        "Offset of field: tm::tm_hour"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_mday) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_mday)
-        )
+        "Offset of field: tm::tm_mday"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_mon) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_mon)
-        )
+        "Offset of field: tm::tm_mon"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_year) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_year)
-        )
+        "Offset of field: tm::tm_year"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_wday) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_wday)
-        )
+        "Offset of field: tm::tm_wday"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_yday) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_yday)
-        )
+        "Offset of field: tm::tm_yday"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_isdst) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_isdst)
-        )
+        "Offset of field: tm::tm_isdst"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_gmtoff) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_gmtoff)
-        )
+        "Offset of field: tm::tm_gmtoff"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_zone) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_zone)
-        )
+        "Offset of field: tm::tm_zone"
     );
 }
 extern "C" {
@@ -8894,12 +6971,18 @@ extern "C" {
 extern "C" {
     pub fn localtime_r(__t: *const time_t, __tm: *mut tm) -> *mut tm;
 }
+extern "C" {
+    pub fn timelocal(__tm: *mut tm) -> time_t;
+}
 extern "C" {
     pub fn gmtime(__t: *const time_t) -> *mut tm;
 }
 extern "C" {
     pub fn gmtime_r(__t: *const time_t, __tm: *mut tm) -> *mut tm;
 }
+extern "C" {
+    pub fn timegm(__tm: *mut tm) -> time_t;
+}
 extern "C" {
     pub fn strptime(
         __s: *const ::std::os::raw::c_char,
@@ -8986,19 +7069,19 @@ extern "C" {
     ) -> ::std::os::raw::c_int;
 }
 extern "C" {
-    pub fn timer_gettime(__timer: timer_t, __ts: *mut itimerspec) -> ::std::os::raw::c_int;
+    pub fn timer_gettime(_timer: timer_t, __ts: *mut itimerspec) -> ::std::os::raw::c_int;
 }
 extern "C" {
     pub fn timer_getoverrun(__timer: timer_t) -> ::std::os::raw::c_int;
 }
 extern "C" {
-    pub fn timelocal(__tm: *mut tm) -> time_t;
-}
-extern "C" {
-    pub fn timegm(__tm: *mut tm) -> time_t;
+    pub fn timespec_get(
+        __ts: *mut timespec,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_int;
 }
 extern "C" {
-    pub fn timespec_get(
+    pub fn timespec_getres(
         __ts: *mut timespec,
         __base: ::std::os::raw::c_int,
     ) -> ::std::os::raw::c_int;
@@ -9050,122 +7133,67 @@ fn bindgen_test_layout_clone_args() {
     assert_eq!(
         ::std::mem::size_of::<clone_args>(),
         88usize,
-        concat!("Size of: ", stringify!(clone_args))
+        "Size of clone_args"
     );
     assert_eq!(
         ::std::mem::align_of::<clone_args>(),
         8usize,
-        concat!("Alignment of ", stringify!(clone_args))
+        "Alignment of clone_args"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: clone_args::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pidfd) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(pidfd)
-        )
+        "Offset of field: clone_args::pidfd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).child_tid) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(child_tid)
-        )
+        "Offset of field: clone_args::child_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).parent_tid) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(parent_tid)
-        )
+        "Offset of field: clone_args::parent_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).exit_signal) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(exit_signal)
-        )
+        "Offset of field: clone_args::exit_signal"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stack) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(stack)
-        )
+        "Offset of field: clone_args::stack"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stack_size) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(stack_size)
-        )
+        "Offset of field: clone_args::stack_size"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tls) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(tls)
-        )
+        "Offset of field: clone_args::tls"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).set_tid) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(set_tid)
-        )
+        "Offset of field: clone_args::set_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).set_tid_size) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(set_tid_size)
-        )
+        "Offset of field: clone_args::set_tid_size"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cgroup) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(cgroup)
-        )
+        "Offset of field: clone_args::cgroup"
     );
 }
 #[repr(C)]
@@ -9180,22 +7208,17 @@ fn bindgen_test_layout_sched_param() {
     assert_eq!(
         ::std::mem::size_of::<sched_param>(),
         4usize,
-        concat!("Size of: ", stringify!(sched_param))
+        "Size of sched_param"
     );
     assert_eq!(
         ::std::mem::align_of::<sched_param>(),
         4usize,
-        concat!("Alignment of ", stringify!(sched_param))
+        "Alignment of sched_param"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sched_priority) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sched_param),
-            "::",
-            stringify!(sched_priority)
-        )
+        "Offset of field: sched_param::sched_priority"
     );
 }
 extern "C" {
@@ -9236,13 +7259,12 @@ pub type _bindgen_ty_23 = ::std::os::raw::c_uint;
 pub const PTHREAD_RWLOCK_PREFER_READER_NP: _bindgen_ty_24 = 0;
 pub const PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP: _bindgen_ty_24 = 1;
 pub type _bindgen_ty_24 = ::std::os::raw::c_uint;
-pub type __pthread_cleanup_func_t =
-    ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct __pthread_cleanup_t {
     pub __cleanup_prev: *mut __pthread_cleanup_t,
-    pub __cleanup_routine: __pthread_cleanup_func_t,
+    pub __cleanup_routine:
+        ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>,
     pub __cleanup_arg: *mut ::std::os::raw::c_void,
 }
 #[test]
@@ -9252,48 +7274,33 @@ fn bindgen_test_layout___pthread_cleanup_t() {
     assert_eq!(
         ::std::mem::size_of::<__pthread_cleanup_t>(),
         12usize,
-        concat!("Size of: ", stringify!(__pthread_cleanup_t))
+        "Size of __pthread_cleanup_t"
     );
     assert_eq!(
         ::std::mem::align_of::<__pthread_cleanup_t>(),
         4usize,
-        concat!("Alignment of ", stringify!(__pthread_cleanup_t))
+        "Alignment of __pthread_cleanup_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_prev) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__pthread_cleanup_t),
-            "::",
-            stringify!(__cleanup_prev)
-        )
+        "Offset of field: __pthread_cleanup_t::__cleanup_prev"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_routine) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__pthread_cleanup_t),
-            "::",
-            stringify!(__cleanup_routine)
-        )
+        "Offset of field: __pthread_cleanup_t::__cleanup_routine"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_arg) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__pthread_cleanup_t),
-            "::",
-            stringify!(__cleanup_arg)
-        )
+        "Offset of field: __pthread_cleanup_t::__cleanup_arg"
     );
 }
 extern "C" {
     pub fn __pthread_cleanup_push(
         c: *mut __pthread_cleanup_t,
-        arg1: __pthread_cleanup_func_t,
+        arg1: ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>,
         arg2: *mut ::std::os::raw::c_void,
     );
 }
@@ -9320,42 +7327,27 @@ fn bindgen_test_layout_android_poll_source() {
     assert_eq!(
         ::std::mem::size_of::<android_poll_source>(),
         12usize,
-        concat!("Size of: ", stringify!(android_poll_source))
+        "Size of android_poll_source"
     );
     assert_eq!(
         ::std::mem::align_of::<android_poll_source>(),
         4usize,
-        concat!("Alignment of ", stringify!(android_poll_source))
+        "Alignment of android_poll_source"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_poll_source),
-            "::",
-            stringify!(id)
-        )
+        "Offset of field: android_poll_source::id"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).app) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_poll_source),
-            "::",
-            stringify!(app)
-        )
+        "Offset of field: android_poll_source::app"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).process) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_poll_source),
-            "::",
-            stringify!(process)
-        )
+        "Offset of field: android_poll_source::process"
     );
 }
 #[repr(C)]
@@ -9381,72 +7373,42 @@ fn bindgen_test_layout_android_input_buffer() {
     assert_eq!(
         ::std::mem::size_of::<android_input_buffer>(),
         40usize,
-        concat!("Size of: ", stringify!(android_input_buffer))
+        "Size of android_input_buffer"
     );
     assert_eq!(
         ::std::mem::align_of::<android_input_buffer>(),
         4usize,
-        concat!("Alignment of ", stringify!(android_input_buffer))
+        "Alignment of android_input_buffer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEvents) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(motionEvents)
-        )
+        "Offset of field: android_input_buffer::motionEvents"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEventsCount) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(motionEventsCount)
-        )
+        "Offset of field: android_input_buffer::motionEventsCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEventsBufferSize) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(motionEventsBufferSize)
-        )
+        "Offset of field: android_input_buffer::motionEventsBufferSize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEvents) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(keyEvents)
-        )
+        "Offset of field: android_input_buffer::keyEvents"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEventsCount) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(keyEventsCount)
-        )
+        "Offset of field: android_input_buffer::keyEventsCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEventsBufferSize) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(keyEventsBufferSize)
-        )
+        "Offset of field: android_input_buffer::keyEventsBufferSize"
     );
 }
 #[doc = " Function pointer declaration for the filtering of key events.\n A function with this signature should be passed to\n android_app_set_key_event_filter and return false for any events that should\n not be handled by android_native_app_glue. These events will be handled by\n the system instead."]
@@ -9476,6 +7438,10 @@ pub struct android_app {
     pub window: *mut ANativeWindow,
     #[doc = " Current content rectangle of the window; this is the area where the\n window's content should be placed to be seen by the user."]
     pub contentRect: ARect,
+    #[doc = " Whether the software keyboard is visible or not."]
+    pub softwareKeyboardVisible: bool,
+    #[doc = " Last editor action. Valid within APP_CMD_SOFTWARE_KB_VIS_CHANGED handler.\n\n Note: the upstream comment above isn't accurate.\n - `APP_CMD_SOFTWARE_KB_VIS_CHANGED` is associated with `softwareKeyboardVisible`\n   changes, not `editorAction`.\n - `APP_CMD_EDITOR_ACTION` is associated with this state but unlike for\n   `window` state there's no synchonization that blocks the Java main\n   thread, so we can't say that this is only valid within the `APP_CMD_` handler."]
+    pub editorAction: ::std::os::raw::c_int,
     #[doc = " Current state of the app's activity.  May be either APP_CMD_START,\n APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP."]
     pub activityState: ::std::os::raw::c_int,
     #[doc = " This is non-zero when the application's GameActivity is being\n destroyed and waiting for the app thread to complete."]
@@ -9509,313 +7475,173 @@ fn bindgen_test_layout_android_app() {
     let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_app>(),
-        224usize,
-        concat!("Size of: ", stringify!(android_app))
+        232usize,
+        "Size of android_app"
     );
     assert_eq!(
         ::std::mem::align_of::<android_app>(),
         4usize,
-        concat!("Alignment of ", stringify!(android_app))
+        "Alignment of android_app"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).userData) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(userData)
-        )
+        "Offset of field: android_app::userData"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onAppCmd) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(onAppCmd)
-        )
+        "Offset of field: android_app::onAppCmd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).activity) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(activity)
-        )
+        "Offset of field: android_app::activity"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).config) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(config)
-        )
+        "Offset of field: android_app::config"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).savedState) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(savedState)
-        )
+        "Offset of field: android_app::savedState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).savedStateSize) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(savedStateSize)
-        )
+        "Offset of field: android_app::savedStateSize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).looper) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(looper)
-        )
+        "Offset of field: android_app::looper"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).window) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(window)
-        )
+        "Offset of field: android_app::window"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).contentRect) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(contentRect)
-        )
+        "Offset of field: android_app::contentRect"
     );
     assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).activityState) as usize - ptr as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).softwareKeyboardVisible) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(activityState)
-        )
+        "Offset of field: android_app::softwareKeyboardVisible"
     );
     assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).destroyRequested) as usize - ptr as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).editorAction) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(destroyRequested)
-        )
+        "Offset of field: android_app::editorAction"
     );
     assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).inputBuffers) as usize - ptr as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).activityState) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(inputBuffers)
-        )
+        "Offset of field: android_app::activityState"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).destroyRequested) as usize - ptr as usize },
+        60usize,
+        "Offset of field: android_app::destroyRequested"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).inputBuffers) as usize - ptr as usize },
+        64usize,
+        "Offset of field: android_app::inputBuffers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).currentInputBuffer) as usize - ptr as usize },
-        136usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(currentInputBuffer)
-        )
+        144usize,
+        "Offset of field: android_app::currentInputBuffer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).textInputState) as usize - ptr as usize },
-        140usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(textInputState)
-        )
+        148usize,
+        "Offset of field: android_app::textInputState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).mutex) as usize - ptr as usize },
-        144usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(mutex)
-        )
+        152usize,
+        "Offset of field: android_app::mutex"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cond) as usize - ptr as usize },
-        148usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(cond)
-        )
+        156usize,
+        "Offset of field: android_app::cond"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).msgread) as usize - ptr as usize },
-        152usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(msgread)
-        )
+        160usize,
+        "Offset of field: android_app::msgread"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).msgwrite) as usize - ptr as usize },
-        156usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(msgwrite)
-        )
+        164usize,
+        "Offset of field: android_app::msgwrite"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).thread) as usize - ptr as usize },
-        160usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(thread)
-        )
+        168usize,
+        "Offset of field: android_app::thread"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cmdPollSource) as usize - ptr as usize },
-        164usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(cmdPollSource)
-        )
+        172usize,
+        "Offset of field: android_app::cmdPollSource"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).running) as usize - ptr as usize },
-        176usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(running)
-        )
+        184usize,
+        "Offset of field: android_app::running"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stateSaved) as usize - ptr as usize },
-        180usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(stateSaved)
-        )
+        188usize,
+        "Offset of field: android_app::stateSaved"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).destroyed) as usize - ptr as usize },
-        184usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(destroyed)
-        )
+        192usize,
+        "Offset of field: android_app::destroyed"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).redrawNeeded) as usize - ptr as usize },
-        188usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(redrawNeeded)
-        )
+        196usize,
+        "Offset of field: android_app::redrawNeeded"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pendingWindow) as usize - ptr as usize },
-        192usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(pendingWindow)
-        )
+        200usize,
+        "Offset of field: android_app::pendingWindow"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pendingContentRect) as usize - ptr as usize },
-        196usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(pendingContentRect)
-        )
+        204usize,
+        "Offset of field: android_app::pendingContentRect"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEventFilter) as usize - ptr as usize },
-        212usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(keyEventFilter)
-        )
+        220usize,
+        "Offset of field: android_app::keyEventFilter"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEventFilter) as usize - ptr as usize },
-        216usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(motionEventFilter)
-        )
+        224usize,
+        "Offset of field: android_app::motionEventFilter"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).inputAvailableWakeUp) as usize - ptr as usize },
-        220usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(inputAvailableWakeUp)
-        )
+        228usize,
+        "Offset of field: android_app::inputAvailableWakeUp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).inputSwapPending) as usize - ptr as usize },
-        221usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(inputSwapPending)
-        )
+        229usize,
+        "Offset of field: android_app::inputSwapPending"
     );
 }
 #[doc = " Looper data ID of commands coming from the app's main thread, which\n is returned as an identifier from ALooper_pollOnce().  The data for this\n identifier is a pointer to an android_poll_source structure.\n These can be retrieved and processed with android_app_read_cmd()\n and android_app_exec_cmd()."]
@@ -9825,7 +7651,7 @@ pub const NativeAppGlueLooperId_LOOPER_ID_INPUT: NativeAppGlueLooperId = 2;
 #[doc = " Start of user-defined ALooper identifiers."]
 pub const NativeAppGlueLooperId_LOOPER_ID_USER: NativeAppGlueLooperId = 3;
 #[doc = " Looper ID of commands coming from the app's main thread, an AInputQueue or\n user-defined sources."]
-pub type NativeAppGlueLooperId = ::std::os::raw::c_uint;
+pub type NativeAppGlueLooperId = i8;
 #[doc = " Unused. Reserved for future use when usage of AInputQueue will be\n supported."]
 pub const NativeAppGlueAppCmd_UNUSED_APP_CMD_INPUT_CHANGED: NativeAppGlueAppCmd = 0;
 #[doc = " Command from main thread: a new ANativeWindow is ready for use.  Upon\n receiving this command, android_app->window will contain the new window\n surface."]
@@ -9838,30 +7664,32 @@ pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_RESIZED: NativeAppGlueAppCmd = 3;
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_REDRAW_NEEDED: NativeAppGlueAppCmd = 4;
 #[doc = " Command from main thread: the content area of the window has changed,\n such as from the soft input window being shown or hidden.  You can\n find the new content rect in android_app::contentRect."]
 pub const NativeAppGlueAppCmd_APP_CMD_CONTENT_RECT_CHANGED: NativeAppGlueAppCmd = 5;
+#[doc = " Command from main thread: the software keyboard was shown or hidden."]
+pub const NativeAppGlueAppCmd_APP_CMD_SOFTWARE_KB_VIS_CHANGED: NativeAppGlueAppCmd = 6;
 #[doc = " Command from main thread: the app's activity window has gained\n input focus."]
-pub const NativeAppGlueAppCmd_APP_CMD_GAINED_FOCUS: NativeAppGlueAppCmd = 6;
+pub const NativeAppGlueAppCmd_APP_CMD_GAINED_FOCUS: NativeAppGlueAppCmd = 7;
 #[doc = " Command from main thread: the app's activity window has lost\n input focus."]
-pub const NativeAppGlueAppCmd_APP_CMD_LOST_FOCUS: NativeAppGlueAppCmd = 7;
+pub const NativeAppGlueAppCmd_APP_CMD_LOST_FOCUS: NativeAppGlueAppCmd = 8;
 #[doc = " Command from main thread: the current device configuration has changed."]
-pub const NativeAppGlueAppCmd_APP_CMD_CONFIG_CHANGED: NativeAppGlueAppCmd = 8;
+pub const NativeAppGlueAppCmd_APP_CMD_CONFIG_CHANGED: NativeAppGlueAppCmd = 9;
 #[doc = " Command from main thread: the system is running low on memory.\n Try to reduce your memory use."]
-pub const NativeAppGlueAppCmd_APP_CMD_LOW_MEMORY: NativeAppGlueAppCmd = 9;
+pub const NativeAppGlueAppCmd_APP_CMD_LOW_MEMORY: NativeAppGlueAppCmd = 10;
 #[doc = " Command from main thread: the app's activity has been started."]
-pub const NativeAppGlueAppCmd_APP_CMD_START: NativeAppGlueAppCmd = 10;
+pub const NativeAppGlueAppCmd_APP_CMD_START: NativeAppGlueAppCmd = 11;
 #[doc = " Command from main thread: the app's activity has been resumed."]
-pub const NativeAppGlueAppCmd_APP_CMD_RESUME: NativeAppGlueAppCmd = 11;
+pub const NativeAppGlueAppCmd_APP_CMD_RESUME: NativeAppGlueAppCmd = 12;
 #[doc = " Command from main thread: the app should generate a new saved state\n for itself, to restore from later if needed.  If you have saved state,\n allocate it with malloc and place it in android_app.savedState with\n the size in android_app.savedStateSize.  The will be freed for you\n later."]
-pub const NativeAppGlueAppCmd_APP_CMD_SAVE_STATE: NativeAppGlueAppCmd = 12;
+pub const NativeAppGlueAppCmd_APP_CMD_SAVE_STATE: NativeAppGlueAppCmd = 13;
 #[doc = " Command from main thread: the app's activity has been paused."]
-pub const NativeAppGlueAppCmd_APP_CMD_PAUSE: NativeAppGlueAppCmd = 13;
+pub const NativeAppGlueAppCmd_APP_CMD_PAUSE: NativeAppGlueAppCmd = 14;
 #[doc = " Command from main thread: the app's activity has been stopped."]
-pub const NativeAppGlueAppCmd_APP_CMD_STOP: NativeAppGlueAppCmd = 14;
+pub const NativeAppGlueAppCmd_APP_CMD_STOP: NativeAppGlueAppCmd = 15;
 #[doc = " Command from main thread: the app's activity is being destroyed,\n and waiting for the app thread to clean up and exit before proceeding."]
-pub const NativeAppGlueAppCmd_APP_CMD_DESTROY: NativeAppGlueAppCmd = 15;
+pub const NativeAppGlueAppCmd_APP_CMD_DESTROY: NativeAppGlueAppCmd = 16;
 #[doc = " Command from main thread: the app's insets have changed."]
-pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_INSETS_CHANGED: NativeAppGlueAppCmd = 16;
-#[doc = " Commands passed from the application's main Java thread to the game's thread."]
-pub type NativeAppGlueAppCmd = ::std::os::raw::c_uint;
+pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_INSETS_CHANGED: NativeAppGlueAppCmd = 17;
+#[doc = " Commands passed from the application's main Java thread to the game's thread.\n\n Values from 0 to 127 are reserved for this library; values from -128 to -1\n can be used for custom user's events."]
+pub type NativeAppGlueAppCmd = i8;
 extern "C" {
     #[doc = " Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next\n app command message."]
     pub fn android_app_read_cmd(android_app: *mut android_app) -> i8;
@@ -9906,6 +7734,10 @@ extern "C" {
         filter: android_motion_event_filter,
     );
 }
+extern "C" {
+    #[doc = " You can send your custom events using the function below.\n\n Make sure your custom codes do not overlap with this library's ones.\n\n Values from 0 to 127 are reserved for this library; values from -128 to -1\n can be used for custom user's events."]
+    pub fn android_app_write_cmd(android_app: *mut android_app, cmd: i8);
+}
 extern "C" {
     #[doc = " Determines if a looper wake up was due to new input becoming available"]
     pub fn android_app_input_available_wake_up(app: *mut android_app) -> bool;
diff --git a/android-activity/src/game_activity/ffi_x86_64.rs b/android-activity/src/game_activity/ffi_x86_64.rs
index 1e9d92a..f8ac155 100644
--- a/android-activity/src/game_activity/ffi_x86_64.rs
+++ b/android-activity/src/game_activity/ffi_x86_64.rs
@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.66.1 */
+/* automatically generated by rust-bindgen 0.71.1 */
 
 pub const __BIONIC__: u32 = 1;
 pub const __WORDSIZE: u32 = 64;
@@ -24,11 +24,12 @@ pub const __ANDROID_API_R__: u32 = 30;
 pub const __ANDROID_API_S__: u32 = 31;
 pub const __ANDROID_API_T__: u32 = 33;
 pub const __ANDROID_API_U__: u32 = 34;
+pub const __ANDROID_API_V__: u32 = 35;
 pub const __ANDROID_NDK__: u32 = 1;
-pub const __NDK_MAJOR__: u32 = 25;
-pub const __NDK_MINOR__: u32 = 2;
+pub const __NDK_MAJOR__: u32 = 26;
+pub const __NDK_MINOR__: u32 = 1;
 pub const __NDK_BETA__: u32 = 0;
-pub const __NDK_BUILD__: u32 = 9519653;
+pub const __NDK_BUILD__: u32 = 10909125;
 pub const __NDK_CANARY__: u32 = 0;
 pub const INT8_MIN: i32 = -128;
 pub const INT8_MAX: u32 = 127;
@@ -60,11 +61,10 @@ pub const WINT_MAX: u32 = 4294967295;
 pub const WINT_MIN: u32 = 0;
 pub const __BITS_PER_LONG: u32 = 64;
 pub const __FD_SETSIZE: u32 = 1024;
-pub const __GNUC_VA_LIST: u32 = 1;
 pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8;
+pub const __bool_true_false_are_defined: u32 = 1;
 pub const true_: u32 = 1;
 pub const false_: u32 = 0;
-pub const __bool_true_false_are_defined: u32 = 1;
 pub const __PRI_64_prefix: &[u8; 2] = b"l\0";
 pub const __PRI_PTR_prefix: &[u8; 2] = b"l\0";
 pub const __PRI_FAST_prefix: &[u8; 2] = b"l\0";
@@ -96,6 +96,34 @@ pub const PRIiFAST32: &[u8; 3] = b"li\0";
 pub const PRIiFAST64: &[u8; 3] = b"li\0";
 pub const PRIiMAX: &[u8; 3] = b"ji\0";
 pub const PRIiPTR: &[u8; 3] = b"li\0";
+pub const PRIb8: &[u8; 2] = b"b\0";
+pub const PRIb16: &[u8; 2] = b"b\0";
+pub const PRIb32: &[u8; 2] = b"b\0";
+pub const PRIb64: &[u8; 3] = b"lb\0";
+pub const PRIbLEAST8: &[u8; 2] = b"b\0";
+pub const PRIbLEAST16: &[u8; 2] = b"b\0";
+pub const PRIbLEAST32: &[u8; 2] = b"b\0";
+pub const PRIbLEAST64: &[u8; 3] = b"lb\0";
+pub const PRIbFAST8: &[u8; 2] = b"b\0";
+pub const PRIbFAST16: &[u8; 3] = b"lb\0";
+pub const PRIbFAST32: &[u8; 3] = b"lb\0";
+pub const PRIbFAST64: &[u8; 3] = b"lb\0";
+pub const PRIbMAX: &[u8; 3] = b"jb\0";
+pub const PRIbPTR: &[u8; 3] = b"lb\0";
+pub const PRIB8: &[u8; 2] = b"B\0";
+pub const PRIB16: &[u8; 2] = b"B\0";
+pub const PRIB32: &[u8; 2] = b"B\0";
+pub const PRIB64: &[u8; 3] = b"lB\0";
+pub const PRIBLEAST8: &[u8; 2] = b"B\0";
+pub const PRIBLEAST16: &[u8; 2] = b"B\0";
+pub const PRIBLEAST32: &[u8; 2] = b"B\0";
+pub const PRIBLEAST64: &[u8; 3] = b"lB\0";
+pub const PRIBFAST8: &[u8; 2] = b"B\0";
+pub const PRIBFAST16: &[u8; 3] = b"lB\0";
+pub const PRIBFAST32: &[u8; 3] = b"lB\0";
+pub const PRIBFAST64: &[u8; 3] = b"lB\0";
+pub const PRIBMAX: &[u8; 3] = b"jB\0";
+pub const PRIBPTR: &[u8; 3] = b"lB\0";
 pub const PRIo8: &[u8; 2] = b"o\0";
 pub const PRIo16: &[u8; 2] = b"o\0";
 pub const PRIo32: &[u8; 2] = b"o\0";
@@ -180,6 +208,34 @@ pub const SCNiFAST32: &[u8; 3] = b"li\0";
 pub const SCNiFAST64: &[u8; 3] = b"li\0";
 pub const SCNiMAX: &[u8; 3] = b"ji\0";
 pub const SCNiPTR: &[u8; 3] = b"li\0";
+pub const SCNb8: &[u8; 4] = b"hhb\0";
+pub const SCNb16: &[u8; 3] = b"hb\0";
+pub const SCNb32: &[u8; 2] = b"b\0";
+pub const SCNb64: &[u8; 3] = b"lb\0";
+pub const SCNbLEAST8: &[u8; 4] = b"hhb\0";
+pub const SCNbLEAST16: &[u8; 3] = b"hb\0";
+pub const SCNbLEAST32: &[u8; 2] = b"b\0";
+pub const SCNbLEAST64: &[u8; 3] = b"lb\0";
+pub const SCNbFAST8: &[u8; 4] = b"hhb\0";
+pub const SCNbFAST16: &[u8; 3] = b"lb\0";
+pub const SCNbFAST32: &[u8; 3] = b"lb\0";
+pub const SCNbFAST64: &[u8; 3] = b"lb\0";
+pub const SCNbMAX: &[u8; 3] = b"jb\0";
+pub const SCNbPTR: &[u8; 3] = b"lb\0";
+pub const SCNB8: &[u8; 4] = b"hhB\0";
+pub const SCNB16: &[u8; 3] = b"hB\0";
+pub const SCNB32: &[u8; 2] = b"B\0";
+pub const SCNB64: &[u8; 3] = b"lB\0";
+pub const SCNBLEAST8: &[u8; 4] = b"hhB\0";
+pub const SCNBLEAST16: &[u8; 3] = b"hB\0";
+pub const SCNBLEAST32: &[u8; 2] = b"B\0";
+pub const SCNBLEAST64: &[u8; 3] = b"lB\0";
+pub const SCNBFAST8: &[u8; 4] = b"hhB\0";
+pub const SCNBFAST16: &[u8; 3] = b"lB\0";
+pub const SCNBFAST32: &[u8; 3] = b"lB\0";
+pub const SCNBFAST64: &[u8; 3] = b"lB\0";
+pub const SCNBMAX: &[u8; 3] = b"jB\0";
+pub const SCNBPTR: &[u8; 3] = b"lB\0";
 pub const SCNo8: &[u8; 4] = b"hho\0";
 pub const SCNo16: &[u8; 3] = b"ho\0";
 pub const SCNo32: &[u8; 2] = b"o\0";
@@ -224,12 +280,12 @@ pub const SCNxMAX: &[u8; 3] = b"jx\0";
 pub const SCNxPTR: &[u8; 3] = b"lx\0";
 pub const GAME_ACTIVITY_POINTER_INFO_AXIS_COUNT: u32 = 48;
 pub const GAMEACTIVITY_MAX_NUM_POINTERS_IN_MOTION_EVENT: u32 = 8;
-pub const GAMETEXTINPUT_MAJOR_VERSION: u32 = 2;
+pub const GAMETEXTINPUT_MAJOR_VERSION: u32 = 4;
 pub const GAMETEXTINPUT_MINOR_VERSION: u32 = 0;
 pub const GAMETEXTINPUT_BUGFIX_VERSION: u32 = 0;
-pub const GAMEACTIVITY_MAJOR_VERSION: u32 = 2;
+pub const GAMEACTIVITY_MAJOR_VERSION: u32 = 4;
 pub const GAMEACTIVITY_MINOR_VERSION: u32 = 0;
-pub const GAMEACTIVITY_BUGFIX_VERSION: u32 = 2;
+pub const GAMEACTIVITY_BUGFIX_VERSION: u32 = 0;
 pub const POLLIN: u32 = 1;
 pub const POLLPRI: u32 = 2;
 pub const POLLOUT: u32 = 4;
@@ -552,6 +608,7 @@ pub const TRAP_HWBKPT: u32 = 4;
 pub const TRAP_UNK: u32 = 5;
 pub const TRAP_PERF: u32 = 6;
 pub const NSIGTRAP: u32 = 6;
+pub const TRAP_PERF_FLAG_ASYNC: u32 = 1;
 pub const CLD_EXITED: u32 = 1;
 pub const CLD_KILLED: u32 = 2;
 pub const CLD_DUMPED: u32 = 3;
@@ -588,6 +645,9 @@ pub const PAGE_MASK: i32 = -4096;
 pub const FD_SETSIZE: u32 = 1024;
 pub const CLOCKS_PER_SEC: u32 = 1000000;
 pub const TIME_UTC: u32 = 1;
+pub const TIME_MONOTONIC: u32 = 2;
+pub const TIME_ACTIVE: u32 = 3;
+pub const TIME_THREAD_ACTIVE: u32 = 4;
 pub const CSIGNAL: u32 = 255;
 pub const CLONE_VM: u32 = 256;
 pub const CLONE_FS: u32 = 512;
@@ -673,32 +733,22 @@ fn bindgen_test_layout_max_align_t() {
     assert_eq!(
         ::std::mem::size_of::<max_align_t>(),
         32usize,
-        concat!("Size of: ", stringify!(max_align_t))
+        "Size of max_align_t"
     );
     assert_eq!(
         ::std::mem::align_of::<max_align_t>(),
         16usize,
-        concat!("Alignment of ", stringify!(max_align_t))
+        "Alignment of max_align_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce1) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(max_align_t),
-            "::",
-            stringify!(__clang_max_align_nonce1)
-        )
+        "Offset of field: max_align_t::__clang_max_align_nonce1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce2) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(max_align_t),
-            "::",
-            stringify!(__clang_max_align_nonce2)
-        )
+        "Offset of field: max_align_t::__clang_max_align_nonce2"
     );
 }
 pub type __int8_t = ::std::os::raw::c_schar;
@@ -749,22 +799,17 @@ fn bindgen_test_layout___kernel_fd_set() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_fd_set>(),
         128usize,
-        concat!("Size of: ", stringify!(__kernel_fd_set))
+        "Size of __kernel_fd_set"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_fd_set>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_fd_set))
+        "Alignment of __kernel_fd_set"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_fd_set),
-            "::",
-            stringify!(fds_bits)
-        )
+        "Offset of field: __kernel_fd_set::fds_bits"
     );
 }
 pub type __kernel_sighandler_t =
@@ -801,22 +846,17 @@ fn bindgen_test_layout___kernel_fsid_t() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_fsid_t>(),
         8usize,
-        concat!("Size of: ", stringify!(__kernel_fsid_t))
+        "Size of __kernel_fsid_t"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_fsid_t>(),
         4usize,
-        concat!("Alignment of ", stringify!(__kernel_fsid_t))
+        "Alignment of __kernel_fsid_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).val) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_fsid_t),
-            "::",
-            stringify!(val)
-        )
+        "Offset of field: __kernel_fsid_t::val"
     );
 }
 pub type __kernel_off_t = __kernel_long_t;
@@ -1184,6 +1224,22 @@ pub const AKEYCODE_REFRESH: _bindgen_ty_2 = 285;
 pub const AKEYCODE_THUMBS_UP: _bindgen_ty_2 = 286;
 pub const AKEYCODE_THUMBS_DOWN: _bindgen_ty_2 = 287;
 pub const AKEYCODE_PROFILE_SWITCH: _bindgen_ty_2 = 288;
+pub const AKEYCODE_VIDEO_APP_1: _bindgen_ty_2 = 289;
+pub const AKEYCODE_VIDEO_APP_2: _bindgen_ty_2 = 290;
+pub const AKEYCODE_VIDEO_APP_3: _bindgen_ty_2 = 291;
+pub const AKEYCODE_VIDEO_APP_4: _bindgen_ty_2 = 292;
+pub const AKEYCODE_VIDEO_APP_5: _bindgen_ty_2 = 293;
+pub const AKEYCODE_VIDEO_APP_6: _bindgen_ty_2 = 294;
+pub const AKEYCODE_VIDEO_APP_7: _bindgen_ty_2 = 295;
+pub const AKEYCODE_VIDEO_APP_8: _bindgen_ty_2 = 296;
+pub const AKEYCODE_FEATURED_APP_1: _bindgen_ty_2 = 297;
+pub const AKEYCODE_FEATURED_APP_2: _bindgen_ty_2 = 298;
+pub const AKEYCODE_FEATURED_APP_3: _bindgen_ty_2 = 299;
+pub const AKEYCODE_FEATURED_APP_4: _bindgen_ty_2 = 300;
+pub const AKEYCODE_DEMO_APP_1: _bindgen_ty_2 = 301;
+pub const AKEYCODE_DEMO_APP_2: _bindgen_ty_2 = 302;
+pub const AKEYCODE_DEMO_APP_3: _bindgen_ty_2 = 303;
+pub const AKEYCODE_DEMO_APP_4: _bindgen_ty_2 = 304;
 pub type _bindgen_ty_2 = ::std::os::raw::c_uint;
 pub const ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: _bindgen_ty_3 = 1;
 pub type _bindgen_ty_3 = ::std::os::raw::c_uint;
@@ -1198,8 +1254,8 @@ pub const ALOOPER_EVENT_ERROR: _bindgen_ty_5 = 4;
 pub const ALOOPER_EVENT_HANGUP: _bindgen_ty_5 = 8;
 pub const ALOOPER_EVENT_INVALID: _bindgen_ty_5 = 16;
 pub type _bindgen_ty_5 = ::std::os::raw::c_uint;
-pub type va_list = __builtin_va_list;
 pub type __gnuc_va_list = __builtin_va_list;
+pub type va_list = __builtin_va_list;
 #[repr(C)]
 pub struct JavaVMAttachArgs {
     pub version: jint,
@@ -1213,42 +1269,27 @@ fn bindgen_test_layout_JavaVMAttachArgs() {
     assert_eq!(
         ::std::mem::size_of::<JavaVMAttachArgs>(),
         24usize,
-        concat!("Size of: ", stringify!(JavaVMAttachArgs))
+        "Size of JavaVMAttachArgs"
     );
     assert_eq!(
         ::std::mem::align_of::<JavaVMAttachArgs>(),
         8usize,
-        concat!("Alignment of ", stringify!(JavaVMAttachArgs))
+        "Alignment of JavaVMAttachArgs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
-            "::",
-            stringify!(version)
-        )
+        "Offset of field: JavaVMAttachArgs::version"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).name) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
-            "::",
-            stringify!(name)
-        )
+        "Offset of field: JavaVMAttachArgs::name"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).group) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMAttachArgs),
-            "::",
-            stringify!(group)
-        )
+        "Offset of field: JavaVMAttachArgs::group"
     );
 }
 #[repr(C)]
@@ -1264,32 +1305,22 @@ fn bindgen_test_layout_JavaVMOption() {
     assert_eq!(
         ::std::mem::size_of::<JavaVMOption>(),
         16usize,
-        concat!("Size of: ", stringify!(JavaVMOption))
+        "Size of JavaVMOption"
     );
     assert_eq!(
         ::std::mem::align_of::<JavaVMOption>(),
         8usize,
-        concat!("Alignment of ", stringify!(JavaVMOption))
+        "Alignment of JavaVMOption"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).optionString) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMOption),
-            "::",
-            stringify!(optionString)
-        )
+        "Offset of field: JavaVMOption::optionString"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).extraInfo) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMOption),
-            "::",
-            stringify!(extraInfo)
-        )
+        "Offset of field: JavaVMOption::extraInfo"
     );
 }
 #[repr(C)]
@@ -1306,52 +1337,32 @@ fn bindgen_test_layout_JavaVMInitArgs() {
     assert_eq!(
         ::std::mem::size_of::<JavaVMInitArgs>(),
         24usize,
-        concat!("Size of: ", stringify!(JavaVMInitArgs))
+        "Size of JavaVMInitArgs"
     );
     assert_eq!(
         ::std::mem::align_of::<JavaVMInitArgs>(),
         8usize,
-        concat!("Alignment of ", stringify!(JavaVMInitArgs))
+        "Alignment of JavaVMInitArgs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(version)
-        )
+        "Offset of field: JavaVMInitArgs::version"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).nOptions) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(nOptions)
-        )
+        "Offset of field: JavaVMInitArgs::nOptions"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).options) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(options)
-        )
+        "Offset of field: JavaVMInitArgs::options"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ignoreUnrecognized) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(JavaVMInitArgs),
-            "::",
-            stringify!(ignoreUnrecognized)
-        )
+        "Offset of field: JavaVMInitArgs::ignoreUnrecognized"
     );
 }
 pub const AKEY_STATE_UNKNOWN: _bindgen_ty_6 = -1;
@@ -1821,32 +1832,22 @@ fn bindgen_test_layout_imaxdiv_t() {
     assert_eq!(
         ::std::mem::size_of::<imaxdiv_t>(),
         16usize,
-        concat!("Size of: ", stringify!(imaxdiv_t))
+        "Size of imaxdiv_t"
     );
     assert_eq!(
         ::std::mem::align_of::<imaxdiv_t>(),
         8usize,
-        concat!("Alignment of ", stringify!(imaxdiv_t))
+        "Alignment of imaxdiv_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).quot) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(imaxdiv_t),
-            "::",
-            stringify!(quot)
-        )
+        "Offset of field: imaxdiv_t::quot"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rem) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(imaxdiv_t),
-            "::",
-            stringify!(rem)
-        )
+        "Offset of field: imaxdiv_t::rem"
     );
 }
 extern "C" {
@@ -1951,6 +1952,10 @@ pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = 35;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_YCbCr_P010: AHardwareBuffer_Format = 54;
 pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8_UNORM: AHardwareBuffer_Format = 56;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R16_UINT: AHardwareBuffer_Format = 57;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R16G16_UINT: AHardwareBuffer_Format = 58;
+pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R10G10B10A10_UNORM: AHardwareBuffer_Format =
+    59;
 pub type AHardwareBuffer_Format = ::std::os::raw::c_uint;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_NEVER:
     AHardwareBuffer_UsageFlags = 0;
@@ -1988,6 +1993,8 @@ pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP:
     AHardwareBuffer_UsageFlags = 33554432;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE:
     AHardwareBuffer_UsageFlags = 67108864;
+pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_FRONT_BUFFER:
+    AHardwareBuffer_UsageFlags = 4294967296;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_VENDOR_0: AHardwareBuffer_UsageFlags =
     268435456;
 pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_VENDOR_1: AHardwareBuffer_UsageFlags =
@@ -2048,92 +2055,52 @@ fn bindgen_test_layout_AHardwareBuffer_Desc() {
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Desc>(),
         40usize,
-        concat!("Size of: ", stringify!(AHardwareBuffer_Desc))
+        "Size of AHardwareBuffer_Desc"
     );
     assert_eq!(
         ::std::mem::align_of::<AHardwareBuffer_Desc>(),
         8usize,
-        concat!("Alignment of ", stringify!(AHardwareBuffer_Desc))
+        "Alignment of AHardwareBuffer_Desc"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).width) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(width)
-        )
+        "Offset of field: AHardwareBuffer_Desc::width"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).height) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(height)
-        )
+        "Offset of field: AHardwareBuffer_Desc::height"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).layers) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(layers)
-        )
+        "Offset of field: AHardwareBuffer_Desc::layers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).format) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(format)
-        )
+        "Offset of field: AHardwareBuffer_Desc::format"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).usage) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(usage)
-        )
+        "Offset of field: AHardwareBuffer_Desc::usage"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stride) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(stride)
-        )
+        "Offset of field: AHardwareBuffer_Desc::stride"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rfu0) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(rfu0)
-        )
+        "Offset of field: AHardwareBuffer_Desc::rfu0"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rfu1) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Desc),
-            "::",
-            stringify!(rfu1)
-        )
+        "Offset of field: AHardwareBuffer_Desc::rfu1"
     );
 }
 #[repr(C)]
@@ -2151,42 +2118,27 @@ fn bindgen_test_layout_AHardwareBuffer_Plane() {
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Plane>(),
         16usize,
-        concat!("Size of: ", stringify!(AHardwareBuffer_Plane))
+        "Size of AHardwareBuffer_Plane"
     );
     assert_eq!(
         ::std::mem::align_of::<AHardwareBuffer_Plane>(),
         8usize,
-        concat!("Alignment of ", stringify!(AHardwareBuffer_Plane))
+        "Alignment of AHardwareBuffer_Plane"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Plane),
-            "::",
-            stringify!(data)
-        )
+        "Offset of field: AHardwareBuffer_Plane::data"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pixelStride) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Plane),
-            "::",
-            stringify!(pixelStride)
-        )
+        "Offset of field: AHardwareBuffer_Plane::pixelStride"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rowStride) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Plane),
-            "::",
-            stringify!(rowStride)
-        )
+        "Offset of field: AHardwareBuffer_Plane::rowStride"
     );
 }
 #[repr(C)]
@@ -2203,32 +2155,22 @@ fn bindgen_test_layout_AHardwareBuffer_Planes() {
     assert_eq!(
         ::std::mem::size_of::<AHardwareBuffer_Planes>(),
         72usize,
-        concat!("Size of: ", stringify!(AHardwareBuffer_Planes))
+        "Size of AHardwareBuffer_Planes"
     );
     assert_eq!(
         ::std::mem::align_of::<AHardwareBuffer_Planes>(),
         8usize,
-        concat!("Alignment of ", stringify!(AHardwareBuffer_Planes))
+        "Alignment of AHardwareBuffer_Planes"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).planeCount) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Planes),
-            "::",
-            stringify!(planeCount)
-        )
+        "Offset of field: AHardwareBuffer_Planes::planeCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).planes) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(AHardwareBuffer_Planes),
-            "::",
-            stringify!(planes)
-        )
+        "Offset of field: AHardwareBuffer_Planes::planes"
     );
 }
 #[repr(C)]
@@ -2328,62 +2270,37 @@ fn bindgen_test_layout_GameActivityPointerAxes() {
     assert_eq!(
         ::std::mem::size_of::<GameActivityPointerAxes>(),
         208usize,
-        concat!("Size of: ", stringify!(GameActivityPointerAxes))
+        "Size of GameActivityPointerAxes"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityPointerAxes>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameActivityPointerAxes))
+        "Alignment of GameActivityPointerAxes"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(id)
-        )
+        "Offset of field: GameActivityPointerAxes::id"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).toolType) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(toolType)
-        )
+        "Offset of field: GameActivityPointerAxes::toolType"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).axisValues) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(axisValues)
-        )
+        "Offset of field: GameActivityPointerAxes::axisValues"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rawX) as usize - ptr as usize },
         200usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(rawX)
-        )
+        "Offset of field: GameActivityPointerAxes::rawX"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rawY) as usize - ptr as usize },
         204usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityPointerAxes),
-            "::",
-            stringify!(rawY)
-        )
+        "Offset of field: GameActivityPointerAxes::rawY"
     );
 }
 extern "C" {
@@ -2433,202 +2350,107 @@ fn bindgen_test_layout_GameActivityMotionEvent() {
     assert_eq!(
         ::std::mem::size_of::<GameActivityMotionEvent>(),
         1760usize,
-        concat!("Size of: ", stringify!(GameActivityMotionEvent))
+        "Size of GameActivityMotionEvent"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityMotionEvent>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameActivityMotionEvent))
+        "Alignment of GameActivityMotionEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(deviceId)
-        )
+        "Offset of field: GameActivityMotionEvent::deviceId"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(source)
-        )
+        "Offset of field: GameActivityMotionEvent::source"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(action)
-        )
+        "Offset of field: GameActivityMotionEvent::action"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(eventTime)
-        )
+        "Offset of field: GameActivityMotionEvent::eventTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(downTime)
-        )
+        "Offset of field: GameActivityMotionEvent::downTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: GameActivityMotionEvent::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(metaState)
-        )
+        "Offset of field: GameActivityMotionEvent::metaState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).actionButton) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(actionButton)
-        )
+        "Offset of field: GameActivityMotionEvent::actionButton"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).buttonState) as usize - ptr as usize },
         44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(buttonState)
-        )
+        "Offset of field: GameActivityMotionEvent::buttonState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).classification) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(classification)
-        )
+        "Offset of field: GameActivityMotionEvent::classification"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).edgeFlags) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(edgeFlags)
-        )
+        "Offset of field: GameActivityMotionEvent::edgeFlags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pointerCount) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(pointerCount)
-        )
+        "Offset of field: GameActivityMotionEvent::pointerCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pointers) as usize - ptr as usize },
         60usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(pointers)
-        )
+        "Offset of field: GameActivityMotionEvent::pointers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historySize) as usize - ptr as usize },
         1724usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historySize)
-        )
+        "Offset of field: GameActivityMotionEvent::historySize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesMillis) as usize - ptr as usize },
         1728usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalEventTimesMillis)
-        )
+        "Offset of field: GameActivityMotionEvent::historicalEventTimesMillis"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historicalEventTimesNanos) as usize - ptr as usize },
         1736usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalEventTimesNanos)
-        )
+        "Offset of field: GameActivityMotionEvent::historicalEventTimesNanos"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).historicalAxisValues) as usize - ptr as usize },
         1744usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(historicalAxisValues)
-        )
+        "Offset of field: GameActivityMotionEvent::historicalAxisValues"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).precisionX) as usize - ptr as usize },
         1752usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(precisionX)
-        )
+        "Offset of field: GameActivityMotionEvent::precisionX"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).precisionY) as usize - ptr as usize },
         1756usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityMotionEvent),
-            "::",
-            stringify!(precisionY)
-        )
+        "Offset of field: GameActivityMotionEvent::precisionY"
     );
 }
 extern "C" {
@@ -2643,14 +2465,6 @@ extern "C" {
     #[doc = " \\brief Handle the freeing of the GameActivityMotionEvent struct."]
     pub fn GameActivityMotionEvent_destroy(c_event: *mut GameActivityMotionEvent);
 }
-extern "C" {
-    #[doc = " \\brief Convert a Java `MotionEvent` to a `GameActivityMotionEvent`.\n\n This is done automatically by the GameActivity: see `onTouchEvent` to set\n a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityMotionEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityMotionEvent,
-    );
-}
 #[doc = " \\brief Describe a key event that happened on the GameActivity SurfaceView.\n\n This is 1:1 mapping to the information contained in a Java `KeyEvent`\n (see https://developer.android.com/reference/android/view/KeyEvent).\n The only exception is the event times, which are reported as\n nanoseconds in this struct."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -2674,146 +2488,69 @@ fn bindgen_test_layout_GameActivityKeyEvent() {
     assert_eq!(
         ::std::mem::size_of::<GameActivityKeyEvent>(),
         56usize,
-        concat!("Size of: ", stringify!(GameActivityKeyEvent))
+        "Size of GameActivityKeyEvent"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityKeyEvent>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameActivityKeyEvent))
+        "Alignment of GameActivityKeyEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).deviceId) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(deviceId)
-        )
+        "Offset of field: GameActivityKeyEvent::deviceId"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).source) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(source)
-        )
+        "Offset of field: GameActivityKeyEvent::source"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).action) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(action)
-        )
+        "Offset of field: GameActivityKeyEvent::action"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eventTime) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(eventTime)
-        )
+        "Offset of field: GameActivityKeyEvent::eventTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).downTime) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(downTime)
-        )
+        "Offset of field: GameActivityKeyEvent::downTime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: GameActivityKeyEvent::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).metaState) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(metaState)
-        )
+        "Offset of field: GameActivityKeyEvent::metaState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).modifiers) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(modifiers)
-        )
+        "Offset of field: GameActivityKeyEvent::modifiers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).repeatCount) as usize - ptr as usize },
         44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(repeatCount)
-        )
+        "Offset of field: GameActivityKeyEvent::repeatCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyCode) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(keyCode)
-        )
+        "Offset of field: GameActivityKeyEvent::keyCode"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).scanCode) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityKeyEvent),
-            "::",
-            stringify!(scanCode)
-        )
+        "Offset of field: GameActivityKeyEvent::scanCode"
     );
 }
-extern "C" {
-    #[doc = " \\brief Convert a Java `KeyEvent` to a `GameActivityKeyEvent`.\n\n This is done automatically by the GameActivity: see `onKeyUp` and `onKeyDown`\n to set a callback to consume the received events.\n This function can be used if you re-implement events handling in your own\n activity.\n Ownership of out_event is maintained by the caller."]
-    pub fn GameActivityKeyEvent_fromJava(
-        env: *mut JNIEnv,
-        motionEvent: jobject,
-        out_event: *mut GameActivityKeyEvent,
-    );
-}
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
-    GameCommonInsetsType = 3;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
-pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
-#[doc = " The type of a component for which to retrieve insets. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
-pub type GameCommonInsetsType = ::std::os::raw::c_uint;
 #[doc = " This struct holds a span within a region of text from start (inclusive) to\n end (exclusive). An empty span or cursor position is specified with\n start==end. An undefined span is specified with start = end = SPAN_UNDEFINED."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -2830,37 +2567,27 @@ fn bindgen_test_layout_GameTextInputSpan() {
     assert_eq!(
         ::std::mem::size_of::<GameTextInputSpan>(),
         8usize,
-        concat!("Size of: ", stringify!(GameTextInputSpan))
+        "Size of GameTextInputSpan"
     );
     assert_eq!(
         ::std::mem::align_of::<GameTextInputSpan>(),
         4usize,
-        concat!("Alignment of ", stringify!(GameTextInputSpan))
+        "Alignment of GameTextInputSpan"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).start) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputSpan),
-            "::",
-            stringify!(start)
-        )
+        "Offset of field: GameTextInputSpan::start"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).end) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputSpan),
-            "::",
-            stringify!(end)
-        )
+        "Offset of field: GameTextInputSpan::end"
     );
 }
 pub const GameTextInputSpanFlag_SPAN_UNDEFINED: GameTextInputSpanFlag = -1;
 #[doc = " Values with special meaning in a GameTextInputSpan."]
-pub type GameTextInputSpanFlag = ::std::os::raw::c_int;
+pub type GameTextInputSpanFlag = i32;
 #[doc = " This struct holds the state of an editable section of text.\n The text can have a selection and a composing region defined on it.\n A composing region is used by IMEs that allow input using multiple steps to\n compose a glyph or word. Use functions GameTextInput_getState and\n GameTextInput_setState to read and modify the state that an IME is editing."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -2881,52 +2608,32 @@ fn bindgen_test_layout_GameTextInputState() {
     assert_eq!(
         ::std::mem::size_of::<GameTextInputState>(),
         32usize,
-        concat!("Size of: ", stringify!(GameTextInputState))
+        "Size of GameTextInputState"
     );
     assert_eq!(
         ::std::mem::align_of::<GameTextInputState>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameTextInputState))
+        "Alignment of GameTextInputState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).text_UTF8) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(text_UTF8)
-        )
+        "Offset of field: GameTextInputState::text_UTF8"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).text_length) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(text_length)
-        )
+        "Offset of field: GameTextInputState::text_length"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).selection) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(selection)
-        )
+        "Offset of field: GameTextInputState::selection"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).composingRegion) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameTextInputState),
-            "::",
-            stringify!(composingRegion)
-        )
+        "Offset of field: GameTextInputState::composingRegion"
     );
 }
 #[doc = " A callback called by GameTextInput_getState.\n @param context User-defined context.\n @param state State, owned by the library, that will be valid for the duration\n of the callback."]
@@ -2958,7 +2665,7 @@ pub const ShowImeFlags_SHOW_IME_UNDEFINED: ShowImeFlags = 0;
 pub const ShowImeFlags_SHOW_IMPLICIT: ShowImeFlags = 1;
 pub const ShowImeFlags_SHOW_FORCED: ShowImeFlags = 2;
 #[doc = " Flags to be passed to GameTextInput_showIme."]
-pub type ShowImeFlags = ::std::os::raw::c_uint;
+pub type ShowImeFlags = u32;
 extern "C" {
     #[doc = " Show the IME. Calls InputMethodManager.showSoftInput().\n @param input A valid GameTextInput library handle.\n @param flags Defined in ShowImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
     pub fn GameTextInput_showIme(input: *mut GameTextInput, flags: u32);
@@ -2967,9 +2674,9 @@ pub const HideImeFlags_HIDE_IME_UNDEFINED: HideImeFlags = 0;
 pub const HideImeFlags_HIDE_IMPLICIT_ONLY: HideImeFlags = 1;
 pub const HideImeFlags_HIDE_NOT_ALWAYS: HideImeFlags = 2;
 #[doc = " Flags to be passed to GameTextInput_hideIme."]
-pub type HideImeFlags = ::std::os::raw::c_uint;
+pub type HideImeFlags = u32;
 extern "C" {
-    #[doc = " Show the IME. Calls InputMethodManager.hideSoftInputFromWindow().\n @param input A valid GameTextInput library handle.\n @param flags Defined in HideImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
+    #[doc = " Hide the IME. Calls InputMethodManager.hideSoftInputFromWindow().\n @param input A valid GameTextInput library handle.\n @param flags Defined in HideImeFlags above. For more information see:\n https://developer.android.com/reference/android/view/inputmethod/InputMethodManager"]
     pub fn GameTextInput_hideIme(input: *mut GameTextInput, flags: u32);
 }
 extern "C" {
@@ -2996,7 +2703,7 @@ pub type GameTextInputEventCallback = ::std::option::Option<
     ),
 >;
 extern "C" {
-    #[doc = " Optionally set a callback to be called whenever the IME state changes.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME state changes.\n @param context Context passed as first argument to the callback."]
+    #[doc = " Optionally set a callback to be called whenever the IME state changes.\n Not necessary if you are using GameActivity, which handles these callbacks\n for you.\n @param input A valid GameTextInput library handle.\n @param callback Called by the library when the IME state changes.\n @param context Context passed as first argument to the callback.\n <b>This function is deprecated. Don't perform any complex processing inside\n the callback other than copying the state variable. Using any synchronization\n primitives inside this callback may cause a deadlock.</b>"]
     pub fn GameTextInput_setEventCallback(
         input: *mut GameTextInput,
         callback: GameTextInputEventCallback,
@@ -3039,6 +2746,144 @@ extern "C" {
         context: *mut ::std::os::raw::c_void,
     );
 }
+#[doc = " Mask of bits that determine the overall class\n of text being given.  Currently supported classes are:\n {@link #TYPE_CLASS_TEXT}, {@link #TYPE_CLASS_NUMBER},\n {@link #TYPE_CLASS_PHONE}, {@link #TYPE_CLASS_DATETIME}.\n <p>IME authors: If the class is not one you\n understand, assume {@link #TYPE_CLASS_TEXT} with NO variation\n or flags.<p>"]
+pub const GameTextInputType_TYPE_MASK_CLASS: GameTextInputType = 15;
+#[doc = " Mask of bits that determine the variation of\n the base content class."]
+pub const GameTextInputType_TYPE_MASK_VARIATION: GameTextInputType = 4080;
+#[doc = " Mask of bits that provide addition bit flags\n of options."]
+pub const GameTextInputType_TYPE_MASK_FLAGS: GameTextInputType = 16773120;
+#[doc = " Special content type for when no explicit type has been specified.\n This should be interpreted to mean that the target input connection\n is not rich, it can not process and show things like candidate text nor\n retrieve the current text, so the input method will need to run in a\n limited \"generate key events\" mode, if it supports it. Note that some\n input methods may not support it, for example a voice-based input\n method will likely not be able to generate key events even if this\n flag is set."]
+pub const GameTextInputType_TYPE_NULL: GameTextInputType = 0;
+#[doc = " Class for normal text.  This class supports the following flags (only\n one of which should be set):\n {@link #TYPE_TEXT_FLAG_CAP_CHARACTERS},\n {@link #TYPE_TEXT_FLAG_CAP_WORDS}, and.\n {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}.  It also supports the\n following variations:\n {@link #TYPE_TEXT_VARIATION_NORMAL}, and\n {@link #TYPE_TEXT_VARIATION_URI}.  If you do not recognize the\n variation, normal should be assumed."]
+pub const GameTextInputType_TYPE_CLASS_TEXT: GameTextInputType = 1;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: capitalize all characters.  Overrides\n {@link #TYPE_TEXT_FLAG_CAP_WORDS} and\n {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}.  This value is explicitly defined\n to be the same as {@link TextUtils#CAP_MODE_CHARACTERS}. Of course,\n this only affects languages where there are upper-case and lower-case\n letters."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_CAP_CHARACTERS: GameTextInputType = 4096;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: capitalize the first character of\n every word.  Overrides {@link #TYPE_TEXT_FLAG_CAP_SENTENCES}.  This\n value is explicitly defined\n to be the same as {@link TextUtils#CAP_MODE_WORDS}. Of course,\n this only affects languages where there are upper-case and lower-case\n letters."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_CAP_WORDS: GameTextInputType = 8192;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: capitalize the first character of\n each sentence.  This value is explicitly defined\n to be the same as {@link TextUtils#CAP_MODE_SENTENCES}. For example\n in English it means to capitalize after a period and a space (note that\n other languages may have different characters for period, or not use\n spaces, or use different grammatical rules). Of course, this only affects\n languages where there are upper-case and lower-case letters."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_CAP_SENTENCES: GameTextInputType = 16384;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the user is entering free-form\n text that should have auto-correction applied to it. Without this flag,\n the IME will not try to correct typos. You should always set this flag\n unless you really expect users to type non-words in this field, for\n example to choose a name for a character in a game.\n Contrast this with {@link #TYPE_TEXT_FLAG_AUTO_COMPLETE} and\n {@link #TYPE_TEXT_FLAG_NO_SUGGESTIONS}:\n {@code TYPE_TEXT_FLAG_AUTO_CORRECT} means that the IME will try to\n auto-correct typos as the user is typing, but does not define whether\n the IME offers an interface to show suggestions."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_AUTO_CORRECT: GameTextInputType = 32768;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the text editor (which means\n the application) is performing auto-completion of the text being entered\n based on its own semantics, which it will present to the user as they type.\n This generally means that the input method should not be showing\n candidates itself, but can expect the editor to supply its own\n completions/candidates from\n {@link android.view.inputmethod.InputMethodSession#displayCompletions\n InputMethodSession.displayCompletions()} as a result of the editor calling\n {@link android.view.inputmethod.InputMethodManager#displayCompletions\n InputMethodManager.displayCompletions()}.\n Note the contrast with {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} and\n {@link #TYPE_TEXT_FLAG_NO_SUGGESTIONS}:\n {@code TYPE_TEXT_FLAG_AUTO_COMPLETE} means the editor should show an\n interface for displaying suggestions, but instead of supplying its own\n it will rely on the Editor to pass completions/corrections."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_AUTO_COMPLETE: GameTextInputType = 65536;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: multiple lines of text can be\n entered into the field.  If this flag is not set, the text field\n will be constrained to a single line. The IME may also choose not to\n display an enter key when this flag is not set, as there should be no\n need to create new lines."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_MULTI_LINE: GameTextInputType = 131072;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the regular text view associated\n with this should not be multi-line, but when a fullscreen input method\n is providing text it should use multiple lines if it can."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_IME_MULTI_LINE: GameTextInputType = 262144;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: the input method does not need to\n display any dictionary-based candidates. This is useful for text views that\n do not contain words from the language and do not benefit from any\n dictionary-based completions or corrections. It overrides the\n {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} value when set.\n Please avoid using this unless you are certain this is what you want.\n Many input methods need suggestions to work well, for example the ones\n based on gesture typing. Consider clearing\n {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} instead if you just do not\n want the IME to correct typos.\n Note the contrast with {@link #TYPE_TEXT_FLAG_AUTO_CORRECT} and\n {@link #TYPE_TEXT_FLAG_AUTO_COMPLETE}:\n {@code TYPE_TEXT_FLAG_NO_SUGGESTIONS} means the IME does not need to\n show an interface to display suggestions. Most IMEs will also take this to\n mean they do not need to try to auto-correct what the user is typing."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_NO_SUGGESTIONS: GameTextInputType = 524288;
+#[doc = " Flag for {@link #TYPE_CLASS_TEXT}: Let the IME know the text conversion\n suggestions are required by the application. Text conversion suggestion is\n for the transliteration languages which has pronunciation characters and\n target characters. When the user is typing the pronunciation charactes, the\n IME could provide the possible target characters to the user. When this\n flag is set, the IME should insert the text conversion suggestions through\n {@link Builder#setTextConversionSuggestions(List)} and\n the {@link TextAttribute} with initialized with the text conversion\n suggestions is provided by the IME to the application. To receive the\n additional information, the application needs to implement {@link\n InputConnection#setComposingText(CharSequence, int, TextAttribute)},\n {@link InputConnection#setComposingRegion(int, int, TextAttribute)}, and\n {@link InputConnection#commitText(CharSequence, int, TextAttribute)}."]
+pub const GameTextInputType_TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS: GameTextInputType =
+    1048576;
+#[doc = " Default variation of {@link #TYPE_CLASS_TEXT}: plain old normal text."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_NORMAL: GameTextInputType = 0;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a URI."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_URI: GameTextInputType = 16;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering an e-mail address."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_EMAIL_ADDRESS: GameTextInputType = 32;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering the subject line of\n an e-mail."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_EMAIL_SUBJECT: GameTextInputType = 48;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a short, possibly informal\n message such as an instant message or a text message."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_SHORT_MESSAGE: GameTextInputType = 64;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering the content of a long,\n possibly formal message such as the body of an e-mail."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_LONG_MESSAGE: GameTextInputType = 80;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering the name of a person."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_PERSON_NAME: GameTextInputType = 96;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a postal mailing address."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_POSTAL_ADDRESS: GameTextInputType = 112;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a password."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_PASSWORD: GameTextInputType = 128;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering a password, which should\n be visible to the user."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_VISIBLE_PASSWORD: GameTextInputType = 144;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering text inside of a web form."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_WEB_EDIT_TEXT: GameTextInputType = 160;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering text to filter contents\n of a list etc."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_FILTER: GameTextInputType = 176;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering text for phonetic\n pronunciation, such as a phonetic name field in contacts. This is mostly\n useful for languages where one spelling may have several phonetic\n readings, like Japanese."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_PHONETIC: GameTextInputType = 192;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering e-mail address inside\n of a web form.  This was added in\n {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An IME must target\n this API version or later to see this input type; if it doesn't, a request\n for this type will be seen as {@link #TYPE_TEXT_VARIATION_EMAIL_ADDRESS}\n when passed through {@link\n android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS: GameTextInputType = 208;
+#[doc = " Variation of {@link #TYPE_CLASS_TEXT}: entering password inside\n of a web form.  This was added in\n {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An IME must target\n this API version or later to see this input type; if it doesn't, a request\n for this type will be seen as {@link #TYPE_TEXT_VARIATION_PASSWORD}\n when passed through {@link\n android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_TEXT_VARIATION_WEB_PASSWORD: GameTextInputType = 224;
+#[doc = " Class for numeric text.  This class supports the following flags:\n {@link #TYPE_NUMBER_FLAG_SIGNED} and\n {@link #TYPE_NUMBER_FLAG_DECIMAL}.  It also supports the following\n variations: {@link #TYPE_NUMBER_VARIATION_NORMAL} and\n {@link #TYPE_NUMBER_VARIATION_PASSWORD}.\n <p>IME authors: If you do not recognize\n the variation, normal should be assumed.</p>"]
+pub const GameTextInputType_TYPE_CLASS_NUMBER: GameTextInputType = 2;
+#[doc = " Flag of {@link #TYPE_CLASS_NUMBER}: the number is signed, allowing\n a positive or negative sign at the start."]
+pub const GameTextInputType_TYPE_NUMBER_FLAG_SIGNED: GameTextInputType = 4096;
+#[doc = " Flag of {@link #TYPE_CLASS_NUMBER}: the number is decimal, allowing\n a decimal point to provide fractional values."]
+pub const GameTextInputType_TYPE_NUMBER_FLAG_DECIMAL: GameTextInputType = 8192;
+#[doc = " Default variation of {@link #TYPE_CLASS_NUMBER}: plain normal\n numeric text.  This was added in\n {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An IME must target\n this API version or later to see this input type; if it doesn't, a request\n for this type will be dropped when passed through\n {@link android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_NUMBER_VARIATION_NORMAL: GameTextInputType = 0;
+#[doc = " Variation of {@link #TYPE_CLASS_NUMBER}: entering a numeric password.\n This was added in {@link android.os.Build.VERSION_CODES#HONEYCOMB}.  An\n IME must target this API version or later to see this input type; if it\n doesn't, a request for this type will be dropped when passed\n through {@link android.view.inputmethod.EditorInfo#makeCompatible(int)\n EditorInfo.makeCompatible(int)}."]
+pub const GameTextInputType_TYPE_NUMBER_VARIATION_PASSWORD: GameTextInputType = 16;
+#[doc = " Class for a phone number.  This class currently supports no variations\n or flags."]
+pub const GameTextInputType_TYPE_CLASS_PHONE: GameTextInputType = 3;
+#[doc = " Class for dates and times.  It supports the\n following variations:\n {@link #TYPE_DATETIME_VARIATION_NORMAL}\n {@link #TYPE_DATETIME_VARIATION_DATE}, and\n {@link #TYPE_DATETIME_VARIATION_TIME}."]
+pub const GameTextInputType_TYPE_CLASS_DATETIME: GameTextInputType = 4;
+#[doc = " Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering\n both a date and time."]
+pub const GameTextInputType_TYPE_DATETIME_VARIATION_NORMAL: GameTextInputType = 0;
+#[doc = " Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering\n only a date."]
+pub const GameTextInputType_TYPE_DATETIME_VARIATION_DATE: GameTextInputType = 16;
+#[doc = " Default variation of {@link #TYPE_CLASS_DATETIME}: allows entering\n only a time."]
+pub const GameTextInputType_TYPE_DATETIME_VARIATION_TIME: GameTextInputType = 32;
+#[doc = " Definitions for inputType argument of GameActivity_setImeEditorInfo()\n\n <pre>\n |-------|-------|-------|-------|\n                              1111 TYPE_MASK_CLASS\n                      11111111     TYPE_MASK_VARIATION\n          111111111111             TYPE_MASK_FLAGS\n |-------|-------|-------|-------|\n                                   TYPE_NULL\n |-------|-------|-------|-------|\n                                 1 TYPE_CLASS_TEXT\n                             1     TYPE_TEXT_VARIATION_URI\n                            1      TYPE_TEXT_VARIATION_EMAIL_ADDRESS\n                            11     TYPE_TEXT_VARIATION_EMAIL_SUBJECT\n                           1       TYPE_TEXT_VARIATION_SHORT_MESSAGE\n                           1 1     TYPE_TEXT_VARIATION_LONG_MESSAGE\n                           11      TYPE_TEXT_VARIATION_PERSON_NAME\n                           111     TYPE_TEXT_VARIATION_POSTAL_ADDRESS\n                          1        TYPE_TEXT_VARIATION_PASSWORD\n                          1  1     TYPE_TEXT_VARIATION_VISIBLE_PASSWORD\n                          1 1      TYPE_TEXT_VARIATION_WEB_EDIT_TEXT\n                          1 11     TYPE_TEXT_VARIATION_FILTER\n                          11       TYPE_TEXT_VARIATION_PHONETIC\n                          11 1     TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS\n                          111      TYPE_TEXT_VARIATION_WEB_PASSWORD\n                     1             TYPE_TEXT_FLAG_CAP_CHARACTERS\n                    1              TYPE_TEXT_FLAG_CAP_WORDS\n                   1               TYPE_TEXT_FLAG_CAP_SENTENCES\n                  1                TYPE_TEXT_FLAG_AUTO_CORRECT\n                 1                 TYPE_TEXT_FLAG_AUTO_COMPLETE\n                1                  TYPE_TEXT_FLAG_MULTI_LINE\n               1                   TYPE_TEXT_FLAG_IME_MULTI_LINE\n              1                    TYPE_TEXT_FLAG_NO_SUGGESTIONS\n             1 TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS\n |-------|-------|-------|-------|\n                                1  TYPE_CLASS_NUMBER\n                             1     TYPE_NUMBER_VARIATION_PASSWORD\n                     1             TYPE_NUMBER_FLAG_SIGNED\n                    1              TYPE_NUMBER_FLAG_DECIMAL\n |-------|-------|-------|-------|\n                                11 TYPE_CLASS_PHONE\n |-------|-------|-------|-------|\n                               1   TYPE_CLASS_DATETIME\n                             1     TYPE_DATETIME_VARIATION_DATE\n                            1      TYPE_DATETIME_VARIATION_TIME\n |-------|-------|-------|-------|</pre>"]
+pub type GameTextInputType = u32;
+#[doc = " Set of bits in {@link #imeOptions} that provide alternative actions\n associated with the \"enter\" key.  This both helps the IME provide\n better feedback about what the enter key will do, and also allows it\n to provide alternative mechanisms for providing that command."]
+pub const GameTextInputActionType_IME_MASK_ACTION: GameTextInputActionType = 255;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: no specific action has been\n associated with this editor, let the editor come up with its own if\n it can."]
+pub const GameTextInputActionType_IME_ACTION_UNSPECIFIED: GameTextInputActionType = 0;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: there is no available action."]
+pub const GameTextInputActionType_IME_ACTION_NONE: GameTextInputActionType = 1;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"go\"\n operation to take the user to the target of the text they typed.\n Typically used, for example, when entering a URL."]
+pub const GameTextInputActionType_IME_ACTION_GO: GameTextInputActionType = 2;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"search\"\n operation, taking the user to the results of searching for the text\n they have typed (in whatever context is appropriate)."]
+pub const GameTextInputActionType_IME_ACTION_SEARCH: GameTextInputActionType = 3;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"send\"\n operation, delivering the text to its target.  This is typically used\n when composing a message in IM or SMS where sending is immediate."]
+pub const GameTextInputActionType_IME_ACTION_SEND: GameTextInputActionType = 4;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"next\"\n operation, taking the user to the next field that will accept text."]
+pub const GameTextInputActionType_IME_ACTION_NEXT: GameTextInputActionType = 5;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: the action key performs a \"done\"\n operation, typically meaning there is nothing more to input and the\n IME will be closed."]
+pub const GameTextInputActionType_IME_ACTION_DONE: GameTextInputActionType = 6;
+#[doc = " Bits of {@link #IME_MASK_ACTION}: like {@link #IME_ACTION_NEXT}, but\n for moving to the previous field.  This will normally not be used to\n specify an action (since it precludes {@link #IME_ACTION_NEXT}), but\n can be returned to the app if it sets {@link #IME_FLAG_NAVIGATE_PREVIOUS}."]
+pub const GameTextInputActionType_IME_ACTION_PREVIOUS: GameTextInputActionType = 7;
+#[doc = " actionId and imeOptions argument of GameActivity_setImeEditorInfo().\n\n <pre>\n |-------|-------|-------|-------|\n                              1111 IME_MASK_ACTION\n |-------|-------|-------|-------|\n                                   IME_ACTION_UNSPECIFIED\n                                 1 IME_ACTION_NONE\n                                1  IME_ACTION_GO\n                                11 IME_ACTION_SEARCH\n                               1   IME_ACTION_SEND\n                               1 1 IME_ACTION_NEXT\n                               11  IME_ACTION_DONE\n                               111 IME_ACTION_PREVIOUS\n         1                         IME_FLAG_NO_PERSONALIZED_LEARNING\n        1                          IME_FLAG_NO_FULLSCREEN\n       1                           IME_FLAG_NAVIGATE_PREVIOUS\n      1                            IME_FLAG_NAVIGATE_NEXT\n     1                             IME_FLAG_NO_EXTRACT_UI\n    1                              IME_FLAG_NO_ACCESSORY_ACTION\n   1                               IME_FLAG_NO_ENTER_ACTION\n  1                                IME_FLAG_FORCE_ASCII\n |-------|-------|-------|-------|</pre>"]
+pub type GameTextInputActionType = u32;
+#[doc = " Flag of {@link #imeOptions}: used to request that the IME should not update\n any personalized data such as typing history and personalized language\n model based on what the user typed on this text editing object.  Typical\n use cases are: <ul> <li>When the application is in a special mode, where\n user's activities are expected to be not recorded in the application's\n history.  Some web browsers and chat applications may have this kind of\n modes.</li> <li>When storing typing history does not make much sense.\n Specifying this flag in typing games may help to avoid typing history from\n being filled up with words that the user is less likely to type in their\n daily life.  Another example is that when the application already knows\n that the expected input is not a valid word (e.g. a promotion code that is\n     not a valid word in any natural language).</li>\n </ul>\n\n <p>Applications need to be aware that the flag is not a guarantee, and some\n IMEs may not respect it.</p>"]
+pub const GameTextInputImeOptions_IME_FLAG_NO_PERSONALIZED_LEARNING: GameTextInputImeOptions =
+    16777216;
+#[doc = " Flag of {@link #imeOptions}: used to request that the IME never go\n into fullscreen mode.\n By default, IMEs may go into full screen mode when they think\n it's appropriate, for example on small screens in landscape\n orientation where displaying a software keyboard may occlude\n such a large portion of the screen that the remaining part is\n too small to meaningfully display the application UI.\n If this flag is set, compliant IMEs will never go into full screen mode,\n and always leave some space to display the application UI.\n Applications need to be aware that the flag is not a guarantee, and\n some IMEs may ignore it."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_FULLSCREEN: GameTextInputImeOptions = 33554432;
+#[doc = " Flag of {@link #imeOptions}: like {@link #IME_FLAG_NAVIGATE_NEXT}, but\n specifies there is something interesting that a backward navigation\n can focus on.  If the user selects the IME's facility to backward\n navigate, this will show up in the application as an {@link\n #IME_ACTION_PREVIOUS} at {@link InputConnection#performEditorAction(int)\n InputConnection.performEditorAction(int)}."]
+pub const GameTextInputImeOptions_IME_FLAG_NAVIGATE_PREVIOUS: GameTextInputImeOptions = 67108864;
+#[doc = " Flag of {@link #imeOptions}: used to specify that there is something\n interesting that a forward navigation can focus on. This is like using\n {@link #IME_ACTION_NEXT}, except allows the IME to be multiline (with\n an enter key) as well as provide forward navigation.  Note that some\n IMEs may not be able to do this, especially when running on a small\n screen where there is little space.  In that case it does not need to\n present a UI for this option.  Like {@link #IME_ACTION_NEXT}, if the\n user selects the IME's facility to forward navigate, this will show up\n in the application at {@link InputConnection#performEditorAction(int)\n InputConnection.performEditorAction(int)}."]
+pub const GameTextInputImeOptions_IME_FLAG_NAVIGATE_NEXT: GameTextInputImeOptions = 134217728;
+#[doc = " Flag of {@link #imeOptions}: used to specify that the IME does not need\n to show its extracted text UI.  For input methods that may be fullscreen,\n often when in landscape mode, this allows them to be smaller and let part\n of the application be shown behind, through transparent UI parts in the\n fullscreen IME. The part of the UI visible to the user may not be\n responsive to touch because the IME will receive touch events, which may\n confuse the user; use {@link #IME_FLAG_NO_FULLSCREEN} instead for a better\n experience. Using this flag is discouraged and it may become deprecated in\n the future. Its meaning is unclear in some situations and it may not work\n appropriately on older versions of the platform."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_EXTRACT_UI: GameTextInputImeOptions = 268435456;
+#[doc = " Flag of {@link #imeOptions}: used in conjunction with one of the actions\n masked by {@link #IME_MASK_ACTION}, this indicates that the action\n should not be available as an accessory button on the right of the\n extracted text when the input method is full-screen. Note that by setting\n this flag, there can be cases where the action is simply never available to\n the user. Setting this generally means that you think that in fullscreen\n mode, where there is little space to show the text, it's not worth taking\n some screen real estate to display the action and it should be used instead\n to show more text."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_ACCESSORY_ACTION: GameTextInputImeOptions = 536870912;
+#[doc = " Flag of {@link #imeOptions}: used in conjunction with one of the actions\n masked by {@link #IME_MASK_ACTION}. If this flag is not set, IMEs will\n normally replace the \"enter\" key with the action supplied. This flag\n indicates that the action should not be available in-line as a replacement\n for the \"enter\" key. Typically this is because the action has such a\n significant impact or is not recoverable enough that accidentally hitting\n it should be avoided, such as sending a message. Note that\n {@link android.widget.TextView} will automatically set this flag for you\n on multi-line text views."]
+pub const GameTextInputImeOptions_IME_FLAG_NO_ENTER_ACTION: GameTextInputImeOptions = 1073741824;
+#[doc = " Flag of {@link #imeOptions}: used to request an IME that is capable of\n inputting ASCII characters.  The intention of this flag is to ensure that\n the user can type Roman alphabet characters in a {@link\n android.widget.TextView}. It is typically used for an account ID or\n password input. A lot of the time, IMEs are already able to input ASCII\n even without being told so (such IMEs already respect this flag in a\n sense), but there are cases when this is not the default. For instance,\n users of languages using a different script like Arabic, Greek, Hebrew or\n Russian typically have a keyboard that can't input ASCII characters by\n default. Applications need to be aware that the flag is not a guarantee,\n and some IMEs may not respect it. However, it is strongly recommended for\n IME authors to respect this flag especially when their IME could end up\n with a state where only languages using non-ASCII are enabled."]
+pub const GameTextInputImeOptions_IME_FLAG_FORCE_ASCII: GameTextInputImeOptions = 2147483648;
+#[doc = " Flag of {@link #internalImeOptions}: flag is set when app window containing\n this\n {@link EditorInfo} is using {@link Configuration#ORIENTATION_PORTRAIT}\n mode.\n @hide"]
+pub const GameTextInputImeOptions_IME_INTERNAL_FLAG_APP_WINDOW_PORTRAIT: GameTextInputImeOptions =
+    1;
+#[doc = " Generic unspecified type for {@link #imeOptions}."]
+pub const GameTextInputImeOptions_IME_NULL: GameTextInputImeOptions = 0;
+pub type GameTextInputImeOptions = u32;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_CAPTION_BAR: GameCommonInsetsType = 0;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_DISPLAY_CUTOUT: GameCommonInsetsType = 1;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_IME: GameCommonInsetsType = 2;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_MANDATORY_SYSTEM_GESTURES:
+    GameCommonInsetsType = 3;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_NAVIGATION_BARS: GameCommonInsetsType = 4;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_STATUS_BARS: GameCommonInsetsType = 5;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_BARS: GameCommonInsetsType = 6;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_SYSTEM_GESTURES: GameCommonInsetsType = 7;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_TAPABLE_ELEMENT: GameCommonInsetsType = 8;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_WATERFALL: GameCommonInsetsType = 9;
+pub const GameCommonInsetsType_GAMECOMMON_INSETS_TYPE_COUNT: GameCommonInsetsType = 10;
+#[doc = " The type of a component for which to retrieve insets. See\n https://developer.android.com/reference/androidx/core/view/WindowInsetsCompat.Type"]
+pub type GameCommonInsetsType = u8;
 #[doc = " This structure defines the native side of an android.app.GameActivity.\n It is created by the framework, and handed to the application's native\n code as it is being launched."]
 #[repr(C)]
 pub struct GameActivity {
@@ -3070,112 +2915,62 @@ fn bindgen_test_layout_GameActivity() {
     assert_eq!(
         ::std::mem::size_of::<GameActivity>(),
         80usize,
-        concat!("Size of: ", stringify!(GameActivity))
+        "Size of GameActivity"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivity>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameActivity))
+        "Alignment of GameActivity"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).callbacks) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(callbacks)
-        )
+        "Offset of field: GameActivity::callbacks"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).vm) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(vm)
-        )
+        "Offset of field: GameActivity::vm"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).env) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(env)
-        )
+        "Offset of field: GameActivity::env"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).javaGameActivity) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(javaGameActivity)
-        )
+        "Offset of field: GameActivity::javaGameActivity"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).internalDataPath) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(internalDataPath)
-        )
+        "Offset of field: GameActivity::internalDataPath"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).externalDataPath) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(externalDataPath)
-        )
+        "Offset of field: GameActivity::externalDataPath"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sdkVersion) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(sdkVersion)
-        )
+        "Offset of field: GameActivity::sdkVersion"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).instance) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(instance)
-        )
+        "Offset of field: GameActivity::instance"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).assetManager) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(assetManager)
-        )
+        "Offset of field: GameActivity::assetManager"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).obbPath) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivity),
-            "::",
-            stringify!(obbPath)
-        )
+        "Offset of field: GameActivity::obbPath"
     );
 }
 #[doc = " A function the user should call from their callback with the data, its length\n and the library- supplied context."]
@@ -3232,7 +3027,7 @@ pub struct GameActivityCallbacks {
     pub onNativeWindowDestroyed: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, window: *mut ANativeWindow),
     >,
-    #[doc = " The current device AConfiguration has changed.  The new configuration can\n be retrieved from assetManager."]
+    #[doc = " The current device AConfiguration has changed. The new configuration can\n be retrieved from assetManager."]
     pub onConfigurationChanged:
         ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity)>,
     #[doc = " The system is running low on memory.  Use this callback to release\n resources you do not need, to help the system avoid killing more\n important processes."]
@@ -3271,6 +3066,13 @@ pub struct GameActivityCallbacks {
     pub onContentRectChanged: ::std::option::Option<
         unsafe extern "C" fn(activity: *mut GameActivity, rect: *const ARect),
     >,
+    #[doc = " Callback called when the software keyboard is shown or hidden."]
+    pub onSoftwareKeyboardVisibilityChanged:
+        ::std::option::Option<unsafe extern "C" fn(activity: *mut GameActivity, visible: bool)>,
+    #[doc = " Callback called when the software keyboard is shown or hidden."]
+    pub onEditorAction: ::std::option::Option<
+        unsafe extern "C" fn(activity: *mut GameActivity, action: ::std::os::raw::c_int) -> bool,
+    >,
 }
 #[test]
 fn bindgen_test_layout_GameActivityCallbacks() {
@@ -3279,203 +3081,120 @@ fn bindgen_test_layout_GameActivityCallbacks() {
     let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<GameActivityCallbacks>(),
-        152usize,
-        concat!("Size of: ", stringify!(GameActivityCallbacks))
+        168usize,
+        "Size of GameActivityCallbacks"
     );
     assert_eq!(
         ::std::mem::align_of::<GameActivityCallbacks>(),
         8usize,
-        concat!("Alignment of ", stringify!(GameActivityCallbacks))
+        "Alignment of GameActivityCallbacks"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onStart) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onStart)
-        )
+        "Offset of field: GameActivityCallbacks::onStart"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onResume) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onResume)
-        )
+        "Offset of field: GameActivityCallbacks::onResume"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onSaveInstanceState) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onSaveInstanceState)
-        )
+        "Offset of field: GameActivityCallbacks::onSaveInstanceState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onPause) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onPause)
-        )
+        "Offset of field: GameActivityCallbacks::onPause"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onStop) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onStop)
-        )
+        "Offset of field: GameActivityCallbacks::onStop"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onDestroy) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onDestroy)
-        )
+        "Offset of field: GameActivityCallbacks::onDestroy"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onWindowFocusChanged) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onWindowFocusChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onWindowFocusChanged"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowCreated) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowCreated)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowCreated"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowResized) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowResized)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowResized"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowRedrawNeeded) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowRedrawNeeded)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowRedrawNeeded"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onNativeWindowDestroyed) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onNativeWindowDestroyed)
-        )
+        "Offset of field: GameActivityCallbacks::onNativeWindowDestroyed"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onConfigurationChanged) as usize - ptr as usize },
         88usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onConfigurationChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onConfigurationChanged"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onTrimMemory) as usize - ptr as usize },
         96usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onTrimMemory)
-        )
+        "Offset of field: GameActivityCallbacks::onTrimMemory"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onTouchEvent) as usize - ptr as usize },
         104usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onTouchEvent)
-        )
+        "Offset of field: GameActivityCallbacks::onTouchEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onKeyDown) as usize - ptr as usize },
         112usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onKeyDown)
-        )
+        "Offset of field: GameActivityCallbacks::onKeyDown"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onKeyUp) as usize - ptr as usize },
         120usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onKeyUp)
-        )
+        "Offset of field: GameActivityCallbacks::onKeyUp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onTextInputEvent) as usize - ptr as usize },
         128usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onTextInputEvent)
-        )
+        "Offset of field: GameActivityCallbacks::onTextInputEvent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onWindowInsetsChanged) as usize - ptr as usize },
         136usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onWindowInsetsChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onWindowInsetsChanged"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onContentRectChanged) as usize - ptr as usize },
         144usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(GameActivityCallbacks),
-            "::",
-            stringify!(onContentRectChanged)
-        )
+        "Offset of field: GameActivityCallbacks::onContentRectChanged"
+    );
+    assert_eq!(
+        unsafe {
+            ::std::ptr::addr_of!((*ptr).onSoftwareKeyboardVisibilityChanged) as usize - ptr as usize
+        },
+        152usize,
+        "Offset of field: GameActivityCallbacks::onSoftwareKeyboardVisibilityChanged"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).onEditorAction) as usize - ptr as usize },
+        160usize,
+        "Offset of field: GameActivityCallbacks::onEditorAction"
     );
 }
 #[doc = " This is the function that must be in the native code to instantiate the\n application's native activity.  It is called with the activity instance (see\n above); if the code is being instantiated from a previously saved instance,\n the savedState will be non-NULL and point to the saved data.  You must make\n any copy of this data you need -- it will be released after you return from\n this function."]
@@ -3555,7 +3274,7 @@ pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_TURN_SCREEN_ON: GameActiv
 pub const GameActivitySetWindowFlags_GAMEACTIVITY_FLAG_DISMISS_KEYGUARD:
     GameActivitySetWindowFlags = 4194304;
 #[doc = " Flags for GameActivity_setWindowFlags,\n as per the Java API at android.view.WindowManager.LayoutParams."]
-pub type GameActivitySetWindowFlags = ::std::os::raw::c_uint;
+pub type GameActivitySetWindowFlags = u32;
 extern "C" {
     #[doc = " Change the window flags of the given activity.  Calls getWindow().setFlags()\n of the given activity.\n Note that some flags must be set before the window decoration is created,\n see\n https://developer.android.com/reference/android/view/Window#setFlags(int,%20int).\n Note also that this method can be called from\n *any* thread; it will send a message to the main thread of the process\n where the Java finish call will take place."]
     pub fn GameActivity_setWindowFlags(
@@ -3571,11 +3290,15 @@ pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_IMPLICIT:
 pub const GameActivityShowSoftInputFlags_GAMEACTIVITY_SHOW_SOFT_INPUT_FORCED:
     GameActivityShowSoftInputFlags = 2;
 #[doc = " Flags for GameActivity_showSoftInput; see the Java InputMethodManager\n API for documentation."]
-pub type GameActivityShowSoftInputFlags = ::std::os::raw::c_uint;
+pub type GameActivityShowSoftInputFlags = u8;
 extern "C" {
     #[doc = " Show the IME while in the given activity.  Calls\n InputMethodManager.showSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java call will take place."]
     pub fn GameActivity_showSoftInput(activity: *mut GameActivity, flags: u32);
 }
+extern "C" {
+    #[doc = " Restarts the input method. Calls InputMethodManager.restartInput().\n Note that this method can be called from *any* thread; it will send a message\n to the main thread of the process where the Java call will take place."]
+    pub fn GameActivity_restartInput(activity: *mut GameActivity);
+}
 extern "C" {
     #[doc = " Set the text entry state (see documentation of the GameTextInputState struct\n in the Game Text Input library reference).\n\n Ownership of the state is maintained by the caller."]
     pub fn GameActivity_setTextInputState(
@@ -3602,7 +3325,7 @@ pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_IMPLICIT_O
 pub const GameActivityHideSoftInputFlags_GAMEACTIVITY_HIDE_SOFT_INPUT_NOT_ALWAYS:
     GameActivityHideSoftInputFlags = 2;
 #[doc = " Flags for GameActivity_hideSoftInput; see the Java InputMethodManager\n API for documentation."]
-pub type GameActivityHideSoftInputFlags = ::std::os::raw::c_uint;
+pub type GameActivityHideSoftInputFlags = u16;
 extern "C" {
     #[doc = " Hide the IME while in the given activity.  Calls\n InputMethodManager.hideSoftInput() for the given activity.  Note that this\n method can be called from *any* thread; it will send a message to the main\n thread of the process where the Java finish call will take place."]
     pub fn GameActivity_hideSoftInput(activity: *mut GameActivity, flags: u32);
@@ -3616,12 +3339,16 @@ extern "C" {
     );
 }
 extern "C" {
-    #[doc = " Set options on how the IME behaves when it is requested for text input.\n See\n https://developer.android.com/reference/android/view/inputmethod/EditorInfo\n for the meaning of inputType, actionId and imeOptions.\n\n Note that this function will attach the current thread to the JVM if it is\n not already attached, so the caller must detach the thread from the JVM\n before the thread is destroyed using DetachCurrentThread."]
+    #[doc = " Tells whether the software keyboard is visible or not."]
+    pub fn GameActivity_isSoftwareKeyboardVisible(activity: *mut GameActivity) -> bool;
+}
+extern "C" {
+    #[doc = " Set options on how the IME behaves when it is requested for text input.\n See\n https://developer.android.com/reference/android/view/inputmethod/EditorInfo\n for the meaning of inputType, actionId and imeOptions.\n\n <b>Note:</b> currently only TYPE_NULL AND TYPE_CLASS_NUMBER are supported."]
     pub fn GameActivity_setImeEditorInfo(
         activity: *mut GameActivity,
-        inputType: ::std::os::raw::c_int,
-        actionId: ::std::os::raw::c_int,
-        imeOptions: ::std::os::raw::c_int,
+        inputType: GameTextInputType,
+        actionId: GameTextInputActionType,
+        imeOptions: GameTextInputImeOptions,
     );
 }
 extern "C" {
@@ -3652,6 +3379,9 @@ extern "C" {
 extern "C" {
     pub fn GameActivity_getKeyboardHidden(activity: *mut GameActivity) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn GameActivity_getLocalesCount(activity: *mut GameActivity) -> ::std::os::raw::c_int;
+}
 extern "C" {
     pub fn GameActivity_getMcc(activity: *mut GameActivity) -> ::std::os::raw::c_int;
 }
@@ -3684,6 +3414,39 @@ extern "C" {
 extern "C" {
     pub fn GameActivity_getUIMode(activity: *mut GameActivity) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    #[doc = " The functions below return Java locale information.\n\n In simple cases there will be just one locale, but it's possible tha\n there are more than one locale objects. Users are encouraged to write code\n that handles all locales and not just the first one.\n\n The functions in the block below return string values in the provided buffer.\n Return value is zero if there were no errors, otherwise it's non-zero.\n If the return value is zero, `dst` will contain a null-terminated string:\n strlen(dst) <= dst_size - 1.\n If the return value is non-zero, the content of dst is undefined.\n\n Parameters:\n\n dst, dst_size: define a receiver buffer. Locale string can be something\n short like \"EN/EN\", but it may be longer. You should be safe with a buffer\n size of 256 bytes.\n\n If the buffer is too small, ENOBUFS is returned. Try allocating a larger\n buffer in this case.\n\n localeIdx must be between 0 and the value of GameActivity_getLocalesCount().\n If localeIdx is out of range, EINVAL is returned.\n\n Refer to Java documentation of locales for more information."]
+    pub fn GameActivity_getLocaleLanguage(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getLocaleScript(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getLocaleCountry(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn GameActivity_getLocaleVariant(
+        dst: *mut ::std::os::raw::c_char,
+        dst_size: usize,
+        activity: *mut GameActivity,
+        localeIdx: usize,
+    ) -> ::std::os::raw::c_int;
+}
 pub const ACONFIGURATION_ORIENTATION_ANY: _bindgen_ty_21 = 0;
 pub const ACONFIGURATION_ORIENTATION_PORT: _bindgen_ty_21 = 1;
 pub const ACONFIGURATION_ORIENTATION_LAND: _bindgen_ty_21 = 2;
@@ -3782,45 +3545,26 @@ pub struct pollfd {
 fn bindgen_test_layout_pollfd() {
     const UNINIT: ::std::mem::MaybeUninit<pollfd> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<pollfd>(),
-        8usize,
-        concat!("Size of: ", stringify!(pollfd))
-    );
+    assert_eq!(::std::mem::size_of::<pollfd>(), 8usize, "Size of pollfd");
     assert_eq!(
         ::std::mem::align_of::<pollfd>(),
         4usize,
-        concat!("Alignment of ", stringify!(pollfd))
+        "Alignment of pollfd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(pollfd),
-            "::",
-            stringify!(fd)
-        )
+        "Offset of field: pollfd::fd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).events) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(pollfd),
-            "::",
-            stringify!(events)
-        )
+        "Offset of field: pollfd::events"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).revents) as usize - ptr as usize },
         6usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(pollfd),
-            "::",
-            stringify!(revents)
-        )
+        "Offset of field: pollfd::revents"
     );
 }
 #[repr(C)]
@@ -3839,62 +3583,37 @@ fn bindgen_test_layout__fpx_sw_bytes() {
     assert_eq!(
         ::std::mem::size_of::<_fpx_sw_bytes>(),
         48usize,
-        concat!("Size of: ", stringify!(_fpx_sw_bytes))
+        "Size of _fpx_sw_bytes"
     );
     assert_eq!(
         ::std::mem::align_of::<_fpx_sw_bytes>(),
         8usize,
-        concat!("Alignment of ", stringify!(_fpx_sw_bytes))
+        "Alignment of _fpx_sw_bytes"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).magic1) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpx_sw_bytes),
-            "::",
-            stringify!(magic1)
-        )
+        "Offset of field: _fpx_sw_bytes::magic1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).extended_size) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpx_sw_bytes),
-            "::",
-            stringify!(extended_size)
-        )
+        "Offset of field: _fpx_sw_bytes::extended_size"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xfeatures) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpx_sw_bytes),
-            "::",
-            stringify!(xfeatures)
-        )
+        "Offset of field: _fpx_sw_bytes::xfeatures"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xstate_size) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpx_sw_bytes),
-            "::",
-            stringify!(xstate_size)
-        )
+        "Offset of field: _fpx_sw_bytes::xstate_size"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpx_sw_bytes),
-            "::",
-            stringify!(padding)
-        )
+        "Offset of field: _fpx_sw_bytes::padding"
     );
 }
 #[repr(C)]
@@ -3907,35 +3626,21 @@ pub struct _fpreg {
 fn bindgen_test_layout__fpreg() {
     const UNINIT: ::std::mem::MaybeUninit<_fpreg> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<_fpreg>(),
-        10usize,
-        concat!("Size of: ", stringify!(_fpreg))
-    );
+    assert_eq!(::std::mem::size_of::<_fpreg>(), 10usize, "Size of _fpreg");
     assert_eq!(
         ::std::mem::align_of::<_fpreg>(),
         2usize,
-        concat!("Alignment of ", stringify!(_fpreg))
+        "Alignment of _fpreg"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).significand) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpreg),
-            "::",
-            stringify!(significand)
-        )
+        "Offset of field: _fpreg::significand"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).exponent) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpreg),
-            "::",
-            stringify!(exponent)
-        )
+        "Offset of field: _fpreg::exponent"
     );
 }
 #[repr(C)]
@@ -3949,45 +3654,26 @@ pub struct _fpxreg {
 fn bindgen_test_layout__fpxreg() {
     const UNINIT: ::std::mem::MaybeUninit<_fpxreg> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<_fpxreg>(),
-        16usize,
-        concat!("Size of: ", stringify!(_fpxreg))
-    );
+    assert_eq!(::std::mem::size_of::<_fpxreg>(), 16usize, "Size of _fpxreg");
     assert_eq!(
         ::std::mem::align_of::<_fpxreg>(),
         2usize,
-        concat!("Alignment of ", stringify!(_fpxreg))
+        "Alignment of _fpxreg"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).significand) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpxreg),
-            "::",
-            stringify!(significand)
-        )
+        "Offset of field: _fpxreg::significand"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).exponent) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpxreg),
-            "::",
-            stringify!(exponent)
-        )
+        "Offset of field: _fpxreg::exponent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         10usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpxreg),
-            "::",
-            stringify!(padding)
-        )
+        "Offset of field: _fpxreg::padding"
     );
 }
 #[repr(C)]
@@ -3999,25 +3685,16 @@ pub struct _xmmreg {
 fn bindgen_test_layout__xmmreg() {
     const UNINIT: ::std::mem::MaybeUninit<_xmmreg> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<_xmmreg>(),
-        16usize,
-        concat!("Size of: ", stringify!(_xmmreg))
-    );
+    assert_eq!(::std::mem::size_of::<_xmmreg>(), 16usize, "Size of _xmmreg");
     assert_eq!(
         ::std::mem::align_of::<_xmmreg>(),
         4usize,
-        concat!("Alignment of ", stringify!(_xmmreg))
+        "Alignment of _xmmreg"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).element) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_xmmreg),
-            "::",
-            stringify!(element)
-        )
+        "Offset of field: _xmmreg::element"
     );
 }
 #[repr(C)]
@@ -4055,32 +3732,22 @@ fn bindgen_test_layout__fpstate_32__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<_fpstate_32__bindgen_ty_1>(),
         176usize,
-        concat!("Size of: ", stringify!(_fpstate_32__bindgen_ty_1))
+        "Size of _fpstate_32__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<_fpstate_32__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(_fpstate_32__bindgen_ty_1))
+        "Alignment of _fpstate_32__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).padding1) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32__bindgen_ty_1),
-            "::",
-            stringify!(padding1)
-        )
+        "Offset of field: _fpstate_32__bindgen_ty_1::padding1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32__bindgen_ty_1),
-            "::",
-            stringify!(padding)
-        )
+        "Offset of field: _fpstate_32__bindgen_ty_1::padding"
     );
 }
 #[repr(C)]
@@ -4097,32 +3764,22 @@ fn bindgen_test_layout__fpstate_32__bindgen_ty_2() {
     assert_eq!(
         ::std::mem::size_of::<_fpstate_32__bindgen_ty_2>(),
         48usize,
-        concat!("Size of: ", stringify!(_fpstate_32__bindgen_ty_2))
+        "Size of _fpstate_32__bindgen_ty_2"
     );
     assert_eq!(
         ::std::mem::align_of::<_fpstate_32__bindgen_ty_2>(),
         8usize,
-        concat!("Alignment of ", stringify!(_fpstate_32__bindgen_ty_2))
+        "Alignment of _fpstate_32__bindgen_ty_2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).padding2) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32__bindgen_ty_2),
-            "::",
-            stringify!(padding2)
-        )
+        "Offset of field: _fpstate_32__bindgen_ty_2::padding2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sw_reserved) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32__bindgen_ty_2),
-            "::",
-            stringify!(sw_reserved)
-        )
+        "Offset of field: _fpstate_32__bindgen_ty_2::sw_reserved"
     );
 }
 #[test]
@@ -4132,162 +3789,87 @@ fn bindgen_test_layout__fpstate_32() {
     assert_eq!(
         ::std::mem::size_of::<_fpstate_32>(),
         624usize,
-        concat!("Size of: ", stringify!(_fpstate_32))
+        "Size of _fpstate_32"
     );
     assert_eq!(
         ::std::mem::align_of::<_fpstate_32>(),
         8usize,
-        concat!("Alignment of ", stringify!(_fpstate_32))
+        "Alignment of _fpstate_32"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cw) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(cw)
-        )
+        "Offset of field: _fpstate_32::cw"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sw) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(sw)
-        )
+        "Offset of field: _fpstate_32::sw"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tag) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(tag)
-        )
+        "Offset of field: _fpstate_32::tag"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ipoff) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(ipoff)
-        )
+        "Offset of field: _fpstate_32::ipoff"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cssel) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(cssel)
-        )
+        "Offset of field: _fpstate_32::cssel"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).dataoff) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(dataoff)
-        )
+        "Offset of field: _fpstate_32::dataoff"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).datasel) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(datasel)
-        )
+        "Offset of field: _fpstate_32::datasel"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._st) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(_st)
-        )
+        "Offset of field: _fpstate_32::_st"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).status) as usize - ptr as usize },
         108usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(status)
-        )
+        "Offset of field: _fpstate_32::status"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).magic) as usize - ptr as usize },
         110usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(magic)
-        )
+        "Offset of field: _fpstate_32::magic"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._fxsr_env) as usize - ptr as usize },
         112usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(_fxsr_env)
-        )
+        "Offset of field: _fpstate_32::_fxsr_env"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).mxcsr) as usize - ptr as usize },
         136usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(mxcsr)
-        )
+        "Offset of field: _fpstate_32::mxcsr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved) as usize - ptr as usize },
         140usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(reserved)
-        )
+        "Offset of field: _fpstate_32::reserved"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._fxsr_st) as usize - ptr as usize },
         144usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(_fxsr_st)
-        )
+        "Offset of field: _fpstate_32::_fxsr_st"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._xmm) as usize - ptr as usize },
         272usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_32),
-            "::",
-            stringify!(_xmm)
-        )
+        "Offset of field: _fpstate_32::_xmm"
     );
 }
 #[repr(C)]
@@ -4320,32 +3902,22 @@ fn bindgen_test_layout__fpstate_64__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<_fpstate_64__bindgen_ty_1>(),
         48usize,
-        concat!("Size of: ", stringify!(_fpstate_64__bindgen_ty_1))
+        "Size of _fpstate_64__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<_fpstate_64__bindgen_ty_1>(),
         8usize,
-        concat!("Alignment of ", stringify!(_fpstate_64__bindgen_ty_1))
+        "Alignment of _fpstate_64__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved3) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64__bindgen_ty_1),
-            "::",
-            stringify!(reserved3)
-        )
+        "Offset of field: _fpstate_64__bindgen_ty_1::reserved3"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sw_reserved) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64__bindgen_ty_1),
-            "::",
-            stringify!(sw_reserved)
-        )
+        "Offset of field: _fpstate_64__bindgen_ty_1::sw_reserved"
     );
 }
 #[test]
@@ -4355,122 +3927,67 @@ fn bindgen_test_layout__fpstate_64() {
     assert_eq!(
         ::std::mem::size_of::<_fpstate_64>(),
         512usize,
-        concat!("Size of: ", stringify!(_fpstate_64))
+        "Size of _fpstate_64"
     );
     assert_eq!(
         ::std::mem::align_of::<_fpstate_64>(),
         8usize,
-        concat!("Alignment of ", stringify!(_fpstate_64))
+        "Alignment of _fpstate_64"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cwd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(cwd)
-        )
+        "Offset of field: _fpstate_64::cwd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).swd) as usize - ptr as usize },
         2usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(swd)
-        )
+        "Offset of field: _fpstate_64::swd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).twd) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(twd)
-        )
+        "Offset of field: _fpstate_64::twd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fop) as usize - ptr as usize },
         6usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(fop)
-        )
+        "Offset of field: _fpstate_64::fop"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rip) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(rip)
-        )
+        "Offset of field: _fpstate_64::rip"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rdp) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(rdp)
-        )
+        "Offset of field: _fpstate_64::rdp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).mxcsr) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(mxcsr)
-        )
+        "Offset of field: _fpstate_64::mxcsr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).mxcsr_mask) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(mxcsr_mask)
-        )
+        "Offset of field: _fpstate_64::mxcsr_mask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).st_space) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(st_space)
-        )
+        "Offset of field: _fpstate_64::st_space"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xmm_space) as usize - ptr as usize },
         160usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(xmm_space)
-        )
+        "Offset of field: _fpstate_64::xmm_space"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved2) as usize - ptr as usize },
         416usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_fpstate_64),
-            "::",
-            stringify!(reserved2)
-        )
+        "Offset of field: _fpstate_64::reserved2"
     );
 }
 #[repr(C)]
@@ -4484,45 +4001,26 @@ pub struct _header {
 fn bindgen_test_layout__header() {
     const UNINIT: ::std::mem::MaybeUninit<_header> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<_header>(),
-        64usize,
-        concat!("Size of: ", stringify!(_header))
-    );
+    assert_eq!(::std::mem::size_of::<_header>(), 64usize, "Size of _header");
     assert_eq!(
         ::std::mem::align_of::<_header>(),
         8usize,
-        concat!("Alignment of ", stringify!(_header))
+        "Alignment of _header"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xfeatures) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_header),
-            "::",
-            stringify!(xfeatures)
-        )
+        "Offset of field: _header::xfeatures"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved1) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_header),
-            "::",
-            stringify!(reserved1)
-        )
+        "Offset of field: _header::reserved1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved2) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_header),
-            "::",
-            stringify!(reserved2)
-        )
+        "Offset of field: _header::reserved2"
     );
 }
 #[repr(C)]
@@ -4537,22 +4035,17 @@ fn bindgen_test_layout__ymmh_state() {
     assert_eq!(
         ::std::mem::size_of::<_ymmh_state>(),
         256usize,
-        concat!("Size of: ", stringify!(_ymmh_state))
+        "Size of _ymmh_state"
     );
     assert_eq!(
         ::std::mem::align_of::<_ymmh_state>(),
         4usize,
-        concat!("Alignment of ", stringify!(_ymmh_state))
+        "Alignment of _ymmh_state"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ymmh_space) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_ymmh_state),
-            "::",
-            stringify!(ymmh_space)
-        )
+        "Offset of field: _ymmh_state::ymmh_space"
     );
 }
 #[repr(C)]
@@ -4569,42 +4062,27 @@ fn bindgen_test_layout__xstate() {
     assert_eq!(
         ::std::mem::size_of::<_xstate>(),
         832usize,
-        concat!("Size of: ", stringify!(_xstate))
+        "Size of _xstate"
     );
     assert_eq!(
         ::std::mem::align_of::<_xstate>(),
         8usize,
-        concat!("Alignment of ", stringify!(_xstate))
+        "Alignment of _xstate"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_xstate),
-            "::",
-            stringify!(fpstate)
-        )
+        "Offset of field: _xstate::fpstate"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xstate_hdr) as usize - ptr as usize },
         512usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_xstate),
-            "::",
-            stringify!(xstate_hdr)
-        )
+        "Offset of field: _xstate::xstate_hdr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ymmh) as usize - ptr as usize },
         576usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_xstate),
-            "::",
-            stringify!(ymmh)
-        )
+        "Offset of field: _xstate::ymmh"
     );
 }
 #[repr(C)]
@@ -4646,292 +4124,152 @@ fn bindgen_test_layout_sigcontext_32() {
     assert_eq!(
         ::std::mem::size_of::<sigcontext_32>(),
         88usize,
-        concat!("Size of: ", stringify!(sigcontext_32))
+        "Size of sigcontext_32"
     );
     assert_eq!(
         ::std::mem::align_of::<sigcontext_32>(),
         4usize,
-        concat!("Alignment of ", stringify!(sigcontext_32))
+        "Alignment of sigcontext_32"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).gs) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(gs)
-        )
+        "Offset of field: sigcontext_32::gs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__gsh) as usize - ptr as usize },
         2usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(__gsh)
-        )
+        "Offset of field: sigcontext_32::__gsh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fs) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(fs)
-        )
+        "Offset of field: sigcontext_32::fs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__fsh) as usize - ptr as usize },
         6usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(__fsh)
-        )
+        "Offset of field: sigcontext_32::__fsh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).es) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(es)
-        )
+        "Offset of field: sigcontext_32::es"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__esh) as usize - ptr as usize },
         10usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(__esh)
-        )
+        "Offset of field: sigcontext_32::__esh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ds) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(ds)
-        )
+        "Offset of field: sigcontext_32::ds"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__dsh) as usize - ptr as usize },
         14usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(__dsh)
-        )
+        "Offset of field: sigcontext_32::__dsh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).di) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(di)
-        )
+        "Offset of field: sigcontext_32::di"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(si)
-        )
+        "Offset of field: sigcontext_32::si"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).bp) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(bp)
-        )
+        "Offset of field: sigcontext_32::bp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sp) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(sp)
-        )
+        "Offset of field: sigcontext_32::sp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).bx) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(bx)
-        )
+        "Offset of field: sigcontext_32::bx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).dx) as usize - ptr as usize },
         36usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(dx)
-        )
+        "Offset of field: sigcontext_32::dx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cx) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(cx)
-        )
+        "Offset of field: sigcontext_32::cx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ax) as usize - ptr as usize },
         44usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(ax)
-        )
+        "Offset of field: sigcontext_32::ax"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).trapno) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(trapno)
-        )
+        "Offset of field: sigcontext_32::trapno"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).err) as usize - ptr as usize },
         52usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(err)
-        )
+        "Offset of field: sigcontext_32::err"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ip) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(ip)
-        )
+        "Offset of field: sigcontext_32::ip"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cs) as usize - ptr as usize },
         60usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(cs)
-        )
+        "Offset of field: sigcontext_32::cs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__csh) as usize - ptr as usize },
         62usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(__csh)
-        )
+        "Offset of field: sigcontext_32::__csh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: sigcontext_32::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sp_at_signal) as usize - ptr as usize },
         68usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(sp_at_signal)
-        )
+        "Offset of field: sigcontext_32::sp_at_signal"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(ss)
-        )
+        "Offset of field: sigcontext_32::ss"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__ssh) as usize - ptr as usize },
         74usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(__ssh)
-        )
+        "Offset of field: sigcontext_32::__ssh"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         76usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(fpstate)
-        )
+        "Offset of field: sigcontext_32::fpstate"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(oldmask)
-        )
+        "Offset of field: sigcontext_32::oldmask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cr2) as usize - ptr as usize },
         84usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_32),
-            "::",
-            stringify!(cr2)
-        )
+        "Offset of field: sigcontext_32::cr2"
     );
 }
 #[repr(C)]
@@ -4973,292 +4311,152 @@ fn bindgen_test_layout_sigcontext_64() {
     assert_eq!(
         ::std::mem::size_of::<sigcontext_64>(),
         256usize,
-        concat!("Size of: ", stringify!(sigcontext_64))
+        "Size of sigcontext_64"
     );
     assert_eq!(
         ::std::mem::align_of::<sigcontext_64>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigcontext_64))
+        "Alignment of sigcontext_64"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r8) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r8)
-        )
+        "Offset of field: sigcontext_64::r8"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r9) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r9)
-        )
+        "Offset of field: sigcontext_64::r9"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r10) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r10)
-        )
+        "Offset of field: sigcontext_64::r10"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r11) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r11)
-        )
+        "Offset of field: sigcontext_64::r11"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r12) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r12)
-        )
+        "Offset of field: sigcontext_64::r12"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r13) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r13)
-        )
+        "Offset of field: sigcontext_64::r13"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r14) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r14)
-        )
+        "Offset of field: sigcontext_64::r14"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r15) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(r15)
-        )
+        "Offset of field: sigcontext_64::r15"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).di) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(di)
-        )
+        "Offset of field: sigcontext_64::di"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(si)
-        )
+        "Offset of field: sigcontext_64::si"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).bp) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(bp)
-        )
+        "Offset of field: sigcontext_64::bp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).bx) as usize - ptr as usize },
         88usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(bx)
-        )
+        "Offset of field: sigcontext_64::bx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).dx) as usize - ptr as usize },
         96usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(dx)
-        )
+        "Offset of field: sigcontext_64::dx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ax) as usize - ptr as usize },
         104usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(ax)
-        )
+        "Offset of field: sigcontext_64::ax"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cx) as usize - ptr as usize },
         112usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(cx)
-        )
+        "Offset of field: sigcontext_64::cx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sp) as usize - ptr as usize },
         120usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(sp)
-        )
+        "Offset of field: sigcontext_64::sp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ip) as usize - ptr as usize },
         128usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(ip)
-        )
+        "Offset of field: sigcontext_64::ip"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         136usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: sigcontext_64::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cs) as usize - ptr as usize },
         144usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(cs)
-        )
+        "Offset of field: sigcontext_64::cs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).gs) as usize - ptr as usize },
         146usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(gs)
-        )
+        "Offset of field: sigcontext_64::gs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fs) as usize - ptr as usize },
         148usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(fs)
-        )
+        "Offset of field: sigcontext_64::fs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss) as usize - ptr as usize },
         150usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(ss)
-        )
+        "Offset of field: sigcontext_64::ss"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).err) as usize - ptr as usize },
         152usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(err)
-        )
+        "Offset of field: sigcontext_64::err"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).trapno) as usize - ptr as usize },
         160usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(trapno)
-        )
+        "Offset of field: sigcontext_64::trapno"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         168usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(oldmask)
-        )
+        "Offset of field: sigcontext_64::oldmask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cr2) as usize - ptr as usize },
         176usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(cr2)
-        )
+        "Offset of field: sigcontext_64::cr2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         184usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(fpstate)
-        )
+        "Offset of field: sigcontext_64::fpstate"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved1) as usize - ptr as usize },
         192usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext_64),
-            "::",
-            stringify!(reserved1)
-        )
+        "Offset of field: sigcontext_64::reserved1"
     );
 }
 #[repr(C)]
@@ -5307,32 +4505,22 @@ fn bindgen_test_layout_sigcontext__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigcontext__bindgen_ty_1>(),
         2usize,
-        concat!("Size of: ", stringify!(sigcontext__bindgen_ty_1))
+        "Size of sigcontext__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigcontext__bindgen_ty_1>(),
         2usize,
-        concat!("Alignment of ", stringify!(sigcontext__bindgen_ty_1))
+        "Alignment of sigcontext__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext__bindgen_ty_1),
-            "::",
-            stringify!(ss)
-        )
+        "Offset of field: sigcontext__bindgen_ty_1::ss"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__pad0) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext__bindgen_ty_1),
-            "::",
-            stringify!(__pad0)
-        )
+        "Offset of field: sigcontext__bindgen_ty_1::__pad0"
     );
 }
 #[test]
@@ -5342,282 +4530,178 @@ fn bindgen_test_layout_sigcontext() {
     assert_eq!(
         ::std::mem::size_of::<sigcontext>(),
         256usize,
-        concat!("Size of: ", stringify!(sigcontext))
+        "Size of sigcontext"
     );
     assert_eq!(
         ::std::mem::align_of::<sigcontext>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigcontext))
+        "Alignment of sigcontext"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r8) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(r8)
-        )
+        "Offset of field: sigcontext::r8"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r9) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(r9)
-        )
+        "Offset of field: sigcontext::r9"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r10) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(r10)
-        )
+        "Offset of field: sigcontext::r10"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r11) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(r11)
-        )
+        "Offset of field: sigcontext::r11"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r12) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(r12)
-        )
+        "Offset of field: sigcontext::r12"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r13) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(r13)
-        )
+        "Offset of field: sigcontext::r13"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r14) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(r14)
-        )
+        "Offset of field: sigcontext::r14"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r15) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(r15)
-        )
+        "Offset of field: sigcontext::r15"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rdi) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(rdi)
-        )
+        "Offset of field: sigcontext::rdi"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rsi) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(rsi)
-        )
+        "Offset of field: sigcontext::rsi"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rbp) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(rbp)
-        )
+        "Offset of field: sigcontext::rbp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rbx) as usize - ptr as usize },
         88usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(rbx)
-        )
+        "Offset of field: sigcontext::rbx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rdx) as usize - ptr as usize },
         96usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(rdx)
-        )
+        "Offset of field: sigcontext::rdx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rax) as usize - ptr as usize },
         104usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(rax)
-        )
+        "Offset of field: sigcontext::rax"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rcx) as usize - ptr as usize },
         112usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(rcx)
-        )
+        "Offset of field: sigcontext::rcx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rsp) as usize - ptr as usize },
         120usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(rsp)
-        )
+        "Offset of field: sigcontext::rsp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rip) as usize - ptr as usize },
         128usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(rip)
-        )
+        "Offset of field: sigcontext::rip"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eflags) as usize - ptr as usize },
         136usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(eflags)
-        )
+        "Offset of field: sigcontext::eflags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cs) as usize - ptr as usize },
         144usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(cs)
-        )
+        "Offset of field: sigcontext::cs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).gs) as usize - ptr as usize },
         146usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(gs)
-        )
+        "Offset of field: sigcontext::gs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fs) as usize - ptr as usize },
         148usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(fs)
-        )
+        "Offset of field: sigcontext::fs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).err) as usize - ptr as usize },
         152usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(err)
-        )
+        "Offset of field: sigcontext::err"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).trapno) as usize - ptr as usize },
         160usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(trapno)
-        )
+        "Offset of field: sigcontext::trapno"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).oldmask) as usize - ptr as usize },
         168usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(oldmask)
-        )
+        "Offset of field: sigcontext::oldmask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cr2) as usize - ptr as usize },
         176usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(cr2)
-        )
+        "Offset of field: sigcontext::cr2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpstate) as usize - ptr as usize },
         184usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(fpstate)
-        )
+        "Offset of field: sigcontext::fpstate"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved1) as usize - ptr as usize },
         192usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigcontext),
-            "::",
-            stringify!(reserved1)
-        )
+        "Offset of field: sigcontext::reserved1"
+    );
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct timespec {
+    pub tv_sec: time_t,
+    pub tv_nsec: ::std::os::raw::c_long,
+}
+#[test]
+fn bindgen_test_layout_timespec() {
+    const UNINIT: ::std::mem::MaybeUninit<timespec> = ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
+    assert_eq!(
+        ::std::mem::size_of::<timespec>(),
+        16usize,
+        "Size of timespec"
+    );
+    assert_eq!(
+        ::std::mem::align_of::<timespec>(),
+        8usize,
+        "Alignment of timespec"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
+        0usize,
+        "Offset of field: timespec::tv_sec"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
+        8usize,
+        "Offset of field: timespec::tv_nsec"
     );
 }
 #[repr(C)]
@@ -5633,32 +4717,22 @@ fn bindgen_test_layout___kernel_timespec() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_timespec>(),
         16usize,
-        concat!("Size of: ", stringify!(__kernel_timespec))
+        "Size of __kernel_timespec"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_timespec>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_timespec))
+        "Alignment of __kernel_timespec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_timespec),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: __kernel_timespec::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_timespec),
-            "::",
-            stringify!(tv_nsec)
-        )
+        "Offset of field: __kernel_timespec::tv_nsec"
     );
 }
 #[repr(C)]
@@ -5674,32 +4748,22 @@ fn bindgen_test_layout___kernel_itimerspec() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_itimerspec>(),
         32usize,
-        concat!("Size of: ", stringify!(__kernel_itimerspec))
+        "Size of __kernel_itimerspec"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_itimerspec>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_itimerspec))
+        "Alignment of __kernel_itimerspec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_itimerspec),
-            "::",
-            stringify!(it_interval)
-        )
+        "Offset of field: __kernel_itimerspec::it_interval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_itimerspec),
-            "::",
-            stringify!(it_value)
-        )
+        "Offset of field: __kernel_itimerspec::it_value"
     );
 }
 #[repr(C)]
@@ -5716,32 +4780,22 @@ fn bindgen_test_layout___kernel_old_timespec() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_old_timespec>(),
         16usize,
-        concat!("Size of: ", stringify!(__kernel_old_timespec))
+        "Size of __kernel_old_timespec"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_old_timespec>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_old_timespec))
+        "Alignment of __kernel_old_timespec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_old_timespec),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: __kernel_old_timespec::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_old_timespec),
-            "::",
-            stringify!(tv_nsec)
-        )
+        "Offset of field: __kernel_old_timespec::tv_nsec"
     );
 }
 #[repr(C)]
@@ -5758,73 +4812,22 @@ fn bindgen_test_layout___kernel_sock_timeval() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_sock_timeval>(),
         16usize,
-        concat!("Size of: ", stringify!(__kernel_sock_timeval))
+        "Size of __kernel_sock_timeval"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_sock_timeval>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_sock_timeval))
+        "Alignment of __kernel_sock_timeval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sock_timeval),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: __kernel_sock_timeval::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sock_timeval),
-            "::",
-            stringify!(tv_usec)
-        )
-    );
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct timespec {
-    pub tv_sec: __kernel_old_time_t,
-    pub tv_nsec: ::std::os::raw::c_long,
-}
-#[test]
-fn bindgen_test_layout_timespec() {
-    const UNINIT: ::std::mem::MaybeUninit<timespec> = ::std::mem::MaybeUninit::uninit();
-    let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<timespec>(),
-        16usize,
-        concat!("Size of: ", stringify!(timespec))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<timespec>(),
-        8usize,
-        concat!("Alignment of ", stringify!(timespec))
-    );
-    assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timespec),
-            "::",
-            stringify!(tv_sec)
-        )
-    );
-    assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).tv_nsec) as usize - ptr as usize },
-        8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timespec),
-            "::",
-            stringify!(tv_nsec)
-        )
+        "Offset of field: __kernel_sock_timeval::tv_usec"
     );
 }
 #[repr(C)]
@@ -5837,35 +4840,21 @@ pub struct timeval {
 fn bindgen_test_layout_timeval() {
     const UNINIT: ::std::mem::MaybeUninit<timeval> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<timeval>(),
-        16usize,
-        concat!("Size of: ", stringify!(timeval))
-    );
+    assert_eq!(::std::mem::size_of::<timeval>(), 16usize, "Size of timeval");
     assert_eq!(
         ::std::mem::align_of::<timeval>(),
         8usize,
-        concat!("Alignment of ", stringify!(timeval))
+        "Alignment of timeval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timeval),
-            "::",
-            stringify!(tv_sec)
-        )
+        "Offset of field: timeval::tv_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tv_usec) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timeval),
-            "::",
-            stringify!(tv_usec)
-        )
+        "Offset of field: timeval::tv_usec"
     );
 }
 #[repr(C)]
@@ -5881,32 +4870,22 @@ fn bindgen_test_layout_itimerspec() {
     assert_eq!(
         ::std::mem::size_of::<itimerspec>(),
         32usize,
-        concat!("Size of: ", stringify!(itimerspec))
+        "Size of itimerspec"
     );
     assert_eq!(
         ::std::mem::align_of::<itimerspec>(),
         8usize,
-        concat!("Alignment of ", stringify!(itimerspec))
+        "Alignment of itimerspec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerspec),
-            "::",
-            stringify!(it_interval)
-        )
+        "Offset of field: itimerspec::it_interval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerspec),
-            "::",
-            stringify!(it_value)
-        )
+        "Offset of field: itimerspec::it_value"
     );
 }
 #[repr(C)]
@@ -5922,32 +4901,22 @@ fn bindgen_test_layout_itimerval() {
     assert_eq!(
         ::std::mem::size_of::<itimerval>(),
         32usize,
-        concat!("Size of: ", stringify!(itimerval))
+        "Size of itimerval"
     );
     assert_eq!(
         ::std::mem::align_of::<itimerval>(),
         8usize,
-        concat!("Alignment of ", stringify!(itimerval))
+        "Alignment of itimerval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_interval) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerval),
-            "::",
-            stringify!(it_interval)
-        )
+        "Offset of field: itimerval::it_interval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).it_value) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(itimerval),
-            "::",
-            stringify!(it_value)
-        )
+        "Offset of field: itimerval::it_value"
     );
 }
 #[repr(C)]
@@ -5963,32 +4932,22 @@ fn bindgen_test_layout_timezone() {
     assert_eq!(
         ::std::mem::size_of::<timezone>(),
         8usize,
-        concat!("Size of: ", stringify!(timezone))
+        "Size of timezone"
     );
     assert_eq!(
         ::std::mem::align_of::<timezone>(),
         4usize,
-        concat!("Alignment of ", stringify!(timezone))
+        "Alignment of timezone"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tz_minuteswest) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_minuteswest)
-        )
+        "Offset of field: timezone::tz_minuteswest"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tz_dsttime) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(timezone),
-            "::",
-            stringify!(tz_dsttime)
-        )
+        "Offset of field: timezone::tz_dsttime"
     );
 }
 pub type sigset_t = ::std::os::raw::c_ulong;
@@ -6011,52 +4970,32 @@ fn bindgen_test_layout___kernel_sigaction() {
     assert_eq!(
         ::std::mem::size_of::<__kernel_sigaction>(),
         32usize,
-        concat!("Size of: ", stringify!(__kernel_sigaction))
+        "Size of __kernel_sigaction"
     );
     assert_eq!(
         ::std::mem::align_of::<__kernel_sigaction>(),
         8usize,
-        concat!("Alignment of ", stringify!(__kernel_sigaction))
+        "Alignment of __kernel_sigaction"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(sa_handler)
-        )
+        "Offset of field: __kernel_sigaction::sa_handler"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(sa_flags)
-        )
+        "Offset of field: __kernel_sigaction::sa_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(sa_restorer)
-        )
+        "Offset of field: __kernel_sigaction::sa_restorer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__kernel_sigaction),
-            "::",
-            stringify!(sa_mask)
-        )
+        "Offset of field: __kernel_sigaction::sa_mask"
     );
 }
 #[repr(C)]
@@ -6073,42 +5012,27 @@ fn bindgen_test_layout_sigaltstack() {
     assert_eq!(
         ::std::mem::size_of::<sigaltstack>(),
         24usize,
-        concat!("Size of: ", stringify!(sigaltstack))
+        "Size of sigaltstack"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaltstack>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigaltstack))
+        "Alignment of sigaltstack"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss_sp) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaltstack),
-            "::",
-            stringify!(ss_sp)
-        )
+        "Offset of field: sigaltstack::ss_sp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss_flags) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaltstack),
-            "::",
-            stringify!(ss_flags)
-        )
+        "Offset of field: sigaltstack::ss_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss_size) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaltstack),
-            "::",
-            stringify!(ss_size)
-        )
+        "Offset of field: sigaltstack::ss_size"
     );
 }
 pub type stack_t = sigaltstack;
@@ -6122,35 +5046,21 @@ pub union sigval {
 fn bindgen_test_layout_sigval() {
     const UNINIT: ::std::mem::MaybeUninit<sigval> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<sigval>(),
-        8usize,
-        concat!("Size of: ", stringify!(sigval))
-    );
+    assert_eq!(::std::mem::size_of::<sigval>(), 8usize, "Size of sigval");
     assert_eq!(
         ::std::mem::align_of::<sigval>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigval))
+        "Alignment of sigval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sival_int) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigval),
-            "::",
-            stringify!(sival_int)
-        )
+        "Offset of field: sigval::sival_int"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sival_ptr) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigval),
-            "::",
-            stringify!(sival_ptr)
-        )
+        "Offset of field: sigval::sival_ptr"
     );
 }
 pub type sigval_t = sigval;
@@ -6179,32 +5089,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_1>(),
         8usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_1))
+        "Size of __sifields__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_1>(),
         4usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_1))
+        "Alignment of __sifields__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_1),
-            "::",
-            stringify!(_pid)
-        )
+        "Offset of field: __sifields__bindgen_ty_1::_pid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_1),
-            "::",
-            stringify!(_uid)
-        )
+        "Offset of field: __sifields__bindgen_ty_1::_uid"
     );
 }
 #[repr(C)]
@@ -6223,52 +5123,32 @@ fn bindgen_test_layout___sifields__bindgen_ty_2() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_2>(),
         24usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_2))
+        "Size of __sifields__bindgen_ty_2"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_2>(),
         8usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_2))
+        "Alignment of __sifields__bindgen_ty_2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_tid)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._overrun) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_overrun)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_overrun"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_sigval)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_sigval"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sys_private) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_2),
-            "::",
-            stringify!(_sys_private)
-        )
+        "Offset of field: __sifields__bindgen_ty_2::_sys_private"
     );
 }
 #[repr(C)]
@@ -6286,42 +5166,27 @@ fn bindgen_test_layout___sifields__bindgen_ty_3() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_3>(),
         16usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_3))
+        "Size of __sifields__bindgen_ty_3"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_3>(),
         8usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_3))
+        "Alignment of __sifields__bindgen_ty_3"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_3),
-            "::",
-            stringify!(_pid)
-        )
+        "Offset of field: __sifields__bindgen_ty_3::_pid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_3),
-            "::",
-            stringify!(_uid)
-        )
+        "Offset of field: __sifields__bindgen_ty_3::_uid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigval) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_3),
-            "::",
-            stringify!(_sigval)
-        )
+        "Offset of field: __sifields__bindgen_ty_3::_sigval"
     );
 }
 #[repr(C)]
@@ -6341,62 +5206,37 @@ fn bindgen_test_layout___sifields__bindgen_ty_4() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_4>(),
         32usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_4))
+        "Size of __sifields__bindgen_ty_4"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_4>(),
         8usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_4))
+        "Alignment of __sifields__bindgen_ty_4"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_pid)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_pid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._uid) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_uid)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_uid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._status) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_status)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_status"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._utime) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_utime)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_utime"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._stime) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_4),
-            "::",
-            stringify!(_stime)
-        )
+        "Offset of field: __sifields__bindgen_ty_4::_stime"
     );
 }
 #[repr(C)]
@@ -6429,48 +5269,27 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>(),
         24usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1>(),
         8usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._dummy_bnd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_dummy_bnd)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1::_dummy_bnd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._lower) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_lower)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1::_lower"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._upper) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_upper)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_1::_upper"
     );
 }
 #[repr(C)]
@@ -6487,38 +5306,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>(),
         12usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2)
-        )
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2>(),
         4usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._dummy_pkey) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2),
-            "::",
-            stringify!(_dummy_pkey)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2::_dummy_pkey"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pkey) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2),
-            "::",
-            stringify!(_pkey)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2::_pkey"
     );
 }
 #[repr(C)]
@@ -6526,6 +5329,7 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_2() {
 pub struct __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3 {
     pub _data: ::std::os::raw::c_ulong,
     pub _type: __u32,
+    pub _flags: __u32,
 }
 #[test]
 fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3() {
@@ -6535,38 +5339,27 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
         16usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
-        )
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3>(),
         8usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._data) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
-            "::",
-            stringify!(_data)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3::_data"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._type) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3),
-            "::",
-            stringify!(_type)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3::_type"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr)._flags) as usize - ptr as usize },
+        12usize,
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1__bindgen_ty_3::_flags"
     );
 }
 #[test]
@@ -6577,68 +5370,37 @@ fn bindgen_test_layout___sifields__bindgen_ty_5__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5__bindgen_ty_1>(),
         24usize,
-        concat!(
-            "Size of: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1)
-        )
+        "Size of __sifields__bindgen_ty_5__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5__bindgen_ty_1>(),
         8usize,
-        concat!(
-            "Alignment of ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1)
-        )
+        "Alignment of __sifields__bindgen_ty_5__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._trapno) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_trapno)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_trapno"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr_lsb) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_addr_lsb)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_addr_lsb"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr_bnd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_addr_bnd)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_addr_bnd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr_pkey) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_addr_pkey)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_addr_pkey"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._perf) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5__bindgen_ty_1),
-            "::",
-            stringify!(_perf)
-        )
+        "Offset of field: __sifields__bindgen_ty_5__bindgen_ty_1::_perf"
     );
 }
 #[test]
@@ -6649,22 +5411,17 @@ fn bindgen_test_layout___sifields__bindgen_ty_5() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_5>(),
         32usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_5))
+        "Size of __sifields__bindgen_ty_5"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_5>(),
         8usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_5))
+        "Alignment of __sifields__bindgen_ty_5"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._addr) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_5),
-            "::",
-            stringify!(_addr)
-        )
+        "Offset of field: __sifields__bindgen_ty_5::_addr"
     );
 }
 #[repr(C)]
@@ -6681,32 +5438,22 @@ fn bindgen_test_layout___sifields__bindgen_ty_6() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_6>(),
         16usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_6))
+        "Size of __sifields__bindgen_ty_6"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_6>(),
         8usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_6))
+        "Alignment of __sifields__bindgen_ty_6"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._band) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_6),
-            "::",
-            stringify!(_band)
-        )
+        "Offset of field: __sifields__bindgen_ty_6::_band"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._fd) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_6),
-            "::",
-            stringify!(_fd)
-        )
+        "Offset of field: __sifields__bindgen_ty_6::_fd"
     );
 }
 #[repr(C)]
@@ -6724,42 +5471,27 @@ fn bindgen_test_layout___sifields__bindgen_ty_7() {
     assert_eq!(
         ::std::mem::size_of::<__sifields__bindgen_ty_7>(),
         16usize,
-        concat!("Size of: ", stringify!(__sifields__bindgen_ty_7))
+        "Size of __sifields__bindgen_ty_7"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields__bindgen_ty_7>(),
         8usize,
-        concat!("Alignment of ", stringify!(__sifields__bindgen_ty_7))
+        "Alignment of __sifields__bindgen_ty_7"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._call_addr) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_7),
-            "::",
-            stringify!(_call_addr)
-        )
+        "Offset of field: __sifields__bindgen_ty_7::_call_addr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._syscall) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_7),
-            "::",
-            stringify!(_syscall)
-        )
+        "Offset of field: __sifields__bindgen_ty_7::_syscall"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._arch) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields__bindgen_ty_7),
-            "::",
-            stringify!(_arch)
-        )
+        "Offset of field: __sifields__bindgen_ty_7::_arch"
     );
 }
 #[test]
@@ -6769,82 +5501,47 @@ fn bindgen_test_layout___sifields() {
     assert_eq!(
         ::std::mem::size_of::<__sifields>(),
         32usize,
-        concat!("Size of: ", stringify!(__sifields))
+        "Size of __sifields"
     );
     assert_eq!(
         ::std::mem::align_of::<__sifields>(),
         8usize,
-        concat!("Alignment of ", stringify!(__sifields))
+        "Alignment of __sifields"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._kill) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_kill)
-        )
+        "Offset of field: __sifields::_kill"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._timer) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_timer)
-        )
+        "Offset of field: __sifields::_timer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._rt) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_rt)
-        )
+        "Offset of field: __sifields::_rt"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigchld) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigchld)
-        )
+        "Offset of field: __sifields::_sigchld"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigfault) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigfault)
-        )
+        "Offset of field: __sifields::_sigfault"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigpoll) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigpoll)
-        )
+        "Offset of field: __sifields::_sigpoll"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigsys) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__sifields),
-            "::",
-            stringify!(_sigsys)
-        )
+        "Offset of field: __sifields::_sigsys"
     );
 }
 #[repr(C)]
@@ -6874,55 +5571,32 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1__bindgen_ty_1>(),
         48usize,
-        concat!("Size of: ", stringify!(siginfo__bindgen_ty_1__bindgen_ty_1))
+        "Size of siginfo__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<siginfo__bindgen_ty_1__bindgen_ty_1>(),
         8usize,
-        concat!(
-            "Alignment of ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Alignment of siginfo__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si_signo) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(si_signo)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::si_signo"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si_errno) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(si_errno)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::si_errno"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).si_code) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(si_code)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::si_code"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sifields) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_sifields)
-        )
+        "Offset of field: siginfo__bindgen_ty_1__bindgen_ty_1::_sifields"
     );
 }
 #[test]
@@ -6933,22 +5607,17 @@ fn bindgen_test_layout_siginfo__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<siginfo__bindgen_ty_1>(),
         128usize,
-        concat!("Size of: ", stringify!(siginfo__bindgen_ty_1))
+        "Size of siginfo__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<siginfo__bindgen_ty_1>(),
         8usize,
-        concat!("Alignment of ", stringify!(siginfo__bindgen_ty_1))
+        "Alignment of siginfo__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._si_pad) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(siginfo__bindgen_ty_1),
-            "::",
-            stringify!(_si_pad)
-        )
+        "Offset of field: siginfo__bindgen_ty_1::_si_pad"
     );
 }
 #[test]
@@ -6956,12 +5625,12 @@ fn bindgen_test_layout_siginfo() {
     assert_eq!(
         ::std::mem::size_of::<siginfo>(),
         128usize,
-        concat!("Size of: ", stringify!(siginfo))
+        "Size of siginfo"
     );
     assert_eq!(
         ::std::mem::align_of::<siginfo>(),
         8usize,
-        concat!("Alignment of ", stringify!(siginfo))
+        "Alignment of siginfo"
     );
 }
 pub type siginfo_t = siginfo;
@@ -6994,38 +5663,22 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1__bindgen_ty_1>(),
         16usize,
-        concat!(
-            "Size of: ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Size of sigevent__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigevent__bindgen_ty_1__bindgen_ty_1>(),
         8usize,
-        concat!(
-            "Alignment of ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1)
-        )
+        "Alignment of sigevent__bindgen_ty_1__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._function) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_function)
-        )
+        "Offset of field: sigevent__bindgen_ty_1__bindgen_ty_1::_function"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._attribute) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(_attribute)
-        )
+        "Offset of field: sigevent__bindgen_ty_1__bindgen_ty_1::_attribute"
     );
 }
 #[test]
@@ -7036,42 +5689,27 @@ fn bindgen_test_layout_sigevent__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigevent__bindgen_ty_1>(),
         48usize,
-        concat!("Size of: ", stringify!(sigevent__bindgen_ty_1))
+        "Size of sigevent__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigevent__bindgen_ty_1>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigevent__bindgen_ty_1))
+        "Alignment of sigevent__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._pad) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1),
-            "::",
-            stringify!(_pad)
-        )
+        "Offset of field: sigevent__bindgen_ty_1::_pad"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._tid) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1),
-            "::",
-            stringify!(_tid)
-        )
+        "Offset of field: sigevent__bindgen_ty_1::_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigev_thread) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent__bindgen_ty_1),
-            "::",
-            stringify!(_sigev_thread)
-        )
+        "Offset of field: sigevent__bindgen_ty_1::_sigev_thread"
     );
 }
 #[test]
@@ -7081,52 +5719,32 @@ fn bindgen_test_layout_sigevent() {
     assert_eq!(
         ::std::mem::size_of::<sigevent>(),
         64usize,
-        concat!("Size of: ", stringify!(sigevent))
+        "Size of sigevent"
     );
     assert_eq!(
         ::std::mem::align_of::<sigevent>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigevent))
+        "Alignment of sigevent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sigev_value) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(sigev_value)
-        )
+        "Offset of field: sigevent::sigev_value"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sigev_signo) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(sigev_signo)
-        )
+        "Offset of field: sigevent::sigev_signo"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sigev_notify) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(sigev_notify)
-        )
+        "Offset of field: sigevent::sigev_notify"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._sigev_un) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigevent),
-            "::",
-            stringify!(_sigev_un)
-        )
+        "Offset of field: sigevent::_sigev_un"
     );
 }
 pub type sigevent_t = sigevent;
@@ -7162,32 +5780,22 @@ fn bindgen_test_layout_sigaction__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigaction__bindgen_ty_1>(),
         8usize,
-        concat!("Size of: ", stringify!(sigaction__bindgen_ty_1))
+        "Size of sigaction__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction__bindgen_ty_1>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigaction__bindgen_ty_1))
+        "Alignment of sigaction__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction__bindgen_ty_1),
-            "::",
-            stringify!(sa_handler)
-        )
+        "Offset of field: sigaction__bindgen_ty_1::sa_handler"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction__bindgen_ty_1),
-            "::",
-            stringify!(sa_sigaction)
-        )
+        "Offset of field: sigaction__bindgen_ty_1::sa_sigaction"
     );
 }
 #[test]
@@ -7197,42 +5805,27 @@ fn bindgen_test_layout_sigaction() {
     assert_eq!(
         ::std::mem::size_of::<sigaction>(),
         32usize,
-        concat!("Size of: ", stringify!(sigaction))
+        "Size of sigaction"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigaction))
+        "Alignment of sigaction"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction),
-            "::",
-            stringify!(sa_flags)
-        )
+        "Offset of field: sigaction::sa_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction),
-            "::",
-            stringify!(sa_mask)
-        )
+        "Offset of field: sigaction::sa_mask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction),
-            "::",
-            stringify!(sa_restorer)
-        )
+        "Offset of field: sigaction::sa_restorer"
     );
 }
 #[repr(C)]
@@ -7263,32 +5856,22 @@ fn bindgen_test_layout_sigaction64__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<sigaction64__bindgen_ty_1>(),
         8usize,
-        concat!("Size of: ", stringify!(sigaction64__bindgen_ty_1))
+        "Size of sigaction64__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction64__bindgen_ty_1>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigaction64__bindgen_ty_1))
+        "Alignment of sigaction64__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_handler) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64__bindgen_ty_1),
-            "::",
-            stringify!(sa_handler)
-        )
+        "Offset of field: sigaction64__bindgen_ty_1::sa_handler"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_sigaction) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64__bindgen_ty_1),
-            "::",
-            stringify!(sa_sigaction)
-        )
+        "Offset of field: sigaction64__bindgen_ty_1::sa_sigaction"
     );
 }
 #[test]
@@ -7298,42 +5881,27 @@ fn bindgen_test_layout_sigaction64() {
     assert_eq!(
         ::std::mem::size_of::<sigaction64>(),
         32usize,
-        concat!("Size of: ", stringify!(sigaction64))
+        "Size of sigaction64"
     );
     assert_eq!(
         ::std::mem::align_of::<sigaction64>(),
         8usize,
-        concat!("Alignment of ", stringify!(sigaction64))
+        "Alignment of sigaction64"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_flags) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64),
-            "::",
-            stringify!(sa_flags)
-        )
+        "Offset of field: sigaction64::sa_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_mask) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64),
-            "::",
-            stringify!(sa_mask)
-        )
+        "Offset of field: sigaction64::sa_mask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sa_restorer) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sigaction64),
-            "::",
-            stringify!(sa_restorer)
-        )
+        "Offset of field: sigaction64::sa_restorer"
     );
 }
 #[repr(C)]
@@ -7358,122 +5926,67 @@ fn bindgen_test_layout_user_fpregs_struct() {
     assert_eq!(
         ::std::mem::size_of::<user_fpregs_struct>(),
         512usize,
-        concat!("Size of: ", stringify!(user_fpregs_struct))
+        "Size of user_fpregs_struct"
     );
     assert_eq!(
         ::std::mem::align_of::<user_fpregs_struct>(),
         8usize,
-        concat!("Alignment of ", stringify!(user_fpregs_struct))
+        "Alignment of user_fpregs_struct"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cwd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(cwd)
-        )
+        "Offset of field: user_fpregs_struct::cwd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).swd) as usize - ptr as usize },
         2usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(swd)
-        )
+        "Offset of field: user_fpregs_struct::swd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ftw) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(ftw)
-        )
+        "Offset of field: user_fpregs_struct::ftw"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fop) as usize - ptr as usize },
         6usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(fop)
-        )
+        "Offset of field: user_fpregs_struct::fop"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rip) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(rip)
-        )
+        "Offset of field: user_fpregs_struct::rip"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rdp) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(rdp)
-        )
+        "Offset of field: user_fpregs_struct::rdp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).mxcsr) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(mxcsr)
-        )
+        "Offset of field: user_fpregs_struct::mxcsr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).mxcr_mask) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(mxcr_mask)
-        )
+        "Offset of field: user_fpregs_struct::mxcr_mask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).st_space) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(st_space)
-        )
+        "Offset of field: user_fpregs_struct::st_space"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).xmm_space) as usize - ptr as usize },
         160usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(xmm_space)
-        )
+        "Offset of field: user_fpregs_struct::xmm_space"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         416usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_fpregs_struct),
-            "::",
-            stringify!(padding)
-        )
+        "Offset of field: user_fpregs_struct::padding"
     );
 }
 #[repr(C)]
@@ -7514,282 +6027,147 @@ fn bindgen_test_layout_user_regs_struct() {
     assert_eq!(
         ::std::mem::size_of::<user_regs_struct>(),
         216usize,
-        concat!("Size of: ", stringify!(user_regs_struct))
+        "Size of user_regs_struct"
     );
     assert_eq!(
         ::std::mem::align_of::<user_regs_struct>(),
         8usize,
-        concat!("Alignment of ", stringify!(user_regs_struct))
+        "Alignment of user_regs_struct"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r15) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(r15)
-        )
+        "Offset of field: user_regs_struct::r15"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r14) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(r14)
-        )
+        "Offset of field: user_regs_struct::r14"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r13) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(r13)
-        )
+        "Offset of field: user_regs_struct::r13"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r12) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(r12)
-        )
+        "Offset of field: user_regs_struct::r12"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rbp) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(rbp)
-        )
+        "Offset of field: user_regs_struct::rbp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rbx) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(rbx)
-        )
+        "Offset of field: user_regs_struct::rbx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r11) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(r11)
-        )
+        "Offset of field: user_regs_struct::r11"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r10) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(r10)
-        )
+        "Offset of field: user_regs_struct::r10"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r9) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(r9)
-        )
+        "Offset of field: user_regs_struct::r9"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).r8) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(r8)
-        )
+        "Offset of field: user_regs_struct::r8"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rax) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(rax)
-        )
+        "Offset of field: user_regs_struct::rax"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rcx) as usize - ptr as usize },
         88usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(rcx)
-        )
+        "Offset of field: user_regs_struct::rcx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rdx) as usize - ptr as usize },
         96usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(rdx)
-        )
+        "Offset of field: user_regs_struct::rdx"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rsi) as usize - ptr as usize },
         104usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(rsi)
-        )
+        "Offset of field: user_regs_struct::rsi"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rdi) as usize - ptr as usize },
         112usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(rdi)
-        )
+        "Offset of field: user_regs_struct::rdi"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).orig_rax) as usize - ptr as usize },
         120usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(orig_rax)
-        )
+        "Offset of field: user_regs_struct::orig_rax"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rip) as usize - ptr as usize },
         128usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(rip)
-        )
+        "Offset of field: user_regs_struct::rip"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cs) as usize - ptr as usize },
         136usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(cs)
-        )
+        "Offset of field: user_regs_struct::cs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).eflags) as usize - ptr as usize },
         144usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(eflags)
-        )
+        "Offset of field: user_regs_struct::eflags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rsp) as usize - ptr as usize },
         152usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(rsp)
-        )
+        "Offset of field: user_regs_struct::rsp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ss) as usize - ptr as usize },
         160usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(ss)
-        )
+        "Offset of field: user_regs_struct::ss"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fs_base) as usize - ptr as usize },
         168usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(fs_base)
-        )
+        "Offset of field: user_regs_struct::fs_base"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).gs_base) as usize - ptr as usize },
         176usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(gs_base)
-        )
+        "Offset of field: user_regs_struct::gs_base"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ds) as usize - ptr as usize },
         184usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(ds)
-        )
+        "Offset of field: user_regs_struct::ds"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).es) as usize - ptr as usize },
         192usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(es)
-        )
+        "Offset of field: user_regs_struct::es"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fs) as usize - ptr as usize },
         200usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(fs)
-        )
+        "Offset of field: user_regs_struct::fs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).gs) as usize - ptr as usize },
         208usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user_regs_struct),
-            "::",
-            stringify!(gs)
-        )
+        "Offset of field: user_regs_struct::gs"
     );
 }
 #[repr(C)]
@@ -7819,205 +6197,102 @@ pub struct user {
 fn bindgen_test_layout_user() {
     const UNINIT: ::std::mem::MaybeUninit<user> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<user>(),
-        928usize,
-        concat!("Size of: ", stringify!(user))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<user>(),
-        8usize,
-        concat!("Alignment of ", stringify!(user))
-    );
+    assert_eq!(::std::mem::size_of::<user>(), 928usize, "Size of user");
+    assert_eq!(::std::mem::align_of::<user>(), 8usize, "Alignment of user");
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).regs) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(regs)
-        )
+        "Offset of field: user::regs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_fpvalid) as usize - ptr as usize },
         216usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_fpvalid)
-        )
+        "Offset of field: user::u_fpvalid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pad0) as usize - ptr as usize },
         220usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(pad0)
-        )
+        "Offset of field: user::pad0"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).i387) as usize - ptr as usize },
         224usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(i387)
-        )
+        "Offset of field: user::i387"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_tsize) as usize - ptr as usize },
         736usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_tsize)
-        )
+        "Offset of field: user::u_tsize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_dsize) as usize - ptr as usize },
         744usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_dsize)
-        )
+        "Offset of field: user::u_dsize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_ssize) as usize - ptr as usize },
         752usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_ssize)
-        )
+        "Offset of field: user::u_ssize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).start_code) as usize - ptr as usize },
         760usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(start_code)
-        )
+        "Offset of field: user::start_code"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).start_stack) as usize - ptr as usize },
         768usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(start_stack)
-        )
+        "Offset of field: user::start_stack"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).signal) as usize - ptr as usize },
         776usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(signal)
-        )
+        "Offset of field: user::signal"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reserved) as usize - ptr as usize },
         784usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(reserved)
-        )
+        "Offset of field: user::reserved"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pad1) as usize - ptr as usize },
         788usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(pad1)
-        )
+        "Offset of field: user::pad1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_ar0) as usize - ptr as usize },
         792usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_ar0)
-        )
+        "Offset of field: user::u_ar0"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_fpstate) as usize - ptr as usize },
         800usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_fpstate)
-        )
+        "Offset of field: user::u_fpstate"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).magic) as usize - ptr as usize },
         808usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(magic)
-        )
+        "Offset of field: user::magic"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_comm) as usize - ptr as usize },
         816usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_comm)
-        )
+        "Offset of field: user::u_comm"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).u_debugreg) as usize - ptr as usize },
         848usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(u_debugreg)
-        )
+        "Offset of field: user::u_debugreg"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).error_code) as usize - ptr as usize },
         912usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(error_code)
-        )
+        "Offset of field: user::error_code"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fault_address) as usize - ptr as usize },
         920usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(user),
-            "::",
-            stringify!(fault_address)
-        )
+        "Offset of field: user::fault_address"
     );
 }
 pub const REG_R8: _bindgen_ty_22 = 0;
@@ -8061,42 +6336,27 @@ fn bindgen_test_layout__libc_fpxreg() {
     assert_eq!(
         ::std::mem::size_of::<_libc_fpxreg>(),
         16usize,
-        concat!("Size of: ", stringify!(_libc_fpxreg))
+        "Size of _libc_fpxreg"
     );
     assert_eq!(
         ::std::mem::align_of::<_libc_fpxreg>(),
         2usize,
-        concat!("Alignment of ", stringify!(_libc_fpxreg))
+        "Alignment of _libc_fpxreg"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).significand) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpxreg),
-            "::",
-            stringify!(significand)
-        )
+        "Offset of field: _libc_fpxreg::significand"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).exponent) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpxreg),
-            "::",
-            stringify!(exponent)
-        )
+        "Offset of field: _libc_fpxreg::exponent"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         10usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpxreg),
-            "::",
-            stringify!(padding)
-        )
+        "Offset of field: _libc_fpxreg::padding"
     );
 }
 #[repr(C)]
@@ -8111,22 +6371,17 @@ fn bindgen_test_layout__libc_xmmreg() {
     assert_eq!(
         ::std::mem::size_of::<_libc_xmmreg>(),
         16usize,
-        concat!("Size of: ", stringify!(_libc_xmmreg))
+        "Size of _libc_xmmreg"
     );
     assert_eq!(
         ::std::mem::align_of::<_libc_xmmreg>(),
         4usize,
-        concat!("Alignment of ", stringify!(_libc_xmmreg))
+        "Alignment of _libc_xmmreg"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).element) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_xmmreg),
-            "::",
-            stringify!(element)
-        )
+        "Offset of field: _libc_xmmreg::element"
     );
 }
 #[repr(C)]
@@ -8151,122 +6406,67 @@ fn bindgen_test_layout__libc_fpstate() {
     assert_eq!(
         ::std::mem::size_of::<_libc_fpstate>(),
         512usize,
-        concat!("Size of: ", stringify!(_libc_fpstate))
+        "Size of _libc_fpstate"
     );
     assert_eq!(
         ::std::mem::align_of::<_libc_fpstate>(),
         8usize,
-        concat!("Alignment of ", stringify!(_libc_fpstate))
+        "Alignment of _libc_fpstate"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cwd) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(cwd)
-        )
+        "Offset of field: _libc_fpstate::cwd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).swd) as usize - ptr as usize },
         2usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(swd)
-        )
+        "Offset of field: _libc_fpstate::swd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).ftw) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(ftw)
-        )
+        "Offset of field: _libc_fpstate::ftw"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fop) as usize - ptr as usize },
         6usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(fop)
-        )
+        "Offset of field: _libc_fpstate::fop"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rip) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(rip)
-        )
+        "Offset of field: _libc_fpstate::rip"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).rdp) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(rdp)
-        )
+        "Offset of field: _libc_fpstate::rdp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).mxcsr) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(mxcsr)
-        )
+        "Offset of field: _libc_fpstate::mxcsr"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).mxcr_mask) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(mxcr_mask)
-        )
+        "Offset of field: _libc_fpstate::mxcr_mask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._st) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(_st)
-        )
+        "Offset of field: _libc_fpstate::_st"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr)._xmm) as usize - ptr as usize },
         160usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(_xmm)
-        )
+        "Offset of field: _libc_fpstate::_xmm"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).padding) as usize - ptr as usize },
         416usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_libc_fpstate),
-            "::",
-            stringify!(padding)
-        )
+        "Offset of field: _libc_fpstate::padding"
     );
 }
 pub type fpregset_t = *mut _libc_fpstate;
@@ -8284,42 +6484,27 @@ fn bindgen_test_layout_mcontext_t() {
     assert_eq!(
         ::std::mem::size_of::<mcontext_t>(),
         256usize,
-        concat!("Size of: ", stringify!(mcontext_t))
+        "Size of mcontext_t"
     );
     assert_eq!(
         ::std::mem::align_of::<mcontext_t>(),
         8usize,
-        concat!("Alignment of ", stringify!(mcontext_t))
+        "Alignment of mcontext_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).gregs) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(mcontext_t),
-            "::",
-            stringify!(gregs)
-        )
+        "Offset of field: mcontext_t::gregs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fpregs) as usize - ptr as usize },
         184usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(mcontext_t),
-            "::",
-            stringify!(fpregs)
-        )
+        "Offset of field: mcontext_t::fpregs"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__reserved1) as usize - ptr as usize },
         192usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(mcontext_t),
-            "::",
-            stringify!(__reserved1)
-        )
+        "Offset of field: mcontext_t::__reserved1"
     );
 }
 #[repr(C)]
@@ -8346,32 +6531,22 @@ fn bindgen_test_layout_ucontext__bindgen_ty_1() {
     assert_eq!(
         ::std::mem::size_of::<ucontext__bindgen_ty_1>(),
         8usize,
-        concat!("Size of: ", stringify!(ucontext__bindgen_ty_1))
+        "Size of ucontext__bindgen_ty_1"
     );
     assert_eq!(
         ::std::mem::align_of::<ucontext__bindgen_ty_1>(),
         8usize,
-        concat!("Alignment of ", stringify!(ucontext__bindgen_ty_1))
+        "Alignment of ucontext__bindgen_ty_1"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext__bindgen_ty_1),
-            "::",
-            stringify!(uc_sigmask)
-        )
+        "Offset of field: ucontext__bindgen_ty_1::uc_sigmask"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_sigmask64) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext__bindgen_ty_1),
-            "::",
-            stringify!(uc_sigmask64)
-        )
+        "Offset of field: ucontext__bindgen_ty_1::uc_sigmask64"
     );
 }
 #[test]
@@ -8381,62 +6556,37 @@ fn bindgen_test_layout_ucontext() {
     assert_eq!(
         ::std::mem::size_of::<ucontext>(),
         816usize,
-        concat!("Size of: ", stringify!(ucontext))
+        "Size of ucontext"
     );
     assert_eq!(
         ::std::mem::align_of::<ucontext>(),
         8usize,
-        concat!("Alignment of ", stringify!(ucontext))
+        "Alignment of ucontext"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_flags) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_flags)
-        )
+        "Offset of field: ucontext::uc_flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_link) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_link)
-        )
+        "Offset of field: ucontext::uc_link"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_stack) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_stack)
-        )
+        "Offset of field: ucontext::uc_stack"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).uc_mcontext) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(uc_mcontext)
-        )
+        "Offset of field: ucontext::uc_mcontext"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__fpregs_mem) as usize - ptr as usize },
         304usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(ucontext),
-            "::",
-            stringify!(__fpregs_mem)
-        )
+        "Offset of field: ucontext::__fpregs_mem"
     );
 }
 pub type ucontext_t = ucontext;
@@ -8645,25 +6795,16 @@ pub struct fd_set {
 fn bindgen_test_layout_fd_set() {
     const UNINIT: ::std::mem::MaybeUninit<fd_set> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<fd_set>(),
-        128usize,
-        concat!("Size of: ", stringify!(fd_set))
-    );
+    assert_eq!(::std::mem::size_of::<fd_set>(), 128usize, "Size of fd_set");
     assert_eq!(
         ::std::mem::align_of::<fd_set>(),
         8usize,
-        concat!("Alignment of ", stringify!(fd_set))
+        "Alignment of fd_set"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fds_bits) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(fd_set),
-            "::",
-            stringify!(fds_bits)
-        )
+        "Offset of field: fd_set::fds_bits"
     );
 }
 extern "C" {
@@ -8767,125 +6908,62 @@ pub struct tm {
 fn bindgen_test_layout_tm() {
     const UNINIT: ::std::mem::MaybeUninit<tm> = ::std::mem::MaybeUninit::uninit();
     let ptr = UNINIT.as_ptr();
-    assert_eq!(
-        ::std::mem::size_of::<tm>(),
-        56usize,
-        concat!("Size of: ", stringify!(tm))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<tm>(),
-        8usize,
-        concat!("Alignment of ", stringify!(tm))
-    );
+    assert_eq!(::std::mem::size_of::<tm>(), 56usize, "Size of tm");
+    assert_eq!(::std::mem::align_of::<tm>(), 8usize, "Alignment of tm");
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_sec) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_sec)
-        )
+        "Offset of field: tm::tm_sec"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_min) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_min)
-        )
+        "Offset of field: tm::tm_min"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_hour) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_hour)
-        )
+        "Offset of field: tm::tm_hour"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_mday) as usize - ptr as usize },
         12usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_mday)
-        )
+        "Offset of field: tm::tm_mday"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_mon) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_mon)
-        )
+        "Offset of field: tm::tm_mon"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_year) as usize - ptr as usize },
         20usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_year)
-        )
+        "Offset of field: tm::tm_year"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_wday) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_wday)
-        )
+        "Offset of field: tm::tm_wday"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_yday) as usize - ptr as usize },
         28usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_yday)
-        )
+        "Offset of field: tm::tm_yday"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_isdst) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_isdst)
-        )
+        "Offset of field: tm::tm_isdst"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_gmtoff) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_gmtoff)
-        )
+        "Offset of field: tm::tm_gmtoff"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tm_zone) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(tm),
-            "::",
-            stringify!(tm_zone)
-        )
+        "Offset of field: tm::tm_zone"
     );
 }
 extern "C" {
@@ -8918,12 +6996,18 @@ extern "C" {
 extern "C" {
     pub fn localtime_r(__t: *const time_t, __tm: *mut tm) -> *mut tm;
 }
+extern "C" {
+    pub fn timelocal(__tm: *mut tm) -> time_t;
+}
 extern "C" {
     pub fn gmtime(__t: *const time_t) -> *mut tm;
 }
 extern "C" {
     pub fn gmtime_r(__t: *const time_t, __tm: *mut tm) -> *mut tm;
 }
+extern "C" {
+    pub fn timegm(__tm: *mut tm) -> time_t;
+}
 extern "C" {
     pub fn strptime(
         __s: *const ::std::os::raw::c_char,
@@ -9010,19 +7094,19 @@ extern "C" {
     ) -> ::std::os::raw::c_int;
 }
 extern "C" {
-    pub fn timer_gettime(__timer: timer_t, __ts: *mut itimerspec) -> ::std::os::raw::c_int;
+    pub fn timer_gettime(_timer: timer_t, __ts: *mut itimerspec) -> ::std::os::raw::c_int;
 }
 extern "C" {
     pub fn timer_getoverrun(__timer: timer_t) -> ::std::os::raw::c_int;
 }
 extern "C" {
-    pub fn timelocal(__tm: *mut tm) -> time_t;
-}
-extern "C" {
-    pub fn timegm(__tm: *mut tm) -> time_t;
+    pub fn timespec_get(
+        __ts: *mut timespec,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_int;
 }
 extern "C" {
-    pub fn timespec_get(
+    pub fn timespec_getres(
         __ts: *mut timespec,
         __base: ::std::os::raw::c_int,
     ) -> ::std::os::raw::c_int;
@@ -9073,122 +7157,67 @@ fn bindgen_test_layout_clone_args() {
     assert_eq!(
         ::std::mem::size_of::<clone_args>(),
         88usize,
-        concat!("Size of: ", stringify!(clone_args))
+        "Size of clone_args"
     );
     assert_eq!(
         ::std::mem::align_of::<clone_args>(),
         8usize,
-        concat!("Alignment of ", stringify!(clone_args))
+        "Alignment of clone_args"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(flags)
-        )
+        "Offset of field: clone_args::flags"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pidfd) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(pidfd)
-        )
+        "Offset of field: clone_args::pidfd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).child_tid) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(child_tid)
-        )
+        "Offset of field: clone_args::child_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).parent_tid) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(parent_tid)
-        )
+        "Offset of field: clone_args::parent_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).exit_signal) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(exit_signal)
-        )
+        "Offset of field: clone_args::exit_signal"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stack) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(stack)
-        )
+        "Offset of field: clone_args::stack"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stack_size) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(stack_size)
-        )
+        "Offset of field: clone_args::stack_size"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).tls) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(tls)
-        )
+        "Offset of field: clone_args::tls"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).set_tid) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(set_tid)
-        )
+        "Offset of field: clone_args::set_tid"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).set_tid_size) as usize - ptr as usize },
         72usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(set_tid_size)
-        )
+        "Offset of field: clone_args::set_tid_size"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cgroup) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(clone_args),
-            "::",
-            stringify!(cgroup)
-        )
+        "Offset of field: clone_args::cgroup"
     );
 }
 #[repr(C)]
@@ -9203,22 +7232,17 @@ fn bindgen_test_layout_sched_param() {
     assert_eq!(
         ::std::mem::size_of::<sched_param>(),
         4usize,
-        concat!("Size of: ", stringify!(sched_param))
+        "Size of sched_param"
     );
     assert_eq!(
         ::std::mem::align_of::<sched_param>(),
         4usize,
-        concat!("Alignment of ", stringify!(sched_param))
+        "Alignment of sched_param"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).sched_priority) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(sched_param),
-            "::",
-            stringify!(sched_priority)
-        )
+        "Offset of field: sched_param::sched_priority"
     );
 }
 extern "C" {
@@ -9259,13 +7283,12 @@ pub type _bindgen_ty_23 = ::std::os::raw::c_uint;
 pub const PTHREAD_RWLOCK_PREFER_READER_NP: _bindgen_ty_24 = 0;
 pub const PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP: _bindgen_ty_24 = 1;
 pub type _bindgen_ty_24 = ::std::os::raw::c_uint;
-pub type __pthread_cleanup_func_t =
-    ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct __pthread_cleanup_t {
     pub __cleanup_prev: *mut __pthread_cleanup_t,
-    pub __cleanup_routine: __pthread_cleanup_func_t,
+    pub __cleanup_routine:
+        ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>,
     pub __cleanup_arg: *mut ::std::os::raw::c_void,
 }
 #[test]
@@ -9275,48 +7298,33 @@ fn bindgen_test_layout___pthread_cleanup_t() {
     assert_eq!(
         ::std::mem::size_of::<__pthread_cleanup_t>(),
         24usize,
-        concat!("Size of: ", stringify!(__pthread_cleanup_t))
+        "Size of __pthread_cleanup_t"
     );
     assert_eq!(
         ::std::mem::align_of::<__pthread_cleanup_t>(),
         8usize,
-        concat!("Alignment of ", stringify!(__pthread_cleanup_t))
+        "Alignment of __pthread_cleanup_t"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_prev) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__pthread_cleanup_t),
-            "::",
-            stringify!(__cleanup_prev)
-        )
+        "Offset of field: __pthread_cleanup_t::__cleanup_prev"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_routine) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__pthread_cleanup_t),
-            "::",
-            stringify!(__cleanup_routine)
-        )
+        "Offset of field: __pthread_cleanup_t::__cleanup_routine"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).__cleanup_arg) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__pthread_cleanup_t),
-            "::",
-            stringify!(__cleanup_arg)
-        )
+        "Offset of field: __pthread_cleanup_t::__cleanup_arg"
     );
 }
 extern "C" {
     pub fn __pthread_cleanup_push(
         c: *mut __pthread_cleanup_t,
-        arg1: __pthread_cleanup_func_t,
+        arg1: ::std::option::Option<unsafe extern "C" fn(arg1: *mut ::std::os::raw::c_void)>,
         arg2: *mut ::std::os::raw::c_void,
     );
 }
@@ -9343,42 +7351,27 @@ fn bindgen_test_layout_android_poll_source() {
     assert_eq!(
         ::std::mem::size_of::<android_poll_source>(),
         24usize,
-        concat!("Size of: ", stringify!(android_poll_source))
+        "Size of android_poll_source"
     );
     assert_eq!(
         ::std::mem::align_of::<android_poll_source>(),
         8usize,
-        concat!("Alignment of ", stringify!(android_poll_source))
+        "Alignment of android_poll_source"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_poll_source),
-            "::",
-            stringify!(id)
-        )
+        "Offset of field: android_poll_source::id"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).app) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_poll_source),
-            "::",
-            stringify!(app)
-        )
+        "Offset of field: android_poll_source::app"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).process) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_poll_source),
-            "::",
-            stringify!(process)
-        )
+        "Offset of field: android_poll_source::process"
     );
 }
 #[repr(C)]
@@ -9404,72 +7397,42 @@ fn bindgen_test_layout_android_input_buffer() {
     assert_eq!(
         ::std::mem::size_of::<android_input_buffer>(),
         48usize,
-        concat!("Size of: ", stringify!(android_input_buffer))
+        "Size of android_input_buffer"
     );
     assert_eq!(
         ::std::mem::align_of::<android_input_buffer>(),
         8usize,
-        concat!("Alignment of ", stringify!(android_input_buffer))
+        "Alignment of android_input_buffer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEvents) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(motionEvents)
-        )
+        "Offset of field: android_input_buffer::motionEvents"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEventsCount) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(motionEventsCount)
-        )
+        "Offset of field: android_input_buffer::motionEventsCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEventsBufferSize) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(motionEventsBufferSize)
-        )
+        "Offset of field: android_input_buffer::motionEventsBufferSize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEvents) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(keyEvents)
-        )
+        "Offset of field: android_input_buffer::keyEvents"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEventsCount) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(keyEventsCount)
-        )
+        "Offset of field: android_input_buffer::keyEventsCount"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEventsBufferSize) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_input_buffer),
-            "::",
-            stringify!(keyEventsBufferSize)
-        )
+        "Offset of field: android_input_buffer::keyEventsBufferSize"
     );
 }
 #[doc = " Function pointer declaration for the filtering of key events.\n A function with this signature should be passed to\n android_app_set_key_event_filter and return false for any events that should\n not be handled by android_native_app_glue. These events will be handled by\n the system instead."]
@@ -9499,6 +7462,10 @@ pub struct android_app {
     pub window: *mut ANativeWindow,
     #[doc = " Current content rectangle of the window; this is the area where the\n window's content should be placed to be seen by the user."]
     pub contentRect: ARect,
+    #[doc = " Whether the software keyboard is visible or not."]
+    pub softwareKeyboardVisible: bool,
+    #[doc = " Last editor action. Valid within APP_CMD_SOFTWARE_KB_VIS_CHANGED handler.\n\n Note: the upstream comment above isn't accurate.\n - `APP_CMD_SOFTWARE_KB_VIS_CHANGED` is associated with `softwareKeyboardVisible`\n   changes, not `editorAction`.\n - `APP_CMD_EDITOR_ACTION` is associated with this state but unlike for\n   `window` state there's no synchonization that blocks the Java main\n   thread, so we can't say that this is only valid within the `APP_CMD_` handler."]
+    pub editorAction: ::std::os::raw::c_int,
     #[doc = " Current state of the app's activity.  May be either APP_CMD_START,\n APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP."]
     pub activityState: ::std::os::raw::c_int,
     #[doc = " This is non-zero when the application's GameActivity is being\n destroyed and waiting for the app thread to complete."]
@@ -9532,313 +7499,173 @@ fn bindgen_test_layout_android_app() {
     let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<android_app>(),
-        384usize,
-        concat!("Size of: ", stringify!(android_app))
+        392usize,
+        "Size of android_app"
     );
     assert_eq!(
         ::std::mem::align_of::<android_app>(),
         8usize,
-        concat!("Alignment of ", stringify!(android_app))
+        "Alignment of android_app"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).userData) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(userData)
-        )
+        "Offset of field: android_app::userData"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).onAppCmd) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(onAppCmd)
-        )
+        "Offset of field: android_app::onAppCmd"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).activity) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(activity)
-        )
+        "Offset of field: android_app::activity"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).config) as usize - ptr as usize },
         24usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(config)
-        )
+        "Offset of field: android_app::config"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).savedState) as usize - ptr as usize },
         32usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(savedState)
-        )
+        "Offset of field: android_app::savedState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).savedStateSize) as usize - ptr as usize },
         40usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(savedStateSize)
-        )
+        "Offset of field: android_app::savedStateSize"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).looper) as usize - ptr as usize },
         48usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(looper)
-        )
+        "Offset of field: android_app::looper"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).window) as usize - ptr as usize },
         56usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(window)
-        )
+        "Offset of field: android_app::window"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).contentRect) as usize - ptr as usize },
         64usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(contentRect)
-        )
+        "Offset of field: android_app::contentRect"
     );
     assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).activityState) as usize - ptr as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).softwareKeyboardVisible) as usize - ptr as usize },
         80usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(activityState)
-        )
+        "Offset of field: android_app::softwareKeyboardVisible"
     );
     assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).destroyRequested) as usize - ptr as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).editorAction) as usize - ptr as usize },
         84usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(destroyRequested)
-        )
+        "Offset of field: android_app::editorAction"
     );
     assert_eq!(
-        unsafe { ::std::ptr::addr_of!((*ptr).inputBuffers) as usize - ptr as usize },
+        unsafe { ::std::ptr::addr_of!((*ptr).activityState) as usize - ptr as usize },
         88usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(inputBuffers)
-        )
+        "Offset of field: android_app::activityState"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).destroyRequested) as usize - ptr as usize },
+        92usize,
+        "Offset of field: android_app::destroyRequested"
+    );
+    assert_eq!(
+        unsafe { ::std::ptr::addr_of!((*ptr).inputBuffers) as usize - ptr as usize },
+        96usize,
+        "Offset of field: android_app::inputBuffers"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).currentInputBuffer) as usize - ptr as usize },
-        184usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(currentInputBuffer)
-        )
+        192usize,
+        "Offset of field: android_app::currentInputBuffer"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).textInputState) as usize - ptr as usize },
-        188usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(textInputState)
-        )
+        196usize,
+        "Offset of field: android_app::textInputState"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).mutex) as usize - ptr as usize },
-        192usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(mutex)
-        )
+        200usize,
+        "Offset of field: android_app::mutex"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cond) as usize - ptr as usize },
-        232usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(cond)
-        )
+        240usize,
+        "Offset of field: android_app::cond"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).msgread) as usize - ptr as usize },
-        280usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(msgread)
-        )
+        288usize,
+        "Offset of field: android_app::msgread"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).msgwrite) as usize - ptr as usize },
-        284usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(msgwrite)
-        )
+        292usize,
+        "Offset of field: android_app::msgwrite"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).thread) as usize - ptr as usize },
-        288usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(thread)
-        )
+        296usize,
+        "Offset of field: android_app::thread"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).cmdPollSource) as usize - ptr as usize },
-        296usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(cmdPollSource)
-        )
+        304usize,
+        "Offset of field: android_app::cmdPollSource"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).running) as usize - ptr as usize },
-        320usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(running)
-        )
+        328usize,
+        "Offset of field: android_app::running"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).stateSaved) as usize - ptr as usize },
-        324usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(stateSaved)
-        )
+        332usize,
+        "Offset of field: android_app::stateSaved"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).destroyed) as usize - ptr as usize },
-        328usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(destroyed)
-        )
+        336usize,
+        "Offset of field: android_app::destroyed"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).redrawNeeded) as usize - ptr as usize },
-        332usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(redrawNeeded)
-        )
+        340usize,
+        "Offset of field: android_app::redrawNeeded"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pendingWindow) as usize - ptr as usize },
-        336usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(pendingWindow)
-        )
+        344usize,
+        "Offset of field: android_app::pendingWindow"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).pendingContentRect) as usize - ptr as usize },
-        344usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(pendingContentRect)
-        )
+        352usize,
+        "Offset of field: android_app::pendingContentRect"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).keyEventFilter) as usize - ptr as usize },
-        360usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(keyEventFilter)
-        )
+        368usize,
+        "Offset of field: android_app::keyEventFilter"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).motionEventFilter) as usize - ptr as usize },
-        368usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(motionEventFilter)
-        )
+        376usize,
+        "Offset of field: android_app::motionEventFilter"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).inputAvailableWakeUp) as usize - ptr as usize },
-        376usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(inputAvailableWakeUp)
-        )
+        384usize,
+        "Offset of field: android_app::inputAvailableWakeUp"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).inputSwapPending) as usize - ptr as usize },
-        377usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(android_app),
-            "::",
-            stringify!(inputSwapPending)
-        )
+        385usize,
+        "Offset of field: android_app::inputSwapPending"
     );
 }
 #[doc = " Looper data ID of commands coming from the app's main thread, which\n is returned as an identifier from ALooper_pollOnce().  The data for this\n identifier is a pointer to an android_poll_source structure.\n These can be retrieved and processed with android_app_read_cmd()\n and android_app_exec_cmd()."]
@@ -9848,7 +7675,7 @@ pub const NativeAppGlueLooperId_LOOPER_ID_INPUT: NativeAppGlueLooperId = 2;
 #[doc = " Start of user-defined ALooper identifiers."]
 pub const NativeAppGlueLooperId_LOOPER_ID_USER: NativeAppGlueLooperId = 3;
 #[doc = " Looper ID of commands coming from the app's main thread, an AInputQueue or\n user-defined sources."]
-pub type NativeAppGlueLooperId = ::std::os::raw::c_uint;
+pub type NativeAppGlueLooperId = i8;
 #[doc = " Unused. Reserved for future use when usage of AInputQueue will be\n supported."]
 pub const NativeAppGlueAppCmd_UNUSED_APP_CMD_INPUT_CHANGED: NativeAppGlueAppCmd = 0;
 #[doc = " Command from main thread: a new ANativeWindow is ready for use.  Upon\n receiving this command, android_app->window will contain the new window\n surface."]
@@ -9861,30 +7688,32 @@ pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_RESIZED: NativeAppGlueAppCmd = 3;
 pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_REDRAW_NEEDED: NativeAppGlueAppCmd = 4;
 #[doc = " Command from main thread: the content area of the window has changed,\n such as from the soft input window being shown or hidden.  You can\n find the new content rect in android_app::contentRect."]
 pub const NativeAppGlueAppCmd_APP_CMD_CONTENT_RECT_CHANGED: NativeAppGlueAppCmd = 5;
+#[doc = " Command from main thread: the software keyboard was shown or hidden."]
+pub const NativeAppGlueAppCmd_APP_CMD_SOFTWARE_KB_VIS_CHANGED: NativeAppGlueAppCmd = 6;
 #[doc = " Command from main thread: the app's activity window has gained\n input focus."]
-pub const NativeAppGlueAppCmd_APP_CMD_GAINED_FOCUS: NativeAppGlueAppCmd = 6;
+pub const NativeAppGlueAppCmd_APP_CMD_GAINED_FOCUS: NativeAppGlueAppCmd = 7;
 #[doc = " Command from main thread: the app's activity window has lost\n input focus."]
-pub const NativeAppGlueAppCmd_APP_CMD_LOST_FOCUS: NativeAppGlueAppCmd = 7;
+pub const NativeAppGlueAppCmd_APP_CMD_LOST_FOCUS: NativeAppGlueAppCmd = 8;
 #[doc = " Command from main thread: the current device configuration has changed."]
-pub const NativeAppGlueAppCmd_APP_CMD_CONFIG_CHANGED: NativeAppGlueAppCmd = 8;
+pub const NativeAppGlueAppCmd_APP_CMD_CONFIG_CHANGED: NativeAppGlueAppCmd = 9;
 #[doc = " Command from main thread: the system is running low on memory.\n Try to reduce your memory use."]
-pub const NativeAppGlueAppCmd_APP_CMD_LOW_MEMORY: NativeAppGlueAppCmd = 9;
+pub const NativeAppGlueAppCmd_APP_CMD_LOW_MEMORY: NativeAppGlueAppCmd = 10;
 #[doc = " Command from main thread: the app's activity has been started."]
-pub const NativeAppGlueAppCmd_APP_CMD_START: NativeAppGlueAppCmd = 10;
+pub const NativeAppGlueAppCmd_APP_CMD_START: NativeAppGlueAppCmd = 11;
 #[doc = " Command from main thread: the app's activity has been resumed."]
-pub const NativeAppGlueAppCmd_APP_CMD_RESUME: NativeAppGlueAppCmd = 11;
+pub const NativeAppGlueAppCmd_APP_CMD_RESUME: NativeAppGlueAppCmd = 12;
 #[doc = " Command from main thread: the app should generate a new saved state\n for itself, to restore from later if needed.  If you have saved state,\n allocate it with malloc and place it in android_app.savedState with\n the size in android_app.savedStateSize.  The will be freed for you\n later."]
-pub const NativeAppGlueAppCmd_APP_CMD_SAVE_STATE: NativeAppGlueAppCmd = 12;
+pub const NativeAppGlueAppCmd_APP_CMD_SAVE_STATE: NativeAppGlueAppCmd = 13;
 #[doc = " Command from main thread: the app's activity has been paused."]
-pub const NativeAppGlueAppCmd_APP_CMD_PAUSE: NativeAppGlueAppCmd = 13;
+pub const NativeAppGlueAppCmd_APP_CMD_PAUSE: NativeAppGlueAppCmd = 14;
 #[doc = " Command from main thread: the app's activity has been stopped."]
-pub const NativeAppGlueAppCmd_APP_CMD_STOP: NativeAppGlueAppCmd = 14;
+pub const NativeAppGlueAppCmd_APP_CMD_STOP: NativeAppGlueAppCmd = 15;
 #[doc = " Command from main thread: the app's activity is being destroyed,\n and waiting for the app thread to clean up and exit before proceeding."]
-pub const NativeAppGlueAppCmd_APP_CMD_DESTROY: NativeAppGlueAppCmd = 15;
+pub const NativeAppGlueAppCmd_APP_CMD_DESTROY: NativeAppGlueAppCmd = 16;
 #[doc = " Command from main thread: the app's insets have changed."]
-pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_INSETS_CHANGED: NativeAppGlueAppCmd = 16;
-#[doc = " Commands passed from the application's main Java thread to the game's thread."]
-pub type NativeAppGlueAppCmd = ::std::os::raw::c_uint;
+pub const NativeAppGlueAppCmd_APP_CMD_WINDOW_INSETS_CHANGED: NativeAppGlueAppCmd = 17;
+#[doc = " Commands passed from the application's main Java thread to the game's thread.\n\n Values from 0 to 127 are reserved for this library; values from -128 to -1\n can be used for custom user's events."]
+pub type NativeAppGlueAppCmd = i8;
 extern "C" {
     #[doc = " Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next\n app command message."]
     pub fn android_app_read_cmd(android_app: *mut android_app) -> i8;
@@ -9929,6 +7758,10 @@ extern "C" {
         filter: android_motion_event_filter,
     );
 }
+extern "C" {
+    #[doc = " You can send your custom events using the function below.\n\n Make sure your custom codes do not overlap with this library's ones.\n\n Values from 0 to 127 are reserved for this library; values from -128 to -1\n can be used for custom user's events."]
+    pub fn android_app_write_cmd(android_app: *mut android_app, cmd: i8);
+}
 extern "C" {
     #[doc = " Determines if a looper wake up was due to new input becoming available"]
     pub fn android_app_input_available_wake_up(app: *mut android_app) -> bool;
@@ -9949,51 +7782,31 @@ fn bindgen_test_layout___va_list_tag() {
     assert_eq!(
         ::std::mem::size_of::<__va_list_tag>(),
         24usize,
-        concat!("Size of: ", stringify!(__va_list_tag))
+        "Size of __va_list_tag"
     );
     assert_eq!(
         ::std::mem::align_of::<__va_list_tag>(),
         8usize,
-        concat!("Alignment of ", stringify!(__va_list_tag))
+        "Alignment of __va_list_tag"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).gp_offset) as usize - ptr as usize },
         0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__va_list_tag),
-            "::",
-            stringify!(gp_offset)
-        )
+        "Offset of field: __va_list_tag::gp_offset"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).fp_offset) as usize - ptr as usize },
         4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__va_list_tag),
-            "::",
-            stringify!(fp_offset)
-        )
+        "Offset of field: __va_list_tag::fp_offset"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).overflow_arg_area) as usize - ptr as usize },
         8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__va_list_tag),
-            "::",
-            stringify!(overflow_arg_area)
-        )
+        "Offset of field: __va_list_tag::overflow_arg_area"
     );
     assert_eq!(
         unsafe { ::std::ptr::addr_of!((*ptr).reg_save_area) as usize - ptr as usize },
         16usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(__va_list_tag),
-            "::",
-            stringify!(reg_save_area)
-        )
+        "Offset of field: __va_list_tag::reg_save_area"
     );
 }

From 3755ed7e7accab35693720690062f9a96a6de454 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 31 Mar 2025 15:34:18 +0100
Subject: [PATCH 82/93] game-activity: build fixes for rust-bindgen 0.71 ffi
 API

---
 android-activity/src/game_activity/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index 2150596..70b6941 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -338,14 +338,14 @@ impl AndroidAppInner {
                     panic!("ALooper_pollAll returned POLL_ERROR");
                 }
                 id if id >= 0 => {
-                    match id as u32 {
+                    match id as ffi::NativeAppGlueLooperId {
                         ffi::NativeAppGlueLooperId_LOOPER_ID_MAIN => {
                             trace!("ALooper_pollAll returned ID_MAIN");
                             let source: *mut ffi::android_poll_source = source.cast();
                             if !source.is_null() {
                                 let cmd_i = ffi::android_app_read_cmd(native_app.as_ptr());
 
-                                let cmd = match cmd_i as u32 {
+                                let cmd = match cmd_i as ffi::NativeAppGlueAppCmd {
                                     //NativeAppGlueAppCmd_UNUSED_APP_CMD_INPUT_CHANGED => AndroidAppMainEvent::InputChanged,
                                     ffi::NativeAppGlueAppCmd_APP_CMD_INIT_WINDOW => {
                                         MainEvent::InitWindow {}

From 5d7616e30eef3bb232ea43412cb5596a177e619e Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 31 Mar 2025 15:32:43 +0100
Subject: [PATCH 83/93] examples/agdk-mainloop: Use Gradle 8.4 (compatible with
 Java 21)

---
 examples/agdk-mainloop/gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/agdk-mainloop/gradle/wrapper/gradle-wrapper.properties b/examples/agdk-mainloop/gradle/wrapper/gradle-wrapper.properties
index 5538f03..c3349a3 100644
--- a/examples/agdk-mainloop/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/agdk-mainloop/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon May 02 15:39:12 BST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

From 42af0cccfae539c99631926cb61a2d91b2d767ba Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 31 Mar 2025 16:05:08 +0100
Subject: [PATCH 84/93] examples/agdk-mainloop: pull in games-activity:4.0.0

---
 examples/agdk-mainloop/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/agdk-mainloop/app/build.gradle b/examples/agdk-mainloop/app/build.gradle
index 386a484..05368ce 100644
--- a/examples/agdk-mainloop/app/build.gradle
+++ b/examples/agdk-mainloop/app/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     //implementation "androidx.games:games-performance-tuner:1.5.0"
 
     // To use the Games Activity library
-    implementation "androidx.games:games-activity:2.0.2"
+    implementation "androidx.games:games-activity:4.0.0"
 
     // To use the Games Controller Library
     //implementation "androidx.games:games-controller:2.0.2"

From c0f3fa675416647653631518b364437932f7bc33 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Mon, 31 Mar 2025 19:35:17 +0100
Subject: [PATCH 85/93] Check $ANDROID_GAMES_SDK for GameActivity source

For convenience, when updating to new GameActivity versions, this makes
it possible to build against the out-of-tree `android-games-sdk` repo.

This also updates `generate-bindings.sh` to point at $ANDROID_GAMES_SDK
if set.

E.g.

```
git clone git@github.com:rust-mobile/android-games-sdk.git \
    --branch android-activity-4.0.0
export ANDROID_GAMES_SDK=$PWD/android-games-sdk

./generate-bindings.sh
cargo build --features=game-activity --target=aarch64-linux-android
```
---
 android-activity/build.rs             | 7 +++++--
 android-activity/generate-bindings.sh | 7 ++++---
 2 files changed, 9 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 android-activity/generate-bindings.sh

diff --git a/android-activity/build.rs b/android-activity/build.rs
index eab6121..833ecaa 100644
--- a/android-activity/build.rs
+++ b/android-activity/build.rs
@@ -1,11 +1,14 @@
 #![allow(dead_code)]
 
 fn build_glue_for_game_activity() {
+    let android_games_sdk =
+        std::env::var("ANDROID_GAMES_SDK").unwrap_or_else(|_err| "android-games-sdk".to_string());
+
     let activity_path = |src_inc, name| {
-        format!("android-games-sdk/game-activity/prefab-src/modules/game-activity/{src_inc}/game-activity/{name}")
+        format!("{android_games_sdk}/game-activity/prefab-src/modules/game-activity/{src_inc}/game-activity/{name}")
     };
     let textinput_path = |src_inc, name| {
-        format!("android-games-sdk/game-text-input/prefab-src/modules/game-text-input/{src_inc}/game-text-input/{name}")
+        format!("{android_games_sdk}/game-text-input/prefab-src/modules/game-text-input/{src_inc}/game-text-input/{name}")
     };
 
     for f in ["GameActivity.cpp", "GameActivityEvents.cpp"] {
diff --git a/android-activity/generate-bindings.sh b/android-activity/generate-bindings.sh
old mode 100644
new mode 100755
index cee8691..8c1a4e9
--- a/android-activity/generate-bindings.sh
+++ b/android-activity/generate-bindings.sh
@@ -2,6 +2,7 @@
 
 # First install bindgen-cli via `cargo install bindgen-cli`
 
+SDK_DIR="${ANDROID_GAMES_SDK:-android-games-sdk}"
 if test -z "${ANDROID_NDK_ROOT}"; then
     export ANDROID_NDK_ROOT=${ANDROID_NDK_HOME}
 fi
@@ -37,9 +38,9 @@ while read ARCH && read TARGET ; do
         --blocklist-function 'GameActivity_onCreate_C' \
         --newtype-enum '\w+_(result|status)_t' \
         -- \
-        -Iandroid-games-sdk/game-activity/prefab-src/modules/game-activity/include \
-        -Iandroid-games-sdk/game-text-input/prefab-src/modules/game-text-input/include \
-        -Iandroid-games-sdk/include \
+        "-I$SDK_DIR/game-activity/prefab-src/modules/game-activity/include" \
+        "-I$SDK_DIR/game-text-input/prefab-src/modules/game-text-input/include" \
+        "-I$SDK_DIR/include" \
         --sysroot="$SYSROOT" --target=$TARGET
 
 done << EOF

From 69f3642499fc51f6c84151bfa71505ffee82fa8e Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@sixbynine.org>
Date: Fri, 4 Apr 2025 16:10:33 +0100
Subject: [PATCH 86/93] Update android-games-sdk/README.md

Update the notes on how to update to new GameActivity releases
---
 android-activity/android-games-sdk/README.md | 72 ++++++++++----------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/android-activity/android-games-sdk/README.md b/android-activity/android-games-sdk/README.md
index ad79875..290e44d 100644
--- a/android-activity/android-games-sdk/README.md
+++ b/android-activity/android-games-sdk/README.md
@@ -1,41 +1,43 @@
-# android-games-sdk-rs
+# android-games-sdk
 
-This is a grafted version of [android-games-sdk-rs][agdk].
+This is an imported copy of the native "prefab" source for `GameActivity` and
+`GameTextInput`, from our fork of Google's
+[android-games-sdk](https://github.com/rust-mobile/android-games-sdk).
 
-The purpose of android-games-sdk-rs is to track our patches on top of the Android Game Development Kit (AGDK) so that it is easier to update to new upstream versions.
+We use an external fork to track our integration patches on top of the Android
+Game Development Kit (AGDK) in a way that it is easier to update to new upstream
+versions. It also makes it easier to try and upstream changes when we fix bugs.
 
 ## Updating to new agdk version checklist
 
-This is a basic checklist for things that need to be done before updating to a new agdk version:
-
-- [ ] Ensure all patches applied to the local repo have been backported (see section below on backporting patches)
-- [ ] Rebase patches on top of a new *release* version of agdk. If you're not sure which version you should be rebasing on, open an issue.
-- [ ] If there have been substantial path changes, remove the existing files first so that its a clean graft
-- [ ] Copy any new files over from the new version using the [copy_files](./copy_files) script (see section below on copying files)
+This is a basic checklist for things that need to be done when updating to a new
+agdk version:
+
+- [ ] Create a new integration branch based on our last integrated branch and
+  rebase that on the latest *release* branch from Google:
+
+    ```bash
+    git clone git@github.com:rust-mobile/android-games-sdk.git
+    cd android-games-sdk
+    git remote add google https://android.googlesource.com/platform/frameworks/opt/gamesdk
+    git fetch google
+    git checkout -b android-activity-5.0.0 origin/android-activity-4.0.0
+    git rebase --onto google/android-games-sdk-game-activity-release <base>
+    # (where <base> is the upstream commit ID below our stack of integration patches)
+    ```
+
+- [ ] Set the `ANDROID_GAMES_SDK` environment variable so you can build
+  android-activity against your external games-sdk branch while updating.
+- [ ] Re-generate the `GameActivity` FFI bindings with `./generate-bindings.sh`
+  (this can be done with `ANDROID_GAMES_SDK` set in your environment and also
+  repeated after importing)
 - [ ] Update [build.rs](../build.rs) with any new includes and src files
-- [ ] Regenerate ffi bindings using [generate_bindings.sh](./generate_bindings.sh)
-
-## Backporting patches
-
-Changes made to these files must be backported to [android-games-sdk-rs][agdk], otherwise they will be lost when updating to newer upstream versions. This can be done like so (running from the project root):
-
-```bash
-git format-patch -o ~/agdk-patches last-import.. -- android-activity/android-games-sdk
-```
-
-When applying on the [android-games-sdk-rs][agdk] side:
-
-```bash
-git checkout android-activity-4.0.0
-git am -p3 ~/agdk-patches/*.patch
-```
-
-Once these are applied on top of the current imported agdk version (in this example 4.0.0). Then they can be rebased onto future agdk versions easily.
-
-## Copying files from agdk
-
-When updating to a new version of upstream agdk properly, you can use the [copy_files](./copy_files) script.
-
-This script takes in a list of files from [file_list.txt](./file_list.txt), and grafts those files into the local directory. This ensures that pathes are aligned so that patching is easier.
-
-[agdk]: https://github.com/rust-mobile/android-games-sdk-rs
+- [ ] Update the `src/game-activity` backend as needed
+- [ ] Push a new `android-games-sdk` branch like `android-activity-5.0.0` that
+  can be referenced when importing a copy into `android-activity`
+- [ ] Review and run `./import-games-sdk.sh` when ready to copy external AGDK
+  code into this repo
+- [ ] Clearly reference the branch name and commit hash from the
+  `android-games-sdk` repo in the `android-activity` commit that imports new
+  games-sdk source.
+- [ ] Update CHANGELOG.md as required

From 87cda3c560f2c9928a8a613a9f900948090d6545 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Mon, 10 Mar 2025 12:28:17 +0100
Subject: [PATCH 87/93] Build-test (documentation) on the host and fix broken
 doc samples

---
 .github/workflows/ci.yml          |  5 +++++
 android-activity/Cargo.toml       |  4 ++++
 android-activity/src/input/sdk.rs |  7 +++----
 android-activity/src/lib.rs       | 27 ++++++++++++++-------------
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3154a3a..b2e5dba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,6 +96,11 @@ jobs:
         run: >
           cargo ndk -t arm64-v8a doc --no-deps
 
+      - name: Tests (host build-testing)
+        run: |
+          cargo test -F native-activity -F test
+          cargo test -F game-activity -F test
+
   format:
     runs-on: ubuntu-latest
     steps:
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 2695132..449565c 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -28,6 +28,10 @@ native-activity = []
 api-level-30 = ["ndk/api-level-30"]
 api-level-33 = ["api-level-30", "ndk/api-level-33"]
 
+# "Internal" feature to allow build-testing this crate for the host
+# architecture, needed to make doctests actually compile sample code.
+test = ["ndk/test", "ndk-sys/test"]
+
 [dependencies]
 log = "0.4"
 jni-sys = "0.3"
diff --git a/android-activity/src/input/sdk.rs b/android-activity/src/input/sdk.rs
index 70a2c2c..978ad5a 100644
--- a/android-activity/src/input/sdk.rs
+++ b/android-activity/src/input/sdk.rs
@@ -284,13 +284,12 @@ impl KeyCharacterMap {
 
     /// Get the character that is produced by combining the dead key producing accent with the key producing character c.
     ///
-    /// For example, ```get_dead_char('`', 'e')``` returns 'è'. `get_dead_char('^', ' ')` returns '^' and `get_dead_char('^', '^')` returns '^'.
+    /// For example, ``get_dead_char('`', 'e')`` returns `'è'`. `get_dead_char('^', ' ')` returns `'^'` and `get_dead_char('^', '^')` returns `'^'`.
     ///
     /// # Errors
     ///
-    /// Since this API needs to use JNI internally to call into the Android JVM it may return
-    /// a [`AppError::JavaError`] in case there is a spurious JNI error or an exception
-    /// is caught.
+    /// Since this API needs to use JNI internally to call into the Android JVM it may return a
+    /// [`AppError::JavaError`] in case there is a spurious JNI error or an exception is caught.
     pub fn get_dead_char(
         &self,
         accent_char: char,
diff --git a/android-activity/src/lib.rs b/android-activity/src/lib.rs
index e8984fe..c027cba 100644
--- a/android-activity/src/lib.rs
+++ b/android-activity/src/lib.rs
@@ -13,15 +13,15 @@
 //!    a wider range of devices.
 //!
 //! Standalone applications based on this crate need to be built as `cdylib` libraries, like:
-//! ```
+//! ```toml
 //! [lib]
 //! crate_type=["cdylib"]
 //! ```
 //!
 //! and implement a `#[no_mangle]` `android_main` entry point like this:
-//! ```rust
+//! ```
 //! #[no_mangle]
-//! fn android_main(app: AndroidApp) {
+//! fn android_main(app: android_activity::AndroidApp) {
 //!
 //! }
 //! ```
@@ -64,6 +64,7 @@
 //! These are undone after `android_main()` returns
 //!
 //! # Android Extensible Enums
+// TODO: Move this to the NDK crate, which now implements this for most of the code?
 //!
 //! There are numerous enums in the `android-activity` API which are effectively
 //! bindings to enums declared in the Android SDK which need to be considered
@@ -95,7 +96,7 @@
 //! For example, here is how you could ensure forwards compatibility with both
 //! compile-time and runtime extensions of a `SomeEnum` enum:
 //!
-//! ```rust
+//! ```ignore
 //! match some_enum {
 //!     SomeEnum::Foo => {},
 //!     SomeEnum::Bar => {},
@@ -131,7 +132,7 @@ use ndk::native_window::NativeWindow;
 pub use ndk;
 pub use ndk_sys;
 
-#[cfg(not(target_os = "android"))]
+#[cfg(all(not(target_os = "android"), not(feature = "test")))]
 compile_error!("android-activity only supports compiling for Android");
 
 #[cfg(all(feature = "game-activity", feature = "native-activity"))]
@@ -556,10 +557,10 @@ impl AndroidApp {
     /// between native Rust code and Java/Kotlin code running within the JVM.
     ///
     /// If you use the [`jni`] crate you can wrap this as a [`JavaVM`] via:
-    /// ```ignore
+    /// ```no_run
     /// # use jni::JavaVM;
-    /// # let app: AndroidApp = todo!();
-    /// let vm = unsafe { JavaVM::from_raw(app.vm_as_ptr()) };
+    /// # let app: android_activity::AndroidApp = todo!();
+    /// let vm = unsafe { JavaVM::from_raw(app.vm_as_ptr().ast()) };
     /// ```
     ///
     /// [`jni`]: https://crates.io/crates/jni
@@ -571,10 +572,10 @@ impl AndroidApp {
     /// Returns a JNI object reference for this application's JVM `Activity` as a pointer
     ///
     /// If you use the [`jni`] crate you can wrap this as an object reference via:
-    /// ```ignore
+    /// ```no_run
     /// # use jni::objects::JObject;
-    /// # let app: AndroidApp = todo!();
-    /// let activity = unsafe { JObject::from_raw(app.activity_as_ptr()) };
+    /// # let app: android_activity::AndroidApp = todo!();
+    /// let activity = unsafe { JObject::from_raw(app.activity_as_ptr().cast()) };
     /// ```
     ///
     /// # JNI Safety
@@ -731,7 +732,7 @@ impl AndroidApp {
     /// # Example
     /// Code to iterate all pending input events would look something like this:
     ///
-    /// ```rust
+    /// ```
     /// match app.input_events_iter() {
     ///     Ok(mut iter) => {
     ///         loop {
@@ -786,7 +787,7 @@ impl AndroidApp {
     ///
     /// Code to handle unicode character mapping as well as combining dead keys could look some thing like:
     ///
-    /// ```rust
+    /// ```
     /// let mut combining_accent = None;
     /// // Snip
     ///

From 019ad634a21ae257ac5823be9eb3810bf5285241 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Fri, 8 Aug 2025 10:44:54 +0200
Subject: [PATCH 88/93] Switch doctests back to native cross-compilation,
 supported since Rust 1.89

https://blog.rust-lang.org/2025/08/07/Rust-1.89.0/#cross-compiled-doctests
---
 .github/workflows/ci.yml    | 11 ++++++++---
 android-activity/Cargo.toml |  4 ----
 android-activity/src/lib.rs | 36 +++++++++++++++++++++---------------
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b2e5dba..30c8133 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,10 +96,15 @@ jobs:
         run: >
           cargo ndk -t arm64-v8a doc --no-deps
 
-      - name: Tests (host build-testing)
+      - name: Build doctests
+        # All doctests are set to no_run, because they require running in the
+        # context of an Android app.
+        # Only run on stable because cross-compiling doctests is only supported
+        # since Rust 1.89.
+        if: ${{ matrix.rust-version == 'stable' }}
         run: |
-          cargo test -F native-activity -F test
-          cargo test -F game-activity -F test
+          cargo test --doc -F native-activity --target aarch64-linux-android
+          cargo ndk -t arm64-v8a -- test --doc -F game-activity
 
   format:
     runs-on: ubuntu-latest
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 449565c..2695132 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -28,10 +28,6 @@ native-activity = []
 api-level-30 = ["ndk/api-level-30"]
 api-level-33 = ["api-level-30", "ndk/api-level-33"]
 
-# "Internal" feature to allow build-testing this crate for the host
-# architecture, needed to make doctests actually compile sample code.
-test = ["ndk/test", "ndk-sys/test"]
-
 [dependencies]
 log = "0.4"
 jni-sys = "0.3"
diff --git a/android-activity/src/lib.rs b/android-activity/src/lib.rs
index c027cba..42c207c 100644
--- a/android-activity/src/lib.rs
+++ b/android-activity/src/lib.rs
@@ -19,7 +19,7 @@
 //! ```
 //!
 //! and implement a `#[no_mangle]` `android_main` entry point like this:
-//! ```
+//! ```no_run
 //! #[no_mangle]
 //! fn android_main(app: android_activity::AndroidApp) {
 //!
@@ -132,7 +132,7 @@ use ndk::native_window::NativeWindow;
 pub use ndk;
 pub use ndk_sys;
 
-#[cfg(all(not(target_os = "android"), not(feature = "test")))]
+#[cfg(not(target_os = "android"))]
 compile_error!("android-activity only supports compiling for Android");
 
 #[cfg(all(feature = "game-activity", feature = "native-activity"))]
@@ -560,7 +560,7 @@ impl AndroidApp {
     /// ```no_run
     /// # use jni::JavaVM;
     /// # let app: android_activity::AndroidApp = todo!();
-    /// let vm = unsafe { JavaVM::from_raw(app.vm_as_ptr().ast()) };
+    /// let vm = unsafe { JavaVM::from_raw(app.vm_as_ptr().cast()) };
     /// ```
     ///
     /// [`jni`]: https://crates.io/crates/jni
@@ -732,7 +732,9 @@ impl AndroidApp {
     /// # Example
     /// Code to iterate all pending input events would look something like this:
     ///
-    /// ```
+    /// ```no_run
+    /// # use android_activity::{AndroidApp, InputStatus, input::InputEvent};
+    /// # let app: AndroidApp = todo!();
     /// match app.input_events_iter() {
     ///     Ok(mut iter) => {
     ///         loop {
@@ -740,12 +742,13 @@ impl AndroidApp {
     ///                 let handled = match event {
     ///                     InputEvent::KeyEvent(key_event) => {
     ///                         // Snip
+    ///                         InputStatus::Handled
     ///                     }
     ///                     InputEvent::MotionEvent(motion_event) => {
-    ///                         // Snip
+    ///                         InputStatus::Unhandled
     ///                     }
     ///                     event => {
-    ///                         // Snip
+    ///                         InputStatus::Unhandled
     ///                     }
     ///                 };
     ///
@@ -767,7 +770,7 @@ impl AndroidApp {
     ///
     /// This must only be called from your `android_main()` thread and it may panic if called
     /// from another thread.
-    pub fn input_events_iter(&self) -> Result<input::InputIterator> {
+    pub fn input_events_iter(&self) -> Result<input::InputIterator<'_>> {
         let receiver = {
             let guard = self.inner.read().unwrap();
             guard.input_events_receiver()?
@@ -787,44 +790,47 @@ impl AndroidApp {
     ///
     /// Code to handle unicode character mapping as well as combining dead keys could look some thing like:
     ///
-    /// ```
+    /// ```no_run
+    /// # use android_activity::{AndroidApp, input::{InputEvent, KeyEvent, KeyMapChar}};
+    /// # let app: AndroidApp = todo!();
+    /// # let key_event: KeyEvent = todo!();
     /// let mut combining_accent = None;
     /// // Snip
     ///
-    /// let combined_key_char = if let Ok(map) = app.device_key_character_map(device_id) {
+    /// let combined_key_char = if let Ok(map) = app.device_key_character_map(key_event.device_id()) {
     ///     match map.get(key_event.key_code(), key_event.meta_state()) {
     ///         Ok(KeyMapChar::Unicode(unicode)) => {
     ///             let combined_unicode = if let Some(accent) = combining_accent {
     ///                 match map.get_dead_char(accent, unicode) {
     ///                     Ok(Some(key)) => {
-    ///                         info!("KeyEvent: Combined '{unicode}' with accent '{accent}' to give '{key}'");
+    ///                         println!("KeyEvent: Combined '{unicode}' with accent '{accent}' to give '{key}'");
     ///                         Some(key)
     ///                     }
     ///                     Ok(None) => None,
     ///                     Err(err) => {
-    ///                         log::error!("KeyEvent: Failed to combine 'dead key' accent '{accent}' with '{unicode}': {err:?}");
+    ///                         eprintln!("KeyEvent: Failed to combine 'dead key' accent '{accent}' with '{unicode}': {err:?}");
     ///                         None
     ///                     }
     ///                 }
     ///             } else {
-    ///                 info!("KeyEvent: Pressed '{unicode}'");
+    ///                 println!("KeyEvent: Pressed '{unicode}'");
     ///                 Some(unicode)
     ///             };
     ///             combining_accent = None;
     ///             combined_unicode.map(|unicode| KeyMapChar::Unicode(unicode))
     ///         }
     ///         Ok(KeyMapChar::CombiningAccent(accent)) => {
-    ///             info!("KeyEvent: Pressed 'dead key' combining accent '{accent}'");
+    ///             println!("KeyEvent: Pressed 'dead key' combining accent '{accent}'");
     ///             combining_accent = Some(accent);
     ///             Some(KeyMapChar::CombiningAccent(accent))
     ///         }
     ///         Ok(KeyMapChar::None) => {
-    ///             info!("KeyEvent: Pressed non-unicode key");
+    ///             println!("KeyEvent: Pressed non-unicode key");
     ///             combining_accent = None;
     ///             None
     ///         }
     ///         Err(err) => {
-    ///             log::error!("KeyEvent: Failed to get key map character: {err:?}");
+    ///             eprintln!("KeyEvent: Failed to get key map character: {err:?}");
     ///             combining_accent = None;
     ///             None
     ///         }

From 1652ebb229a740f45b72d31ca3bc310173fc8977 Mon Sep 17 00:00:00 2001
From: daxpedda <daxpedda@gmail.com>
Date: Mon, 5 Aug 2024 10:34:50 +0200
Subject: [PATCH 89/93] Add `package.include` to `Cargo.toml`

This reduces package size and notably prevents any bash files from landing on a users device.
---
 android-activity/Cargo.toml                | 6 ++++++
 android-activity/LICENSE                   | 8 ++++----
 android-activity/{docs => }/LICENSE-APACHE | 0
 android-activity/{docs => }/LICENSE-MIT    | 0
 4 files changed, 10 insertions(+), 4 deletions(-)
 rename android-activity/{docs => }/LICENSE-APACHE (100%)
 rename android-activity/{docs => }/LICENSE-MIT (100%)

diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 2695132..276d1bd 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -9,6 +9,12 @@ repository = "https://github.com/rust-mobile/android-activity"
 documentation = "https://docs.rs/android-activity"
 description = "Glue for building Rust applications on Android with NativeActivity or GameActivity"
 license = "MIT OR Apache-2.0"
+include = [
+    "/build.rs",
+    "/android-games-sdk",
+    "/LICENSE*",
+    "/src",
+]
 
 # Even though we could technically still build with 1.69, 1.73 has a fix for the
 # definition of the `stat` struct on Android, and so it seems worthwhile drawing
diff --git a/android-activity/LICENSE b/android-activity/LICENSE
index 47bdfd8..dba60f7 100644
--- a/android-activity/LICENSE
+++ b/android-activity/LICENSE
@@ -5,20 +5,20 @@
 The third-party glue code, under the game-activity-csrc/ directory is covered by
 the Apache 2.0 license only:
 
-Apache License, Version 2.0 (docs/LICENSE-APACHE or <http://www.apache.org/licenses/LICENSE-2.0>)
+Apache License, Version 2.0 (LICENSE-APACHE or <http://www.apache.org/licenses/LICENSE-2.0>)
 
 ## SDK Documentation
 
 Documentation for APIs that are direct bindings of Android platform APIs are covered
 by the Apache 2.0 license only:
 
-Apache License, Version 2.0 (docs/LICENSE-APACHE or <http://www.apache.org/licenses/LICENSE-2.0>)
+Apache License, Version 2.0 (LICENSE-APACHE or <http://www.apache.org/licenses/LICENSE-2.0>)
 
 ## android-activity
 
 All other code is dual-licensed under either
 
-- MIT License (docs/LICENSE-MIT or <http://opensource.org/licenses/MIT>)
-- Apache License, Version 2.0 (docs/LICENSE-APACHE or <http://www.apache.org/licenses/LICENSE-2.0>)
+- MIT License (LICENSE-MIT or <http://opensource.org/licenses/MIT>)
+- Apache License, Version 2.0 (LICENSE-APACHE or <http://www.apache.org/licenses/LICENSE-2.0>)
 
 at your option.
diff --git a/android-activity/docs/LICENSE-APACHE b/android-activity/LICENSE-APACHE
similarity index 100%
rename from android-activity/docs/LICENSE-APACHE
rename to android-activity/LICENSE-APACHE
diff --git a/android-activity/docs/LICENSE-MIT b/android-activity/LICENSE-MIT
similarity index 100%
rename from android-activity/docs/LICENSE-MIT
rename to android-activity/LICENSE-MIT

From a97cf1ceae4f04465a41c26478da8f9038c8b549 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Wed, 12 Mar 2025 14:43:02 +0100
Subject: [PATCH 90/93] native_activity: Only wait for state to update while
 main thread is running

We see that some Android callbacks like `onStart()` deadlock,
specifically when returning out of the main thread before running
any event loop (but likely also whenever terminating the event loop),
because they don't check if the thread is still even running and are
otherwise guaranteed receive an `activity_state` update or other state
change to unblock themselves.

This is a followup to [#94] which only concerned itself with a deadlock
caused by a destructor not running because that very object was kept
alive to poll on the `destroyed` field that destructor was supposed to
set, but its new `thread_state` can be reused to disable these condvar
waits when the "sending" thread has disappeared.

Separately, that PR mentions `Activity` recreates because of
configuration changes which isn't supported anyway because `Activity` is
still wrongly assumed to be a global singleton.

[#94]: https://togithub.com/rust-mobile/android-activity/pull/94
---
 android-activity/src/native_activity/glue.rs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/android-activity/src/native_activity/glue.rs b/android-activity/src/native_activity/glue.rs
index dab3e29..82672a5 100644
--- a/android-activity/src/native_activity/glue.rs
+++ b/android-activity/src/native_activity/glue.rs
@@ -447,7 +447,9 @@ impl WaitableNativeActivityState {
 
         guard.pending_input_queue = input_queue;
         guard.write_cmd(AppCmd::InputQueueChanged);
-        while guard.input_queue != guard.pending_input_queue {
+        while guard.thread_state == NativeThreadState::Running
+            && guard.input_queue != guard.pending_input_queue
+        {
             guard = self.cond.wait(guard).unwrap();
         }
         guard.pending_input_queue = ptr::null_mut();
@@ -468,7 +470,9 @@ impl WaitableNativeActivityState {
         if guard.pending_window.is_some() {
             guard.write_cmd(AppCmd::InitWindow);
         }
-        while guard.window != guard.pending_window {
+        while guard.thread_state == NativeThreadState::Running
+            && guard.window != guard.pending_window
+        {
             guard = self.cond.wait(guard).unwrap();
         }
         guard.pending_window = None;
@@ -492,7 +496,7 @@ impl WaitableNativeActivityState {
         };
         guard.write_cmd(cmd);
 
-        while guard.activity_state != state {
+        while guard.thread_state == NativeThreadState::Running && guard.activity_state != state {
             guard = self.cond.wait(guard).unwrap();
         }
     }
@@ -505,7 +509,7 @@ impl WaitableNativeActivityState {
         // this to be None
         debug_assert!(!guard.app_has_saved_state, "SaveState request clash");
         guard.write_cmd(AppCmd::SaveState);
-        while !guard.app_has_saved_state {
+        while guard.thread_state == NativeThreadState::Running && !guard.app_has_saved_state {
             guard = self.cond.wait(guard).unwrap();
         }
         guard.app_has_saved_state = false;
@@ -560,7 +564,9 @@ impl WaitableNativeActivityState {
     pub fn notify_main_thread_stopped_running(&self) {
         let mut guard = self.mutex.lock().unwrap();
         guard.thread_state = NativeThreadState::Stopped;
-        self.cond.notify_one();
+        // Notify all waiters to unblock any Android callbacks that would otherwise be waiting
+        // indefinitely for the now-stopped (!) main thread.
+        self.cond.notify_all();
     }
 
     pub unsafe fn pre_exec_cmd(

From 9e8c85c647a85eb0ced34709d30abe64bfa9dfb2 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Wed, 17 Dec 2025 13:43:52 +0100
Subject: [PATCH 91/93] Assert that the thread `Looper` matches the main one

---
 android-activity/src/game_activity/mod.rs   | 7 ++++++-
 android-activity/src/native_activity/mod.rs | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index 70b6941..8873a32 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -295,6 +295,11 @@ impl AndroidAppInner {
 
         unsafe {
             let native_app = &self.native_app;
+            assert_eq!(
+                ndk_sys::ALooper_forThread(),
+                (*native_app.as_ptr()).looper,
+                "Application tried to poll events from non-main thread"
+            );
 
             let mut fd: i32 = 0;
             let mut events: i32 = 0;
@@ -590,7 +595,7 @@ impl AndroidAppInner {
         let mut guard = self.input_receiver.lock().unwrap();
 
         // Make sure we don't hand out more than one receiver at a time because
-        // turning the reciever into an interator will perform a swap_buffers
+        // turning the receiver into an iterator will perform a swap_buffers
         // for the buffered input events which shouldn't happen while we're in
         // the middle of iterating events
         if let Some(receiver) = &*guard {
diff --git a/android-activity/src/native_activity/mod.rs b/android-activity/src/native_activity/mod.rs
index 88a9fe8..0346b98 100644
--- a/android-activity/src/native_activity/mod.rs
+++ b/android-activity/src/native_activity/mod.rs
@@ -201,8 +201,9 @@ impl AndroidAppInner {
             };
 
             trace!("Calling ALooper_pollAll, timeout = {timeout_milliseconds}");
-            assert!(
-                !ndk_sys::ALooper_forThread().is_null(),
+            assert_eq!(
+                ndk_sys::ALooper_forThread(),
+                self.looper.ptr,
                 "Application tried to poll events from non-main thread"
             );
             let id = ndk_sys::ALooper_pollAll(

From b9e883866ecf0fa06478548f97225a1b99845b0d Mon Sep 17 00:00:00 2001
From: Mads Marquart <mads@marquart.dk>
Date: Fri, 5 Sep 2025 00:26:47 +0200
Subject: [PATCH 92/93] Clean up gitignores

---
 .gitignore                  |  3 ++-
 android-activity/.gitignore | 10 ----------
 2 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 android-activity/.gitignore

diff --git a/.gitignore b/.gitignore
index eb5a316..4fffb2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-target
+/target
+/Cargo.lock
diff --git a/android-activity/.gitignore b/android-activity/.gitignore
deleted file mode 100644
index 29f475a..0000000
--- a/android-activity/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/target
-Cargo.lock
-
-
-# Added by cargo
-#
-# already existing elements were commented out
-
-#/target
-#Cargo.lock

From e686e80112607be3deb95df4f345733b920321f4 Mon Sep 17 00:00:00 2001
From: Mads Marquart <mads@marquart.dk>
Date: Thu, 5 Jun 2025 11:54:18 +0200
Subject: [PATCH 93/93] Allow building as dependency on docs.rs with no
 features enabled

---
 android-activity/build.rs                   | 21 +++++++++++++++++----
 android-activity/src/game_activity/mod.rs   |  2 --
 android-activity/src/lib.rs                 | 16 +++++++++++++---
 android-activity/src/native_activity/mod.rs |  2 --
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/android-activity/build.rs b/android-activity/build.rs
index 833ecaa..94e44b5 100644
--- a/android-activity/build.rs
+++ b/android-activity/build.rs
@@ -1,5 +1,3 @@
-#![allow(dead_code)]
-
 fn build_glue_for_game_activity() {
     let android_games_sdk =
         std::env::var("ANDROID_GAMES_SDK").unwrap_or_else(|_err| "android-games-sdk".to_string());
@@ -94,6 +92,21 @@ fn build_glue_for_game_activity() {
 }
 
 fn main() {
-    #[cfg(feature = "game-activity")]
-    build_glue_for_game_activity();
+    // Enable Cargo's change-detection to avoid re-running build script if
+    // irrelvant parts changed. Using build.rs here is just a dummy used to
+    // disable the default "rerun on every change" behaviour Cargo has.
+    println!("cargo:rerun-if-changed=build.rs");
+
+    if cfg!(feature = "game-activity") {
+        build_glue_for_game_activity();
+    }
+
+    // Whether this is used directly in or as a dependency on docs.rs.
+    //
+    // `cfg(docsrs)` cannot be used, since it's only set for the crate being
+    // built, and not for any dependent crates.
+    println!("cargo:rustc-check-cfg=cfg(used_on_docsrs)");
+    if std::env::var("DOCS_RS").is_ok() {
+        println!("cargo:rustc-cfg=used_on_docsrs");
+    }
 }
diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index 8873a32..129175d 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -1,5 +1,3 @@
-#![cfg(feature = "game-activity")]
-
 use std::collections::HashMap;
 use std::marker::PhantomData;
 use std::ops::Deref;
diff --git a/android-activity/src/lib.rs b/android-activity/src/lib.rs
index 42c207c..7a05078 100644
--- a/android-activity/src/lib.rs
+++ b/android-activity/src/lib.rs
@@ -141,7 +141,7 @@ compile_error!(
 );
 #[cfg(all(
     not(any(feature = "game-activity", feature = "native-activity")),
-    not(doc)
+    not(any(doc, used_on_docsrs)),
 ))]
 compile_error!(
     r#"Either "game-activity" or "native-activity" must be enabled as features
@@ -160,8 +160,18 @@ You may need to add a `[patch]` into your Cargo.toml to ensure a specific versio
 android-activity is used across all of your application's crates."#
 );
 
-#[cfg_attr(any(feature = "native-activity", doc), path = "native_activity/mod.rs")]
-#[cfg_attr(any(feature = "game-activity", doc), path = "game_activity/mod.rs")]
+#[cfg_attr(feature = "native-activity", path = "native_activity/mod.rs")]
+#[cfg_attr(feature = "game-activity", path = "game_activity/mod.rs")]
+#[cfg_attr(
+    all(
+        // No activities enabled.
+        not(any(feature = "native-activity", feature = "game-activity")),
+        // And building docs.
+        any(doc, used_on_docsrs),
+    ),
+    // Fall back to documenting native activity.
+    path = "native_activity/mod.rs"
+)]
 pub(crate) mod activity_impl;
 
 pub mod error;
diff --git a/android-activity/src/native_activity/mod.rs b/android-activity/src/native_activity/mod.rs
index 0346b98..4fa295d 100644
--- a/android-activity/src/native_activity/mod.rs
+++ b/android-activity/src/native_activity/mod.rs
@@ -1,5 +1,3 @@
-#![cfg(any(feature = "native-activity", doc))]
-
 use std::collections::HashMap;
 use std::marker::PhantomData;
 use std::panic::AssertUnwindSafe;