Revert "timezone: data file should be 32 bit aligned"
This reverts commit 13781e7f23f3441c4b8cdffd604c30eb06addcfa.
diff --git a/libc/tools/zoneinfo/ZoneCompactor.java b/libc/tools/zoneinfo/ZoneCompactor.java
index cc77c94..b657748 100644
--- a/libc/tools/zoneinfo/ZoneCompactor.java
+++ b/libc/tools/zoneinfo/ZoneCompactor.java
@@ -55,13 +55,11 @@
InputStream in = new FileInputStream(inFile);
byte[] buf = new byte[8192];
- int length = 0;
while (true) {
int nbytes = in.read(buf);
if (nbytes == -1) {
break;
}
- length += nbytes;
out.write(buf, 0, nbytes);
byte[] nret = new byte[ret.length + nbytes];
@@ -69,8 +67,6 @@
System.arraycopy(buf, 0, nret, ret.length, nbytes);
ret = nret;
}
- if (length%4 != 0)
- out.write(new byte[] {00,00,00,00}, 0, 4 - length % 4);
out.flush();
return ret;
}
@@ -109,9 +105,6 @@
lengths.put(s, new Integer((int)length));
start += length;
- if (start % 4 != 0)
- start += 4 - start % 4;
-
byte[] data = copyFile(f, zoneInfo);
TimeZone tz = ZoneInfo.make(s, data);
diff --git a/libc/tools/zoneinfo/generate b/libc/tools/zoneinfo/generate
index 3c6149a..e48a3c9 100755
--- a/libc/tools/zoneinfo/generate
+++ b/libc/tools/zoneinfo/generate
@@ -72,7 +72,7 @@
javac -d . \
$bionic_zoneinfo_tools_dir/ZoneCompactor.java \
$bionic_zoneinfo_tools_dir/ZoneInfo.java
-java -classpath . ZoneCompactor setup data
+java ZoneCompactor setup data
echo "Updating bionic to $latest_version..."
mv zoneinfo.dat zoneinfo.idx $bionic_zoneinfo_dir
diff --git a/libc/zoneinfo/zoneinfo.dat b/libc/zoneinfo/zoneinfo.dat
index 722625e..e41422e 100644
--- a/libc/zoneinfo/zoneinfo.dat
+++ b/libc/zoneinfo/zoneinfo.dat
Binary files differ
diff --git a/libc/zoneinfo/zoneinfo.idx b/libc/zoneinfo/zoneinfo.idx
index e12db19..eb02e80 100644
--- a/libc/zoneinfo/zoneinfo.idx
+++ b/libc/zoneinfo/zoneinfo.idx
Binary files differ
diff --git a/libc/zoneinfo/zoneinfo.version b/libc/zoneinfo/zoneinfo.version
index c4f4922..6140b76 100644
--- a/libc/zoneinfo/zoneinfo.version
+++ b/libc/zoneinfo/zoneinfo.version
@@ -1 +1 @@
-2011n
+2011l