diff --git a/components/util/basedir.rs b/components/util/basedir.rs index 733bcd69507f..5c7896a388b7 100644 --- a/components/util/basedir.rs +++ b/components/util/basedir.rs @@ -9,30 +9,45 @@ #[cfg(any(target_os = "macos", target_os = "windows"))] use std::env; use std::path::PathBuf; -#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios")))] +#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), not(target_os = "android")))] use xdg; -#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios")))] +#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), not(target_os = "android")))] pub fn default_config_dir() -> Option { let xdg_dirs = xdg::BaseDirectories::with_profile("servo", "default").unwrap(); let config_dir = xdg_dirs.get_config_home(); Some(config_dir) } -#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios")))] +#[cfg(target_os = "android")] +pub fn default_config_dir() -> Option { + Some(PathBuf::from("/sdcard/servo")) +} + +#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), not(target_os = "android")))] pub fn default_data_dir() -> Option { let xdg_dirs = xdg::BaseDirectories::with_profile("servo", "default").unwrap(); let data_dir = xdg_dirs.get_data_home(); Some(data_dir) } -#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios")))] +#[cfg(target_os = "android")] +pub fn default_data_dir() -> Option { + Some(PathBuf::from("/sdcard/servo")) +} + +#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), not(target_os = "android")))] pub fn default_cache_dir() -> Option { let xdg_dirs = xdg::BaseDirectories::with_profile("servo", "default").unwrap(); let cache_dir = xdg_dirs.get_cache_home(); Some(cache_dir) } +#[cfg(target_os = "android")] +pub fn default_cache_dir() -> Option { + Some(PathBuf::from("/sdcard/servo")) +} + #[cfg(target_os = "macos")] pub fn default_config_dir() -> Option { let mut config_dir = env::home_dir().unwrap(); diff --git a/components/util/lib.rs b/components/util/lib.rs index 251103738eca..6417fe40a45b 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -37,7 +37,7 @@ extern crate rustc_serialize; extern crate serde; extern crate smallvec; extern crate url; -#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios")))] +#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), not(target_os = "android")))] extern crate xdg; use std::sync::Arc;