From 983cab1b82f3884af54defbe44a8590a934ef74f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 9 Sep 2026 16:37:46 +0000
Subject: [PATCH 1/2] Initial plan


From 4f08d23a4be84a06bcdd6e4eaf5544bdd8fa0fd3 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 9 Sep 2026 16:41:21 +0000
Subject: [PATCH 2/2] Fix bindgen args to use versioned clang target

Co-authored-by: bbqsrc <279099+bbqsrc@users.noreply.github.com>
---
 src/cargo.rs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/cargo.rs b/src/cargo.rs
index 2896153603..af214bb403 100644
--- a/src/cargo.rs
+++ b/src/cargo.rs
@@ -268,7 +268,7 @@ pub(crate) fn build_env(
     }
 
     let bindgen_args = format!(
-        "--sysroot={} -I{}",
+        "{clang_target} --sysroot={} -I{}",
         cargo_ndk_sysroot_path.display(),
         extra_include
     );
@@ -473,6 +473,25 @@ mod tests {
         assert_eq!(env["ANDROID_ABI"], "arm64-v8a");
     }
 
+    #[test]
+    fn build_env_exports_versioned_bindgen_target_args() {
+        let env = build_env(
+            "aarch64-linux-android",
+            Path::new("/opt/android-ndk"),
+            &Version::new(28, 0, 0),
+            "--target=aarch64-linux-android28",
+            28,
+            "arm64-v8a",
+            false,
+            false,
+        );
+
+        let bindgen_clang_args =
+            env["BINDGEN_EXTRA_CLANG_ARGS_aarch64_linux_android"].to_string_lossy();
+        assert!(bindgen_clang_args.contains("--target=aarch64-linux-android28"));
+        assert!(bindgen_clang_args.contains("--sysroot="));
+    }
+
     #[test]
     fn target_args_skip_manifest_path_for_current_package() {
         let mut args = vec![OsString::from("build")];