mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
do not force resource_path on android
This commit is contained in:
parent
65d9b345bb
commit
aaab56c627
1 changed files with 10 additions and 2 deletions
|
@ -27,10 +27,18 @@ pub fn set_resources_path(path: Option<String>) {
|
|||
#[cfg(target_os = "android")]
|
||||
#[allow(unsafe_code)]
|
||||
pub fn resources_dir_path() -> io::Result<PathBuf> {
|
||||
let dir = unsafe {
|
||||
let mut dir = CMD_RESOURCE_DIR.lock().unwrap();
|
||||
|
||||
if let Some(ref path) = *dir {
|
||||
return Ok(PathBuf::from(path));
|
||||
}
|
||||
|
||||
let data_path = unsafe {
|
||||
CStr::from_ptr((*android_injected_glue::get_app().activity).externalDataPath)
|
||||
};
|
||||
Ok(PathBuf::from(dir.to_str().unwrap()))
|
||||
let path = PathBuf::from(data_path.to_str().unwrap());
|
||||
*dir = Some(path.to_str().unwrap().to_owned());
|
||||
Ok(path)
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "android"))]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue