DO NOT MERGE - Skip pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: Ic82173b13a4a476df28210c388af0ad1d4fc9545
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..ac2cb6d
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,4 @@
+# Default code reviewers picked from top 3 or more developers.
+# Please update this list if you find better candidates.
+nfuller@google.com
+vichang@google.com
diff --git a/apex/Android.bp b/apex/Android.bp
index 8bcb734..f1459a1 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -12,16 +12,25 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-apex {
- name: "com.android.tzdata",
- manifest: "manifest.json",
- prebuilts: [
- "apex_tz_version",
- "apex_tzlookup.xml",
- "apex_tzdata",
- "apex_icu_tzdata.dat",
- ],
+// Defaults shared between real and test versions of the APEX.
+apex_defaults {
+ name: "com.android.tzdata-defaults",
+
+ // Use a custom AndroidManifest.xml used for API targeting.
+ androidManifest: ":com.android.tzdata-androidManifest",
+
+ // Explicit because the defaulting behavior only works for the real
+ // module.
+ file_contexts: "com.android.tzdata",
+
+ // Shared signing information.
key: "apex.tzdata.key",
+ certificate: ":com.android.tzdata.certificate",
+}
+
+filegroup {
+ name: "com.android.tzdata-androidManifest",
+ srcs: ["AndroidManifest.xml"],
}
apex_key {
@@ -30,3 +39,20 @@
private_key: "com.android.tzdata.pem",
}
+android_app_certificate {
+ name: "com.android.tzdata.certificate",
+ certificate: "com.android.tzdata",
+}
+
+// The definition for the real (not test) tzdata APEX.
+apex {
+ name: "com.android.tzdata",
+ defaults: ["com.android.tzdata-defaults"],
+ manifest: "manifest.json",
+ prebuilts: [
+ "apex_tz_version",
+ "apex_tzlookup.xml",
+ "apex_tzdata",
+ "apex_icu_tzdata.dat",
+ ],
+}
diff --git a/apex/AndroidManifest.xml b/apex/AndroidManifest.xml
new file mode 100644
index 0000000..980d723
--- /dev/null
+++ b/apex/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.tzdata">
+ <!-- APEX does not have classes.dex -->
+ <application android:hasCode="false" />
+ <!--
+ * The content of the time zone data module is tied to (among other things)
+ * the version of ICU being used on the device. Since that typically
+ * updates every dessert release, we lock the module to a single API level.
+ -->
+ <uses-sdk android:minSdkVersion="28" android:maxSdkVersion="28" />
+</manifest>
diff --git a/apex/com.android.tzdata.pk8 b/apex/com.android.tzdata.pk8
new file mode 100644
index 0000000..f786710
--- /dev/null
+++ b/apex/com.android.tzdata.pk8
Binary files differ
diff --git a/apex/com.android.tzdata.x509.pem b/apex/com.android.tzdata.x509.pem
new file mode 100644
index 0000000..bf78bee
--- /dev/null
+++ b/apex/com.android.tzdata.x509.pem
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIIFzjCCA7agAwIBAgIJAIyjs8l5WRp5MA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBW
+aWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRyb2lkMRswGQYDVQQD
+DBJjb20uYW5kcm9pZC50emRhdGEwIBcNMTkwMTI1MTY0ODE0WhgPNDc1NjEyMjEx
+NjQ4MTRaMHsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYD
+VQQHDA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdB
+bmRyb2lkMRswGQYDVQQDDBJjb20uYW5kcm9pZC50emRhdGEwggIiMA0GCSqGSIb3
+DQEBAQUAA4ICDwAwggIKAoICAQC3PzY5waM71QpWUVQPfTrtCf9Mx9097DjM6RlD
+jaOd2FtN7gUN/d+z19h0WRkBcBMDWH3z4aHIDp4YXABIdqIzXehhdCFLro4W6H4I
+TNcbH6/M4rmtGs2v0zCkrr8z/mEasCdsw9iz8LOiyouGxgt0Q2qPSQ3OcbZSGX0C
+T8VNxDIP1RpQdRUKhZt/hsmcuPHGq64yil/i7FHX4dLgjnik4sUkHPsQTam/H/J/
+brl9OToTCyRuTgaq6EfxCZVXPfxQE6KTDchFr4wYSbxIgSN9zk2wPLXCsyvSb2lV
+fDSbkRmS89cCaCArF3SP3FAKoZdxdNtT1Q/KayMs7c/jrhFloiIpkstNCzMrPT9i
+j5QwRqcBscSijqaEJOyK458EhaO7m3GHc9e+1afsxTIn//vbrpJU7ewOiwcAsJAT
+KGFMotbK1fV4jGCzKxDVBd1OP5yN/iPYS8INH4tt1W1Q5jaQn/Uy+RuS1tPZTtrL
+ldj/QJ/K9XNSg4v12hXlLDwUlwEMu2Akbe6BYItfhdAEITRr332l6e466cQDp3V2
+mOWANPEX35s5/CaxeqJOi3Y+DSx4iwjOKiormnnEalRFAZrSDU2UNxIqrmidl03Y
+/0p13ugbPmJbpXFPZFDPsUuvPuGLSAU2luUuFSgT0FVyWj5BfzFmcuLxQom03+ds
+cX8GxQIDAQABo1MwUTAdBgNVHQ4EFgQUVCZf+AGkP1wMi7C0l6FFefk9kVAwHwYD
+VR0jBBgwFoAUVCZf+AGkP1wMi7C0l6FFefk9kVAwDwYDVR0TAQH/BAUwAwEB/zAN
+BgkqhkiG9w0BAQsFAAOCAgEAc0NA+Ya/L5Vs+8CZ/5rP6dIbzbgL7tm1nmjU65jY
+8znsSrB0JDTEHCLc+9u35YU77Z3sW9lFE9el1i693gYQnYSy1lducHHKzbnss2/f
++DJ4QExrPR+PfnkSxdjL8+MXVAtVZDCeEBTcUgLES6m4WLS9hKL4+Oe+igXkAJA+
+d8w1/5ASuood3cTNy3nxssdueAKl4Tyj0y0zejoVlznaYw4zMTmlnrz1l0ZbaKiM
+tr52U2kASEVQW6EhiielsLMzDngqAQ49FQriv7oUhrlbmP3+CkhhPWbM3keSHm/a
+vIQGD3+mbJpekuRgC5w1nCborCxpnHoZUXMyb6/3PnY9u4O8VT5rY5NipVfL/Cvu
+12w0kvcuXTP58gvOJANB5t8Jo4tctG99hO0ECr7/439YM4NMkL5nYEcJe3DemquB
+pB7xVBAD7WKEcB5KV/oDXoLjxMlassKSAvBVbx+fvbGIW6k1pe3uiHl8p/zvxoNb
+9FFRoElCyuzzVP5r/kN5uNbPVIexbVET4elOcUhKigHWZHYv/PQ9ncpA8tbDeAIr
+vzoofKWv4r4tyQZLR4YnEYTGBORO6rX//Mcg8zKE6vXb0zKLW5vW1zxv31q1p2lC
+0R5e4ix7UjR8OJcBCnyKuqSRdCIpMitam2V+BXwh/7mLZBA4LuV4koNofVaBFxlt
+BCo=
+-----END CERTIFICATE-----
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index b6139e0..ca74897 100644
--- a/input_data/android/countryzones.txt
+++ b/input_data/android/countryzones.txt
@@ -25,7 +25,7 @@
# a time zone for an Android device.
# ianaVersion: The version of the IANA rules this file matches.
-ianaVersion:"2018g"
+ianaVersion:"2018i"
# countries:
#
@@ -1202,7 +1202,7 @@
countries:<
isoCode:"eh"
timeZoneMappings:<
- utcOffset:"1:00"
+ utcOffset:"0:00"
id:"Africa/El_Aaiun"
>
>
@@ -1799,7 +1799,7 @@
# KAZAKHSTAN
#
-# Priorities assigned on 20180309 using:
+# Priorities assigned on 20190107 using:
# https://en.wikipedia.org/wiki/List_of_cities_in_Kazakhstan
# Priority is just an abstract score.
countries:<
@@ -1812,8 +1812,7 @@
>
timeZoneMappings:<
utcOffset:"6:00"
- id:"Asia/Qyzylorda"
- priority:1
+ id:"Asia/Qostanay"
>
timeZoneMappings:<
@@ -1827,6 +1826,11 @@
>
timeZoneMappings:<
utcOffset:"5:00"
+ id:"Asia/Qyzylorda"
+ priority:1
+ >
+ timeZoneMappings:<
+ utcOffset:"5:00"
id:"Asia/Aqtobe"
priority:1
>
@@ -1940,7 +1944,7 @@
countries:<
isoCode:"ma"
timeZoneMappings:<
- utcOffset:"1:00"
+ utcOffset:"0:00"
id:"Africa/Casablanca"
>
>
@@ -2919,7 +2923,7 @@
countries:<
isoCode:"st"
timeZoneMappings:<
- utcOffset:"1:00"
+ utcOffset:"0:00"
id:"Africa/Sao_Tome"
>
>
diff --git a/input_data/iana/tzdata2018g.tar.gz b/input_data/iana/tzdata2018g.tar.gz
deleted file mode 100644
index f366e3e..0000000
--- a/input_data/iana/tzdata2018g.tar.gz
+++ /dev/null
Binary files differ
diff --git a/input_data/iana/tzdata2018g.tar.gz.asc b/input_data/iana/tzdata2018g.tar.gz.asc
deleted file mode 100644
index 33e97df..0000000
--- a/input_data/iana/tzdata2018g.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAlvT+vsACgkQ7ZfpDmKq
-fjSOeQ/+KHzhT6GWZeqOAKj/AjyKK9KnL4gPh4MhsiI+V3z3/y+4ECvvee7ixbHI
-NQ33B4gRBzlbWWYnHw4Yq6Fm9RihnHOVj8XT/BM56YFESdfTQxOHsqsY+n3byGND
-Q+luSH0YC/S4mLxqS/vxHyT+nU2D4sS6UCmMIzW62fixJX5S2HAC3s7WoQkRXRDg
-ItaQvU42r9qs67C4M8q2+A9H7anUIhIE5KqZcPKmF7AMAdGnY4ZWpKb/uyxwzi58
-pctIhzSGkB8im2m8QgDTrYsflOgADw3j/dKuYnyu4J0aniWC3qp7nJFPr5uTDaW7
-TsWtaZCaUhytlsg+E0zebTURV2ziVNf52X58U9K3kUnnZqOxxZUeQWACmdjCc0kO
-yg9P1idYz1XTC4c0oik/YTt5OMkpkyFNqTaueSSQ3dpD0vc63GbGrDbMSPfa6bOx
-EOHvR/IqcNKCewfnv7a8h7y+5JX52gijL5hZjkpAU/XBCMdA3Pd/vZ5n3UaSbnC1
-MNmZgsnJjBKVgaK8KHTuhCGigtDFc6TQethUQlKKWLr41P5RWrdmrhmMZIP0VBt5
-4X0Kf7mKK2X/lsI33FCpzUbtnV093L1bLe6Vt74r01JBWUxeEy2BHdn+KM/CqHkH
-LTj0FmVFUWzvG7kqzrRgjJ5CnLUSnf/T1Gl6PgeKzMePChptyQE=
-=kUHt
------END PGP SIGNATURE-----
diff --git a/input_data/iana/tzdata2018i.tar.gz b/input_data/iana/tzdata2018i.tar.gz
new file mode 100644
index 0000000..be28d0c
--- /dev/null
+++ b/input_data/iana/tzdata2018i.tar.gz
Binary files differ
diff --git a/input_data/iana/tzdata2018i.tar.gz.asc b/input_data/iana/tzdata2018i.tar.gz.asc
new file mode 100644
index 0000000..1fd503f
--- /dev/null
+++ b/input_data/iana/tzdata2018i.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIyBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAlwpGB8ACgkQ7ZfpDmKq
+fjTMog/3YJT5eFuwlijuTDxlt+VMTaAEaDaSUfzmQhaTDuHPKVDXxCaWq+tcO4J8
+gzzecRj40Xc/jZId7MREq2S3uyUu7D6tJR7kRMw8BeTYVkhf+wX4Xmfh+6bVB9bO
+34GNTSK9BXoieio68AkaCziVhBy6KynKhzUS4d1sqEDUxhS7r3ir6jTiU4UGAf54
+PKWh2YKYITuYww4XnseG9rQsKbVKK4GUm/e7OmV3zf5pI9lhf/TQh1XZXKFbKK70
+gDmFPUDAyuiFBCxkA7YsGolAnkscVmuF301brsNg+VKPy1qgMbxY/vF0lo/f7xRw
+dzi8+ek6/pKCIUmVRWCsg68wUDh1j3pAh9MLT8zhMtxOc42Kh+4b1BNq0x45zVbQ
+693ufcf056654Y27bCexy1JbGBNEd6UUGUv/Ou9EGrl6nfrfMSmUneqmBEnl8NY+
+6/cge/JOr+rVbmEku+nuC9kLZx63lSy4BXJ8+vv4DgzE6/3906V30+w/oJUGaImx
+PjE9tjm6biIWdRi6bZRdFcg0mktBEyzJuAuurX0ZRgcaNkrhNd4zw2Q3yuKDcD67
+aM5wUA4JVLX5v6P+s5j5Y+B+OY4sVk8fFzev8BJX+wRulqEmchVertypir17PUSr
+oqRUAww6oaYwenZNE+6dN0OWtpLDdBUv7+pesiYcaJRrXDCLAA==
+=ttI4
+-----END PGP SIGNATURE-----
diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index 7e0fc27..3a553fb 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml
@@ -2,7 +2,7 @@
**** Autogenerated file - DO NOT EDIT ****
---><timezones ianaversion="2018g">
+--><timezones ianaversion="2018i">
<countryzones>
<country code="ad" default="Europe/Andorra" everutc="n">
<id>Europe/Andorra</id>
@@ -465,10 +465,11 @@
</country>
<country code="kz" default="Asia/Almaty" everutc="n">
<id>Asia/Almaty</id>
- <id notafter="1099170000000">Asia/Qyzylorda</id>
+ <id notafter="1099170000000">Asia/Qostanay</id>
<id notafter="1099173600000">Asia/Aqtau</id>
<id>Asia/Oral</id>
- <id>Asia/Aqtobe</id>
+ <id notafter="1545328800000">Asia/Qyzylorda</id>
+ <id notafter="1545328800000">Asia/Aqtobe</id>
<id notafter="922572000000">Asia/Atyrau</id>
</country>
<country code="la" default="Asia/Vientiane" everutc="n">
@@ -524,7 +525,7 @@
</country>
<country code="mh" default="Pacific/Majuro" everutc="n">
<id>Pacific/Majuro</id>
- <id notafter="745848000000">Pacific/Kwajalein</id>
+ <id notafter="745934400000">Pacific/Kwajalein</id>
</country>
<country code="mk" default="Europe/Skopje" everutc="n">
<id>Europe/Skopje</id>
@@ -868,7 +869,7 @@
<id notafter="436359600000">America/Juneau</id>
<id notafter="436356000000">America/Yakutat</id>
<id notafter="436363200000">America/Nome</id>
- <id notafter="1446372000000">America/Metlakatla</id>
+ <id notafter="1552215600000">America/Metlakatla</id>
<id notafter="341402400000">America/Sitka</id>
<id>Pacific/Honolulu</id>
<id>America/Adak</id>
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip
index 4053789..399e86f 100644
--- a/output_data/distro/distro.zip
+++ b/output_data/distro/distro.zip
Binary files differ
diff --git a/output_data/iana/tzdata b/output_data/iana/tzdata
index ebe66d2..6c55cd8 100644
--- a/output_data/iana/tzdata
+++ b/output_data/iana/tzdata
Binary files differ
diff --git a/output_data/icu_overlay/icu_tzdata.dat b/output_data/icu_overlay/icu_tzdata.dat
index 95fedee..d63dd36 100644
--- a/output_data/icu_overlay/icu_tzdata.dat
+++ b/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/output_data/version/tz_version b/output_data/version/tz_version
index 84dd2be..099c584 100644
--- a/output_data/version/tz_version
+++ b/output_data/version/tz_version
@@ -1 +1 @@
-003.001|2018g|001
\ No newline at end of file
+003.001|2018i|001
\ No newline at end of file
diff --git a/testing/data/test1/apex/Android.bp b/testing/data/test1/apex/Android.bp
index d7b58fd..c405f63 100644
--- a/testing/data/test1/apex/Android.bp
+++ b/testing/data/test1/apex/Android.bp
@@ -18,15 +18,14 @@
// data.
apex {
name: "test1_com.android.tzdata",
+ defaults: ["com.android.tzdata-defaults"],
manifest: "manifest.json",
- file_contexts: "com.android.tzdata",
prebuilts: [
"apex_tz_version_test1",
"apex_tzlookup.xml_test1",
"apex_tzdata_test1",
"apex_icu_tzdata.dat_test1",
],
- key: "apex.tzdata.key",
// installable: false as we do not want test APEX versions in the system
// image.
diff --git a/testing/data/test1/output_data/Android.bp b/testing/data/test1/output_data/Android.bp
index af56e60..054a922 100644
--- a/testing/data/test1/output_data/Android.bp
+++ b/testing/data/test1/output_data/Android.bp
@@ -16,6 +16,7 @@
name: "apex_tz_version_test1",
src: "version/tz_version",
filename: "tz_version",
+ sub_dir: "tz",
installable: false,
}
@@ -23,6 +24,7 @@
name: "apex_tzlookup.xml_test1",
src: "android/tzlookup.xml",
filename: "tzlookup.xml",
+ sub_dir: "tz",
installable: false,
}
@@ -31,6 +33,7 @@
src: "iana/tzdata",
notice: "iana/NOTICE",
filename: "tzdata",
+ sub_dir: "tz",
installable: false,
}
diff --git a/testing/data/test1/output_data/android/tzlookup.xml b/testing/data/test1/output_data/android/tzlookup.xml
index a8cdb91..315a6da 100644
--- a/testing/data/test1/output_data/android/tzlookup.xml
+++ b/testing/data/test1/output_data/android/tzlookup.xml
@@ -465,10 +465,11 @@
</country>
<country code="kz" default="Asia/Almaty" everutc="n">
<id>Asia/Almaty</id>
- <id notafter="1099170000000">Asia/Qyzylorda</id>
+ <id notafter="1099170000000">Asia/Qostanay</id>
<id notafter="1099173600000">Asia/Aqtau</id>
<id>Asia/Oral</id>
- <id>Asia/Aqtobe</id>
+ <id notafter="1545328800000">Asia/Qyzylorda</id>
+ <id notafter="1545328800000">Asia/Aqtobe</id>
<id notafter="922572000000">Asia/Atyrau</id>
</country>
<country code="la" default="Asia/Vientiane" everutc="n">
@@ -524,7 +525,7 @@
</country>
<country code="mh" default="Pacific/Majuro" everutc="n">
<id>Pacific/Majuro</id>
- <id notafter="745848000000">Pacific/Kwajalein</id>
+ <id notafter="745934400000">Pacific/Kwajalein</id>
</country>
<country code="mk" default="Europe/Skopje" everutc="n">
<id>Europe/Skopje</id>
@@ -868,7 +869,7 @@
<id notafter="436359600000">America/Juneau</id>
<id notafter="436356000000">America/Yakutat</id>
<id notafter="436363200000">America/Nome</id>
- <id notafter="1446372000000">America/Metlakatla</id>
+ <id notafter="1552215600000">America/Metlakatla</id>
<id notafter="341402400000">America/Sitka</id>
<id>Pacific/Honolulu</id>
<id>America/Adak</id>
diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip
index 253ffa4..28d0412 100644
--- a/testing/data/test1/output_data/distro/distro.zip
+++ b/testing/data/test1/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test1/output_data/iana/tzdata b/testing/data/test1/output_data/iana/tzdata
index 8068828..71de696 100644
--- a/testing/data/test1/output_data/iana/tzdata
+++ b/testing/data/test1/output_data/iana/tzdata
Binary files differ
diff --git a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
index b188710..b20a9e7 100644
--- a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/testing/data/test2/output_data/android/tzlookup.xml b/testing/data/test2/output_data/android/tzlookup.xml
index 569bde8..8b101e2 100644
--- a/testing/data/test2/output_data/android/tzlookup.xml
+++ b/testing/data/test2/output_data/android/tzlookup.xml
@@ -465,10 +465,11 @@
</country>
<country code="kz" default="Asia/Almaty" everutc="n">
<id>Asia/Almaty</id>
- <id notafter="1099170000000">Asia/Qyzylorda</id>
+ <id notafter="1099170000000">Asia/Qostanay</id>
<id notafter="1099173600000">Asia/Aqtau</id>
<id>Asia/Oral</id>
- <id>Asia/Aqtobe</id>
+ <id notafter="1545328800000">Asia/Qyzylorda</id>
+ <id notafter="1545328800000">Asia/Aqtobe</id>
<id notafter="922572000000">Asia/Atyrau</id>
</country>
<country code="la" default="Asia/Vientiane" everutc="n">
@@ -524,7 +525,7 @@
</country>
<country code="mh" default="Pacific/Majuro" everutc="n">
<id>Pacific/Majuro</id>
- <id notafter="745848000000">Pacific/Kwajalein</id>
+ <id notafter="745934400000">Pacific/Kwajalein</id>
</country>
<country code="mk" default="Europe/Skopje" everutc="n">
<id>Europe/Skopje</id>
@@ -868,7 +869,7 @@
<id notafter="436359600000">America/Juneau</id>
<id notafter="436356000000">America/Yakutat</id>
<id notafter="436363200000">America/Nome</id>
- <id notafter="1446372000000">America/Metlakatla</id>
+ <id notafter="1552215600000">America/Metlakatla</id>
<id notafter="341402400000">America/Sitka</id>
<id>Pacific/Honolulu</id>
<id>America/Adak</id>
diff --git a/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip
index 52d068b..2b182e6 100644
--- a/testing/data/test2/output_data/distro/distro.zip
+++ b/testing/data/test2/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test2/output_data/iana/tzdata b/testing/data/test2/output_data/iana/tzdata
index 975dbe7..234ee76 100644
--- a/testing/data/test2/output_data/iana/tzdata
+++ b/testing/data/test2/output_data/iana/tzdata
Binary files differ
diff --git a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
index adaa374..8569310 100644
--- a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
Binary files differ