Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.
Bug: 8391426
Change-Id: Ia4a8889b5a613aa96bb3fb5d89a921c913ff7626
diff --git a/libc/tools/zoneinfo/ZoneCompactor.java b/libc/tools/zoneinfo/ZoneCompactor.java
index 8a1a628..f47afd1 100644
--- a/libc/tools/zoneinfo/ZoneCompactor.java
+++ b/libc/tools/zoneinfo/ZoneCompactor.java
@@ -198,6 +198,8 @@
// Write the data.
f.write(allData.toByteArray());
+ int zonetab_offset = (int) f.getFilePointer();
+
// Copy the zone.tab.
reader = new BufferedReader(new FileReader(zoneTabFile));
while ((s = reader.readLine()) != null) {
@@ -208,8 +210,6 @@
}
reader.close();
- int zonetab_offset = (int) f.getFilePointer();
-
// Go back and fix up the offsets in the header.
f.seek(index_offset_offset);
f.writeInt(index_offset);
diff --git a/libc/zoneinfo/tzdata b/libc/zoneinfo/tzdata
index 91cf3a6..4cd1450 100644
--- a/libc/zoneinfo/tzdata
+++ b/libc/zoneinfo/tzdata
Binary files differ
