Merge "Regenerate Android.bp by running cargo_embargo." into main

.cargo_vcs_info.json

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 4c46237..80889d2 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "7c6858deab9cdd6812822e9e1060d44df674455b"
+    "sha1": "ddd00d48e27a6451f65fb8afef381d98a56e0560"
   },
   "path_in_vcs": "bindgen"
 }
\ No newline at end of file

Android.bp

diff --git a/Android.bp b/Android.bp
index ada7439..4b239f6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,7 +25,7 @@
     host_cross_supported: false,
     crate_name: "bindgen",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.69.4",
+    cargo_pkg_version: "0.69.5",
     crate_root: "lib.rs",
     srcs: [":copy_bindgen_build_out"],
     edition: "2018",

Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index c4f5f56..0931eda 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
 edition = "2018"
 rust-version = "1.60.0"
 name = "bindgen"
-version = "0.69.4"
+version = "0.69.5"
 authors = [
     "Jyun-Yan You <jyyou.tw@gmail.com>",
     "Emilio Cobos Álvarez <emilio@crisal.io>",
@@ -21,6 +21,10 @@
     "The Servo project developers",
 ]
 build = "build.rs"
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
 description = "Automatically generates Rust FFI bindings to C and C++ libraries."
 homepage = "https://rust-lang.github.io/rust-bindgen/"
 documentation = "https://docs.rs/bindgen"

Cargo.toml.orig

diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index a231efc..97c52d5 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -14,7 +14,7 @@
 repository = "https://github.com/rust-lang/rust-bindgen"
 documentation = "https://docs.rs/bindgen"
 homepage = "https://rust-lang.github.io/rust-bindgen/"
-version = "0.69.4"
+version = "0.69.5"
 edition = "2018"
 build = "build.rs"
 # If you change this, also update README.md and msrv in .github/workflows/bindgen.yml

METADATA

diff --git a/METADATA b/METADATA
index 9144a8a..2283dc7 100644
--- a/METADATA
+++ b/METADATA
@@ -1,6 +1,6 @@
 # This project was upgraded with external_updater.
 # Usage: tools/external_updater/updater.sh update external/rust/crates/bindgen
-# For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md
+# For more info, check https://cs.android.com/android/platform/superproject/main/+/main:tools/external_updater/README.md
 
 name: "bindgen"
 description: "Automatically generates Rust FFI bindings to C and C++ libraries."
@@ -8,13 +8,13 @@
   license_type: NOTICE
   last_upgrade_date {
     year: 2024
-    month: 6
-    day: 17
+    month: 10
+    day: 30
   }
   homepage: "https://crates.io/crates/bindgen"
   identifier {
     type: "Archive"
-    value: "https://static.crates.io/crates/bindgen/bindgen-0.69.4.crate"
-    version: "0.69.4"
+    value: "https://static.crates.io/crates/bindgen/bindgen-0.69.5.crate"
+    version: "0.69.5"
   }
 }

clang.rs

diff --git a/clang.rs b/clang.rs
index 4a4ed89..19f3e70 100644
--- a/clang.rs
+++ b/clang.rs
@@ -1608,7 +1608,7 @@
             let mut line = 0;
             let mut col = 0;
             let mut off = 0;
-            clang_getSpellingLocation(
+            clang_getFileLocation(
                 self.x, &mut file, &mut line, &mut col, &mut off,
             );
             (File { x: file }, line as usize, col as usize, off as usize)

lib.rs

diff --git a/lib.rs b/lib.rs
index 4720bac..4a177ef 100644
--- a/lib.rs
+++ b/lib.rs
@@ -933,7 +933,7 @@
 
         if !self.options.disable_header_comment {
             let version =
-                Some("0.69.4").unwrap_or("(unknown version)");
+                Some("0.69.5").unwrap_or("(unknown version)");
             writeln!(
                 writer,
                 "/* automatically generated by rust-bindgen {version} */{NL}",

patches/bindgen_cmd.diff

diff --git a/patches/bindgen_cmd.diff b/patches/bindgen_cmd.diff
index 9b28ff7..4a0833b 100644
--- a/patches/bindgen_cmd.diff
+++ b/patches/bindgen_cmd.diff
@@ -1,37 +1,3 @@
-diff --git a/android/bindgen_cmd/Android.bp b/android/bindgen_cmd/Android.bp
-new file mode 100644
-index 0000000..689e7ae
---- /dev/null
-+++ b/android/bindgen_cmd/Android.bp
-@@ -0,0 +1,28 @@
-+package {
-+    // See: http://go/android-license-faq
-+    // A large-scale-change added 'default_applicable_licenses' to import
-+    // all of the 'license_kinds' from "external_rust_crates_bindgen_license"
-+    // to get the below license kinds:
-+    //   SPDX-license-identifier-Apache-2.0
-+    default_applicable_licenses: ["external_rust_crates_bindgen_license"],
-+}
-+
-+rust_library_host {
-+    name: "libbindgen_cmd",
-+    crate_name: "bindgen_cmd",
-+    srcs: ["src/lib.rs"],
-+    edition: "2018",
-+    features: [
-+        "clap",
-+        "runtime",
-+        "which",
-+        "which-rustfmt",
-+    ],
-+    rustlibs: [
-+        "libbindgen",
-+        "libbindgen_cli",
-+        "libclap",
-+        "libenv_logger",
-+    ],
-+    compile_multilib: "first",
-+}
 diff --git a/android/bindgen_cmd/src/lib.rs b/android/bindgen_cmd/src/lib.rs
 new file mode 100644
 index 0000000..d33da7f