commit 2393535f0d7df55dae3b4fbf5dbcfa7f87192762
author Elliott Hughes <enh@google.com> Mon Oct 22 14:47:58 2012 -0700
committer Elliott Hughes <enh@google.com> Mon Oct 22 14:47:58 2012 -0700
tree 2785a19d597c8c24449de0b225aae3737982bc03
parent eb370aa31dd549ad7a7a2044dedab1140a7aeda9

Support zone.tab in bionic, and remove the file format version.

Bug: 7012465
Change-Id: I6335c91ebadc609fae85bad94db972be7574b6e4

libc/tools/zoneinfo/generate

diff --git a/libc/tools/zoneinfo/generate b/libc/tools/zoneinfo/generate
index e9ff59b..27d023f 100755
--- a/libc/tools/zoneinfo/generate
+++ b/libc/tools/zoneinfo/generate
@@ -89,7 +89,8 @@
                          '%s/libcore/util/ZoneInfo.java' % libcore_src_dir,
                          '%s/libcore/io/BufferIterator.java' % libcore_src_dir])
   subprocess.check_call(['java', 'ZoneCompactor',
-                         'setup', 'data', bionic_libc_zoneinfo_dir, new_version])
+                         'setup', 'data', 'extracted/zone.tab',
+                         bionic_libc_zoneinfo_dir, new_version])
 
 
 # Run with no arguments from any directory, with no special setup required.