Adding extra validation to TzDataBundleInstaller
Adding extra validation to TzDataBundleInstaller. This requires
that the test data the test is given is actually valid.
To provide valid test data the ZoneInfoTestHelper has been moved
into a support library under tzdata that can be used from the
installer and libcore test code.
Bug: 31008728
Test: CtsLibcoreTestCases
Change-Id: I5035b4b292f2574b2d58829fb0c2df9efac470d6
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 33b127c..856f4d3 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -212,7 +212,8 @@
core-tests-support \
mockwebserver \
nist-pkix-tests \
- sqlite-jdbc
+ sqlite-jdbc \
+ tzdata-testing
LOCAL_JAVACFLAGS := $(local_javac_flags)
LOCAL_ERROR_PRONE_FLAGS := -Xep:TryFailThrowable:ERROR
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
@@ -360,7 +361,7 @@
LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core-oj-hostdex core-libart-hostdex okhttp-hostdex bouncycastle-hostdex junit-hostdex core-tests-support-hostdex mockito-api-hostdex
- LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc-host mockwebserver-host nist-pkix-tests-host core-test-rules-hostdex
+ LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc-host mockwebserver-host nist-pkix-tests-host core-test-rules-hostdex tzdata-testing-hostdex
LOCAL_JAVACFLAGS := $(local_javac_flags)
LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LANGUAGE_VERSION := 1.8