Snap for 6686656 from f95f8cb58674dea82dc74f877689c52bd5c1f90e to sdk-release
Change-Id: Id8d534cb0f08c1de0200d1912180cde78f38380f
diff --git a/rust/minijail/Cargo.toml b/rust/minijail/Cargo.toml
index 4793f44..83157e4 100644
--- a/rust/minijail/Cargo.toml
+++ b/rust/minijail/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "minijail"
-version = "0.1.0"
+version = "0.2.0"
description = "Provides a safe Rust friendly interface to libminijail."
authors = ["The Chromium OS Authors"]
edition = "2018"
diff --git a/rust/minijail/src/lib.rs b/rust/minijail/src/lib.rs
index 958d841..66001ea 100644
--- a/rust/minijail/src/lib.rs
+++ b/rust/minijail/src/lib.rs
@@ -247,12 +247,10 @@
minijail_keep_supplementary_gids(self.jail);
}
}
- pub fn set_rlimit(
- &mut self,
- kind: libc::c_int,
- cur: libc::rlim64_t,
- max: libc::rlim64_t,
- ) -> Result<()> {
+ // rlim_t is defined in minijail-sys to be u64 on all platforms, to avoid
+ // issues on 32-bit platforms. It's also useful to us here to avoid
+ // libc::rlim64_t, which is not defined at all on Android.
+ pub fn set_rlimit(&mut self, kind: libc::c_int, cur: rlim_t, max: rlim_t) -> Result<()> {
let errno = unsafe { minijail_rlimit(self.jail, kind, cur, max) };
if errno == 0 {
Ok(())
