generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the tzdata update tools.

Browse Source 
The recent libcore ZoneInfo changes mean that we can no longer
compile libcore's ZoneInfo against the RI. Luckily, the field in
our data file that we needed ZoneInfo for isn't actually used.
This change removes our dependence on libcore.

I've left the field in to avoid a file format change. We can remove
the field if/when we next have a real need to bump the file format.

(cherry-pick of 90cb5ffb85a9bc2e725824b3ca8db932d02c45db.)

Bug: 16168653
Change-Id: Iedad2252c2b49f4d8bb2c7d9078b39b622444ca7
This commit is contained in:
Elliott Hughes
2014-08-06 15:23:11 -07:00
parent 3a238ae762
commit 13bab43337
3 changed files with 19 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libc/tzcode/localtime.c
View File

@@ -2210,7 +2210,7 @@ static int __bionic_open_tzdata_path(const char* path_prefix_variable, const cha
char buf[NAME_LENGTH];
int32_t start;
int32_t length;
int32_t raw_gmt_offset;
int32_t unused; // Was raw GMT offset; always 0 since tzdata2014f (L).
};
size_t id_count = (ntohl(header.data_offset) - ntohl(header.index_offset)) / sizeof(struct index_entry_t);