Skip to content

Commit 881f9ab

Browse files
caruschalalamovedjc
authored andcommitted
tz_data: fix tzdata locations on Android
1 parent f14ead4 commit 881f9ab

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

src/offset/local/tz_data.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,14 @@ pub(crate) fn for_zone(tz_string: &str) -> Result<Option<Vec<u8>>> {
2525
/// Open the `tzdata` file of Android from the environment variables.
2626
#[cfg(target_os = "android")]
2727
fn open_android_tz_data_file() -> Result<File> {
28-
for (env_var, path) in
29-
[("ANDROID_DATA", "/misc/zoneinfo"), ("ANDROID_ROOT", "/usr/share/zoneinfo")]
30-
{
28+
for (env_var, path) in [
29+
// Default root path: /apex/com.android.tzdata
30+
("ANDROID_TZDATA_ROOT", "/etc/tz"),
31+
// Default root path: /data
32+
("ANDROID_DATA", "/misc/zoneinfo/current"),
33+
// Default root path: /system
34+
("ANDROID_ROOT", "/usr/share/zoneinfo"),
35+
] {
3136
if let Ok(env_value) = std::env::var(env_var) {
3237
if let Ok(file) = File::open(format!("{}{}/tzdata", env_value, path)) {
3338
return Ok(file);

0 commit comments

Comments
 (0)