From 2acd9f2b463eee05c354901a9fd5235fe06c017b Mon Sep 17 00:00:00 2001 From: Bradley White <14679271+devbww@users.noreply.github.com> Date: Wed, 8 Nov 2023 10:25:03 -0500 Subject: [PATCH] Add new tzdata path for Android (#279) https://android.googlesource.com/platform/bionic/+blame/refs/heads/main/libc/tzcode/bionic.cpp#248 --- src/time_zone_info.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/time_zone_info.cc b/src/time_zone_info.cc index a7396a8..eae7861 100644 --- a/src/time_zone_info.cc +++ b/src/time_zone_info.cc @@ -470,7 +470,8 @@ std::unique_ptr 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;