Snap for 10103804 from edb1c8267639381376502a7a8690838ce63632b7 to mainline-tzdata5-releaseaml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz5_341510010

Change-Id: Ifee4601a577b00c1172e6d305a10c0627ea0c376

7 files changed, 30 insertions, 15 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
new file mode 100644
index 0000000..9652dcc
--- /dev/null
+++ b/.cargo_vcs_info.json
@@ -0,0 +1,6 @@
+{
+  "git": {
+    "sha1": "cb2cd6d359b715e24144242e4580679897268ffd"
+  },
+  "path_in_vcs": "userfaultfd-sys"
+}
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 5cbc441..491bd2c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
 // This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
-
-
 package {
     default_applicable_licenses: [
         "external_rust_crates_userfaultfd-sys_license",
@@ -46,7 +44,7 @@ rust_library {
     host_supported: true,
     crate_name: "userfaultfd_sys",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.4.2",
+    cargo_pkg_version: "0.4.3",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: ["default"],
@@ -58,10 +56,15 @@ rust_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
+    product_available: true,
+    vendor_available: true,
 }
 
 cc_library_static {
     name: "libuserfaultfd_sys_consts",
     host_supported: true,
     srcs: ["src/consts.c"],
+    vendor_available: true,
+    product_available: true,
 }
+
diff --git a/Cargo.toml b/Cargo.toml
index 63f6535..eac1cb3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,12 +12,12 @@
 [package]
 edition = "2018"
 name = "userfaultfd-sys"
-version = "0.4.2"
-authors = ["Adam C. Foltzer <acfoltzer@fastly.com>"]
+version = "0.4.3"
+authors = ["The Wasmtime Project Developers"]
 build = "build.rs"
 description = "Low-level bindings for userfaultfd functionality on Linux."
 license = "MIT OR Apache-2.0"
-repository = "https://github.com/fastly/userfaultfd-rs"
+repository = "https://github.com/bytecodealliance/userfaultfd-rs"
 
 [dependencies.cfg-if]
 version = "^1.0.0"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 16ac6d1..840d295 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,11 +1,11 @@
 [package]
 name = "userfaultfd-sys"
-version = "0.4.2"
-authors = ["Adam C. Foltzer <acfoltzer@fastly.com>"]
+version = "0.4.3"
+authors = ["The Wasmtime Project Developers"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
 description = "Low-level bindings for userfaultfd functionality on Linux."
-repository = "https://github.com/fastly/userfaultfd-rs"
+repository = "https://github.com/bytecodealliance/userfaultfd-rs"
 
 build = "build.rs"
 
diff --git a/METADATA b/METADATA
index 4a8199b..92f7519 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,7 @@
+# This project was upgraded with external_updater.
+# Usage: tools/external_updater/updater.sh update rust/crates/userfaultfd-sys
+# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md
+
 name: "userfaultfd-sys"
 description: "Low-level bindings for userfaultfd functionality on Linux."
 third_party {
@@ -7,14 +11,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/userfaultfd-sys/userfaultfd-sys-0.4.2.crate"
+    value: "https://static.crates.io/crates/userfaultfd-sys/userfaultfd-sys-0.4.3.crate"
   }
-  version: "0.4.2"
-  # Dual-licensed, using the least restrictive per go/thirdpartylicenses#same.
+  version: "0.4.3"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2022
-    month: 11
-    day: 16
+    year: 2023
+    month: 3
+    day: 30
   }
 }
diff --git a/cargo2android_consts.bp b/cargo2android_consts.bp
index 7563625..2d746e1 100644
--- a/cargo2android_consts.bp
+++ b/cargo2android_consts.bp
@@ -2,4 +2,6 @@ cc_library_static {
     name: "libuserfaultfd_sys_consts",
     host_supported: true,
     srcs: ["src/consts.c"],
+    vendor_available: true,
+    product_available: true,
 }
diff --git a/src/out/bindings.rs b/src/out/bindings.rs
index 2ccc752..45e46fb 100644
--- a/src/out/bindings.rs
+++ b/src/out/bindings.rs
@@ -29,6 +29,7 @@ pub const UFFD_FEATURE_THREAD_ID: u64 = 256;
 pub const UFFD_FEATURE_MINOR_HUGETLBFS: u64 = 512;
 pub const UFFD_FEATURE_MINOR_SHMEM: u64 = 1024;
 pub const UFFD_FEATURE_EXACT_ADDRESS: u64 = 2048;
+pub const UFFD_FEATURE_WP_HUGETLBFS_SHMEM: u64 = 4096;
 pub const UFFD_USER_MODE_ONLY: u32 = 1;
 pub type __s8 = ::std::os::raw::c_schar;
 pub type __u8 = ::std::os::raw::c_uchar;