summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2023-03-31 12:44:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-31 12:44:13 +0000
commitedb1c8267639381376502a7a8690838ce63632b7 (patch)
tree219269079cb4d8c8ab55367a1a9acf1434b79dd1
parent6629b263455e09d60684c5926241744375adb377 (diff)
parent908d923cde1b1700388f188f02442f84d959f6bb (diff)
downloaduserfaultfd-sys-android14-mainline-mediaprovider-release.tar.gz
Upgrade userfaultfd-sys to 0.4.3 am: 29d0edf47f am: 5c1a5fca96 am: c05a4277a0 am: 908d923cdeaml_wif_341711020aml_wif_341610000aml_wif_341510000aml_wif_341410080aml_wif_341310010aml_wif_341110010aml_wif_341011010aml_wif_340913010aml_uwb_341710010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_tet_341712060aml_tet_341610020aml_tet_341511010aml_tet_341411060aml_tet_341310230aml_tet_341112070aml_tet_341010040aml_tet_340913030aml_swc_341711000aml_swc_341619000aml_swc_341513600aml_swc_341312300aml_swc_341312020aml_swc_341111000aml_swc_341011020aml_swc_340922010aml_sta_341710000aml_sta_341615000aml_sta_341511040aml_sta_341410000aml_sta_341311010aml_sta_341114000aml_sta_341111000aml_sta_341010020aml_sta_340912000aml_sta_340911000aml_sdk_341710000aml_sdk_341510000aml_sdk_341410000aml_sdk_341110080aml_sdk_341110000aml_sdk_341010000aml_sdk_340912010aml_sch_341510000aml_res_341510000aml_res_341410010aml_res_341311030aml_res_341110000aml_res_340912000aml_per_341711000aml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010aml_odp_341717000aml_odp_341610000aml_neu_341510000aml_neu_341010080aml_neu_341010000aml_net_341710020aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341111030aml_net_341014000aml_net_340913000aml_mpr_341713020aml_mpr_341614010aml_mpr_341511070aml_mpr_341411070aml_mpr_341313030aml_mpr_341111030aml_mpr_341111020aml_mpr_341015090aml_mpr_341015030aml_mpr_340919000aml_med_341711000aml_med_341619000aml_med_341513600aml_med_341312300aml_med_341312020aml_med_341111000aml_med_341011000aml_med_340922010aml_ips_341611000aml_ips_341510000aml_ips_340914280aml_ips_340914200aml_ips_340914000aml_ext_341716000aml_ext_341620040aml_ext_341518010aml_ext_341414010aml_ext_341317010aml_ext_341131030aml_ext_341027030aml_doc_341713000aml_doc_341610010aml_doc_341510050aml_doc_341312010aml_doc_341112000aml_doc_341012000aml_doc_340916000aml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000aml_cbr_341710000aml_cbr_341610000aml_cbr_341510010aml_cbr_341410010aml_cbr_341311010aml_cbr_341110000aml_cbr_341011000aml_cbr_340914000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_art_341711000aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060aml_ads_341720000aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_adb_341520010aml_adb_341517070aml_adb_340912530aml_adb_340912350aml_adb_340912200aml_adb_340912000android14-mainline-wifi-releaseandroid14-mainline-uwb-releaseandroid14-mainline-tethering-releaseandroid14-mainline-sdkext-releaseandroid14-mainline-resolv-releaseandroid14-mainline-permission-releaseandroid14-mainline-os-statsd-releaseandroid14-mainline-networking-releaseandroid14-mainline-mediaprovider-releaseandroid14-mainline-media-swcodec-releaseandroid14-mainline-media-releaseandroid14-mainline-extservices-releaseandroid14-mainline-conscrypt-releaseandroid14-mainline-cellbroadcast-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-mainline-adbd-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/userfaultfd-sys/+/2515095 Change-Id: I5643034b161ffe28aa4d0220bd05e41cab47bebd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--.cargo_vcs_info.json6
-rw-r--r--Android.bp2
-rw-r--r--Cargo.toml6
-rw-r--r--Cargo.toml.orig6
-rw-r--r--METADATA15
-rw-r--r--src/out/bindings.rs1
6 files changed, 23 insertions, 13 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 ee985be..491bd2c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,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"],
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/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;