tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Update the "host" bionic code tzdata lookup logic"

Browse source
This commit is contained in:
Neil Fuller 2019-01-08 10:06:54 +00:00 committed by Gerrit Code Review
commit 5d89fbd207
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libc/tzcode/bionic.cpp
View file

@ -228,13 +228,18 @@ int __bionic_open_tzdata(const char* olson_id, int32_t* entry_length) {
if (fd >= 0) return fd;
#else
// On the host, we don't expect those locations to exist, and we're not
// worried about security so we trust $ANDROID_DATA and $ANDROID_ROOT to
// point us in the right direction.
// worried about security so we trust $ANDROID_DATA, $ANDROID_RUNTIME_ROOT
// and $ANDROID_ROOT to point us in the right direction.
char* path = make_path("ANDROID_DATA", "/misc/zoneinfo/current/tzdata");
fd = __bionic_open_tzdata_path(path, olson_id, entry_length);
free(path);
if (fd >= 0) return fd;
path = make_path("ANDROID_RUNTIME_ROOT", "/etc/tz/tzdata");
fd = __bionic_open_tzdata_path(path, olson_id, entry_length);
free(path);
if (fd >= 0) return fd;
path = make_path("ANDROID_ROOT", "/usr/share/zoneinfo/tzdata");
fd = __bionic_open_tzdata_path(path, olson_id, entry_length);
free(path);