Move ZoneInfoDb to i18n module
Bug: 141747409
Test: m droid
Merged-In: I22896883f80f87357d3251244ad90aea0e863958
Change-Id: I22896883f80f87357d3251244ad90aea0e863958
diff --git a/distro/core/src/test/com/android/timezone/distro/TimeZoneDistroTest.java b/distro/core/src/test/com/android/timezone/distro/TimeZoneDistroTest.java
index ac6d825..f36b615 100644
--- a/distro/core/src/test/com/android/timezone/distro/TimeZoneDistroTest.java
+++ b/distro/core/src/test/com/android/timezone/distro/TimeZoneDistroTest.java
@@ -15,10 +15,8 @@
*/
package com.android.timezone.distro;
-import junit.framework.TestCase;
-
+import com.android.i18n.timezone.TzDataSetVersion;
import libcore.testing.io.TestIoUtils;
-import libcore.timezone.TzDataSetVersion;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -32,6 +30,7 @@
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
+import junit.framework.TestCase;
/**
* Tests for {@link TimeZoneDistro}.
diff --git a/distro/installer/src/main/com/android/timezone/distro/installer/TimeZoneDistroInstaller.java b/distro/installer/src/main/com/android/timezone/distro/installer/TimeZoneDistroInstaller.java
index aa3b377..98c7f84 100644
--- a/distro/installer/src/main/com/android/timezone/distro/installer/TimeZoneDistroInstaller.java
+++ b/distro/installer/src/main/com/android/timezone/distro/installer/TimeZoneDistroInstaller.java
@@ -15,6 +15,9 @@
*/
package com.android.timezone.distro.installer;
+import com.android.i18n.timezone.TzDataSetVersion;
+import com.android.i18n.timezone.TzDataSetVersion.TzDataSetException;
+import com.android.i18n.timezone.ZoneInfoDb;
import com.android.timezone.distro.DistroException;
import com.android.timezone.distro.DistroVersion;
import com.android.timezone.distro.FileUtils;
@@ -31,10 +34,7 @@
import java.lang.annotation.RetentionPolicy;
import libcore.timezone.TelephonyLookup;
-import libcore.timezone.TzDataSetVersion;
-import libcore.timezone.TzDataSetVersion.TzDataSetException;
import libcore.timezone.TimeZoneFinder;
-import libcore.timezone.ZoneInfoDb;
/**
* A distro-validation / extraction class. Separate from the services code that uses it for easier
diff --git a/distro/installer/src/test/com/android/timezone/distro/installer/TimeZoneDistroInstallerTest.java b/distro/installer/src/test/com/android/timezone/distro/installer/TimeZoneDistroInstallerTest.java
index 70ccb6d..770e384 100644
--- a/distro/installer/src/test/com/android/timezone/distro/installer/TimeZoneDistroInstallerTest.java
+++ b/distro/installer/src/test/com/android/timezone/distro/installer/TimeZoneDistroInstallerTest.java
@@ -15,6 +15,7 @@
*/
package com.android.timezone.distro.installer;
+import com.android.i18n.timezone.TzDataSetVersion;
import com.android.timezone.distro.DistroVersion;
import com.android.timezone.distro.FileUtils;
import com.android.timezone.distro.StagedDistroOperation;
@@ -38,7 +39,6 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import libcore.io.IoUtils;
-import libcore.timezone.TzDataSetVersion;
import libcore.timezone.testing.ZoneInfoTestHelper;
import static org.junit.Assert.assertArrayEquals;
diff --git a/distro/tools/src/main/com/android/timezone/distro/tools/CreateTimeZoneDistro.java b/distro/tools/src/main/com/android/timezone/distro/tools/CreateTimeZoneDistro.java
index e518437..e91acc1 100644
--- a/distro/tools/src/main/com/android/timezone/distro/tools/CreateTimeZoneDistro.java
+++ b/distro/tools/src/main/com/android/timezone/distro/tools/CreateTimeZoneDistro.java
@@ -15,7 +15,7 @@
*/
package com.android.timezone.distro.tools;
-import libcore.timezone.TzDataSetVersion;
+import com.android.i18n.timezone.TzDataSetVersion;
import com.android.timezone.distro.DistroVersion;
import com.android.timezone.distro.TimeZoneDistro;
