Merge

fe49b2c7 · asaha · 4968ca5a · bef6ea90 · fe49b2c7 · fe49b2c7
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

.hgtags .hgtags +1 -0

make/Javadoc.gmk make/Javadoc.gmk +1 -2

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -436,3 +436,4 @@ ba0772198525025803b0fddd6a628fc2416b3b85 jdk8u60-b12
 7ed130e10665ae5bed82aa8c4cdc18373292a6d7 jdk8u60-b15
 08a417ec9b3eea2f02eb02c7b7635f9701813f65 jdk8u60-b16
 ec24cc303a2cfeb10ff0a5fb7b3d49ef47bb66f7 jdk8u60-b17
+d1d9eb953fbbe1f63a6badb0742508ae5f0d3ab5 jdk8u60-b18
--- a/make/Javadoc.gmk
+++ b/make/Javadoc.gmk
@@ -1212,8 +1212,7 @@ $(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAP
 # jaccessdocs - Java Accessibility Utilities
 #

-# Disable generation for now due to build break of nightly
-#ALL_OTHER_TARGETS += jaccessdocs
+ALL_OTHER_TARGETS += jaccessdocs

 JACCESSAPI_DOCDIR := $(JRE_API_DOCSDIR)/accessibility/jaccess/spec
 JACCESSAPI2COREAPI := ../../../$(JDKJRE2COREAPI)