Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 05:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Restore Android to using /sdcard/servo for data, cache, and config paths

Browse source
This commit is contained in:
Lars Bergstrom 2016-06-09 12:54:15 -05:00
parent 988cdf98eb
commit a8ca2c86f0
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/util/basedir.rs
View file

@ -9,30 +9,45 @@
#[cfg(any(target_os = "macos", target_os = "windows"))] #[cfg(any(target_os = "macos", target_os = "windows"))]
use std::env; use std::env;
use std::path::PathBuf; 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; 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<PathBuf> { pub fn default_config_dir() -> Option<PathBuf> {
let xdg_dirs = xdg::BaseDirectories::with_profile("servo", "default").unwrap(); let xdg_dirs = xdg::BaseDirectories::with_profile("servo", "default").unwrap();
let config_dir = xdg_dirs.get_config_home(); let config_dir = xdg_dirs.get_config_home();
Some(config_dir) Some(config_dir)
} }
#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios")))] #[cfg(target_os = "android")]
pub fn default_config_dir() -> Option<PathBuf> {
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<PathBuf> { pub fn default_data_dir() -> Option<PathBuf> {
let xdg_dirs = xdg::BaseDirectories::with_profile("servo", "default").unwrap(); let xdg_dirs = xdg::BaseDirectories::with_profile("servo", "default").unwrap();
let data_dir = xdg_dirs.get_data_home(); let data_dir = xdg_dirs.get_data_home();
Some(data_dir) Some(data_dir)
} }
#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios")))] #[cfg(target_os = "android")]
pub fn default_data_dir() -> Option<PathBuf> {
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<PathBuf> { pub fn default_cache_dir() -> Option<PathBuf> {
let xdg_dirs = xdg::BaseDirectories::with_profile("servo", "default").unwrap(); let xdg_dirs = xdg::BaseDirectories::with_profile("servo", "default").unwrap();
let cache_dir = xdg_dirs.get_cache_home(); let cache_dir = xdg_dirs.get_cache_home();
Some(cache_dir) Some(cache_dir)
} }
#[cfg(target_os = "android")]
pub fn default_cache_dir() -> Option<PathBuf> {
Some(PathBuf::from("/sdcard/servo"))
}
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
pub fn default_config_dir() -> Option<PathBuf> { pub fn default_config_dir() -> Option<PathBuf> {
let mut config_dir = env::home_dir().unwrap(); let mut config_dir = env::home_dir().unwrap();

2
components/util/lib.rs
View file

@ -37,7 +37,7 @@ extern crate rustc_serialize;
extern crate serde; extern crate serde;
extern crate smallvec; extern crate smallvec;
extern crate url; 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; extern crate xdg;
use std::sync::Arc; use std::sync::Arc;