Replace android-properties with android_system_properties. (#2815)

The former use statically linked Android libc symbols while the latter loads them dynamically. This is required to support old and new versions of Android with the same binary. It unblocks updating wgpu in Gecko. Fixes #2805.
gfx-rs · Jun 27, 2022 · 892c272 · 892c272
1 parent 064f3f1
commit 892c272
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml
@@ -91,7 +91,7 @@ web-sys = { version = "0.3", features = ["Window", "HtmlCanvasElement", "WebGl2R
 js-sys = { version = "0.3" }
 
 [target.'cfg(target_os = "android")'.dependencies]
-android-properties = "0.2"
+android_system_properties = "0.1.1"
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"

diff --git a/wgpu-hal/src/vulkan/instance.rs b/wgpu-hal/src/vulkan/instance.rs
@@ -573,9 +573,9 @@ impl crate::Instance<super::Api> for super::Instance {
 
         #[cfg(target_os = "android")]
         let android_sdk_version = {
+            let properties = android_system_properties::AndroidSystemProperties::new();
             // See: https://developer.android.com/reference/android/os/Build.VERSION_CODES
-            let mut prop = android_properties::getprop("ro.build.version.sdk");
-            if let Some(val) = prop.value() {
+            if let Some(val) = properties.get("ro.build.version.sdk") {
                 match val.parse::<u32>() {
                     Ok(sdk_ver) => sdk_ver,
                     Err(err) => {