Revert "Temporarily disable java.time tests."
This reverts commit fca5887a2de5b0d8ddd295da714472768458d6d0.
With this commit, the java.time tests are re-enabled and are part of
the CTS module CtsLibcoreOjTestCases.
Bug: 28832222
Test: CtsLibcoreTestCases and CtsLibcoreOjTestCases
Change-Id: Idfe2012169b623b94f99e73312117f72506a7c3e
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 82ac3bb..211db85 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -273,8 +273,7 @@
ifeq ($(LIBCORE_SKIP_TESTS),)
include $(CLEAR_VARS)
# Filter out SerializedLambdaTest because it depends on stub classes and won't actually run.
- # Temporarily filter out java.time tests until they stabilize (b/28832222)
- LOCAL_SRC_FILES := $(filter-out ojluni/src/test/java/time/% %/DeserializeMethodTest.java %/SerializedLambdaTest.java ojluni/src/test/java/util/stream/boot%,$(ojtest_src_files)) # Do not include anything from the boot* directories. Those directories need a custom bootclasspath to run.
+ LOCAL_SRC_FILES := $(filter-out %/DeserializeMethodTest.java %/SerializedLambdaTest.java ojluni/src/test/java/util/stream/boot%,$(ojtest_src_files)) # Do not include anything from the boot* directories. Those directories need a custom bootclasspath to run.
# Include source code as part of JAR
LOCAL_JAVA_RESOURCE_DIRS := ojluni/src/test/dist $(test_resource_dirs)
LOCAL_NO_STANDARD_LIBRARIES := true