Merge "Track move of distro installer code"
am: da1654aef0
Change-Id: Iab784583f531d6548ca1ba7225a8b2cdcf7c2e69
diff --git a/hostsidetests/tzdata/src/com/android/cts/tzdata/TzDataCheckTest.java b/hostsidetests/tzdata/src/com/android/cts/tzdata/TzDataCheckTest.java
index a17abf9..2e9707c 100644
--- a/hostsidetests/tzdata/src/com/android/cts/tzdata/TzDataCheckTest.java
+++ b/hostsidetests/tzdata/src/com/android/cts/tzdata/TzDataCheckTest.java
@@ -56,28 +56,28 @@
/**
* The name of the directory containing the current time zone rules data beneath
- * {@link #mDataDir}. Also known to {@link libcore.tzdata.update2.TimeZoneDistroInstaller} and
+ * {@link #mDataDir}. Also known to {@link com.android.timezone.distro.installer.TimeZoneDistroInstaller} and
* tzdatacheck.cpp.
*/
private static final String CURRENT_DIR_NAME = "current";
/**
* The name of the directory containing the staged time zone rules data beneath
- * {@link #mDataDir}. Also known to {@link libcore.tzdata.update2.TimeZoneDistroInstaller} and
+ * {@link #mDataDir}. Also known to {@link com.android.timezone.distro.installer.TimeZoneDistroInstaller} and
* tzdatacheck.cpp.
*/
private static final String STAGED_DIR_NAME = "staged";
/**
* The name of the file inside the staged directory that indicates the staged operation is an
- * uninstall. Also known to {@link libcore.tzdata.update2.TimeZoneDistroInstaller} and
+ * uninstall. Also known to {@link com.android.timezone.distro.installer.TimeZoneDistroInstaller} and
* tzdatacheck.cpp.
*/
private static final String UNINSTALL_TOMBSTONE_FILE_NAME = "STAGED_UNINSTALL_TOMBSTONE";
/**
* The name of the /system time zone data file. Also known to
- * {@link libcore.tzdata.update2.TimeZoneDistroInstaller} and tzdatacheck.cpp.
+ * {@link com.android.timezone.distro.installer.TimeZoneDistroInstaller} and tzdatacheck.cpp.
*/
private static final String SYSTEM_TZDATA_FILE_NAME = "tzdata";
diff --git a/tests/libcore/luni/Android.mk b/tests/libcore/luni/Android.mk
index c04bf82..cdba3f9 100644
--- a/tests/libcore/luni/Android.mk
+++ b/tests/libcore/luni/Android.mk
@@ -25,7 +25,7 @@
cts-core-test-runner \
mockito-target-minus-junit4 \
time_zone_distro-tests \
- tzdata_update2-tests
+ time_zone_distro_installer-tests
# Don't include this package in any target
LOCAL_MODULE_TAGS := tests