Add new tzdata path for Android

https://android.googlesource.com/platform/bionic/+blame/refs/heads/main/libc/tzcode/bionic.cpp#248
google · Nov 8, 2023 · 88c898a · 88c898a
1 parent b6d7a85
commit 88c898a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/time_zone_info.cc b/src/time_zone_info.cc
@@ -470,7 +470,8 @@ std::unique_ptr<ZoneInfoSource> AndroidZoneInfoSource::Open(
   const std::size_t pos = (name.compare(0, 5, "file:") == 0) ? 5 : 0;
 
   // See Android's libc/tzcode/bionic.cpp for additional information.
-  for (const char* tzdata : {"/data/misc/zoneinfo/current/tzdata",
+  for (const char* tzdata : {"/apex/com.android.tzdata/etc/tz/tzdata",
+                             "/data/misc/zoneinfo/current/tzdata",
                              "/system/usr/share/zoneinfo/tzdata"}) {
     auto fp = FOpen(tzdata, "rb");
     if (fp == nullptr) continue;