commit eb06129c5c569897a897f9ec9ee300560ec3b436
author Elliott Hughes <enh@google.com> Fri Oct 19 12:05:24 2012 -0700
committer Elliott Hughes <enh@google.com> Fri Oct 19 12:05:24 2012 -0700
tree 2d432c6f67c216a88201b8d7f8997b7e44b6455a
parent 102250719f8aff443741e54ba5633c7722544620

Switch bionic over to using libcore's copy of libcore.util.ZoneInfo.

Bug: 7012465
Change-Id: I1225494c5d77a20fd48be1e904d8695ef95860e3

libc/tools/zoneinfo/generate

diff --git a/libc/tools/zoneinfo/generate b/libc/tools/zoneinfo/generate
index ab2617f..fd4e6d0 100755
--- a/libc/tools/zoneinfo/generate
+++ b/libc/tools/zoneinfo/generate
@@ -89,9 +89,11 @@
   setup.close()
 
   print 'Calling ZoneCompactor...'
+  libcore_src_dir = '%s/../libcore/luni/src/main/java/' % bionic_dir
   subprocess.check_call(['javac', '-d', '.',
                          '%s/ZoneCompactor.java' % bionic_libc_tools_zoneinfo_dir,
-                         '%s/ZoneInfo.java' % bionic_libc_tools_zoneinfo_dir])
+                         '%s/libcore/util/ZoneInfo.java' % libcore_src_dir,
+                         '%s/libcore/io/BufferIterator.java' % libcore_src_dir])
   subprocess.check_call(['java', 'ZoneCompactor', 'setup', 'data'])
 
   print 'Updating bionic from %s to %s...' % (current_tzdata_version(), version)