diff options
| author | Steven Moreland <smoreland@google.com> | 2023-01-05 18:17:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-05 18:17:03 +0000 |
| commit | e4c41babe8fa5b42359ed5989a0a7f1584412393 (patch) | |
| tree | 4b470fca9aa8ca8fe896099fda3da5e8d507cfa7 | |
| parent | d3bce99497250cbc3ca5107a3eb5aa6a96b2357d (diff) | |
| parent | 2f7b8b000329d79c1aeaa97d07a7fb48ae95e70b (diff) | |
| download | minijail-e4c41babe8fa5b42359ed5989a0a7f1584412393.tar.gz | |
update for bindgen CLI change am: 3c6795b890 am: 2f7b8b0003
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2374658
Change-Id: I59dba14b294fa373117a350c75360a0cf5e00b5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | rust/minijail-sys/build.rs | 10 | ||||
| -rw-r--r-- | rust/minijail-sys/lib.rs | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/rust/minijail-sys/build.rs b/rust/minijail-sys/build.rs index 8aa6651..4aa172d 100644 --- a/rust/minijail-sys/build.rs +++ b/rust/minijail-sys/build.rs @@ -85,15 +85,15 @@ fn bindings_generation() -> io::Result<()> { println!("cargo:rerun-if-changed={}", header_path.display()); let status = Command::new(&bindgen) .args(&["--default-enum-style", "rust"]) - .args(&["--blacklist-type", "__rlim64_t"]) + .args(&["--blocklist-type", "__rlim64_t"]) .args(&["--raw-line", "pub type __rlim64_t = u64;"]) - .args(&["--blacklist-type", "__u\\d{1,2}"]) + .args(&["--blocklist-type", "__u\\d{1,2}"]) .args(&["--raw-line", "pub type __u8 = u8;"]) .args(&["--raw-line", "pub type __u16 = u16;"]) .args(&["--raw-line", "pub type __u32 = u32;"]) - .args(&["--blacklist-type", "__uint64_t"]) - .args(&["--whitelist-function", "^minijail_.*"]) - .args(&["--whitelist-var", "^MINIJAIL_.*"]) + .args(&["--blocklist-type", "__uint64_t"]) + .args(&["--allowlist-function", "^minijail_.*"]) + .args(&["--allowlist-var", "^MINIJAIL_.*"]) .arg("--size_t-is-usize") .arg("--no-layout-tests") .arg("--disable-header-comment") diff --git a/rust/minijail-sys/lib.rs b/rust/minijail-sys/lib.rs index 3794c21..0285594 100644 --- a/rust/minijail-sys/lib.rs +++ b/rust/minijail-sys/lib.rs @@ -18,15 +18,15 @@ // // Generated in CrOS SDK chroot with: // bindgen --default-enum-style rust \ -// --blacklist-type '__rlim64_t' \ +// --blocklist-type '__rlim64_t' \ // --raw-line 'pub type __rlim64_t = u64;' \ -// --blacklist-type '__u\d{1,2}' \ +// --blocklist-type '__u\d{1,2}' \ // --raw-line 'pub type __u8 = u8;' \ // --raw-line 'pub type __u16 = u16;' \ // --raw-line 'pub type __u32 = u32;' \ -// --blacklist-type '__uint64_t' \ -// --whitelist-function '^minijail_.*' \ -// --whitelist-var '^MINIJAIL_.*' \ +// --blocklist-type '__uint64_t' \ +// --allowlist-function '^minijail_.*' \ +// --allowlist-var '^MINIJAIL_.*' \ // --no-layout-tests \ // --output libminijail.rs \ // libminijail.h -- \ |