From 50d4714d859e6bc0bfecf8bdccb5c43fc917b9a2 Mon Sep 17 00:00:00 2001 From: adridu59 Date: Sun, 1 Sep 2013 13:31:05 +0200 Subject: [PATCH] libstd/os: set tmp dir to /data/tmp on Android Android has no /tmp partition, return /data/tmp instead. Cf. #8511. --- src/libstd/os.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libstd/os.rs b/src/libstd/os.rs index 91408162788..0d77748b203 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -584,6 +584,8 @@ pub fn homedir() -> Option { * * On Unix, returns the value of the 'TMPDIR' environment variable if it is * set and non-empty and '/tmp' otherwise. + * On Android, there is no global temporary folder (it is usually allocated + * per-app), hence returns '/data/tmp' which is commonly used. * * On Windows, returns the value of, in order, the 'TMP', 'TEMP', * 'USERPROFILE' environment variable if any are set and not the empty @@ -606,7 +608,11 @@ pub fn tmpdir() -> Path { #[cfg(unix)] fn lookup() -> Path { - getenv_nonempty("TMPDIR").unwrap_or_default(Path("/tmp")) + if cfg!(target_os = "android") { + Path("/data/tmp") + } else { + getenv_nonempty("TMPDIR").unwrap_or_default(Path("/tmp")) + } } #[cfg(windows)]