Merge

9315e36b · duke · 62760381 · 5820e3b5 · 9315e36b · 9315e36b
隐藏空白更改
内联并排

Showing with 3 addition and 1 deletion

.hgtags-top-repo .hgtags-top-repo +1 -0

hotspot/.hgtags hotspot/.hgtags +1 -0

make/CompileJavaModules.gmk make/CompileJavaModules.gmk +1 -1

未找到文件。
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -377,3 +377,4 @@ d94d54a3192fea79234c3ac55cd0b4052d45e954 jdk-9+130
 a24702d4d5ab0015a5c553ed57f66fce7d85155e jdk-9+132
 be1218f792a450dfb5d4b1f82616b9d95a6a732e jdk-9+133
 065724348690eda41fc69112278d8da6dcde548c jdk-9+134
+82b94cb5f342319d2cda77f9fa59703ad7fde576 jdk-9+135
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -537,3 +537,4 @@ e96b34b76d863ed1fa04e0eeb3f297ac17b490fd jdk-9+129
 713951c08aa26813375175c2ab6cc99ff2a56903 jdk-9+132
 a25e0fb6033245ab075136e744d362ce765464cd jdk-9+133
 b8b694c6b4d2ab0939aed7adaf0eec1ac321a085 jdk-9+134
+3b1c4562953db47e36b237a500f368d5c9746d47 jdk-9+135
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -458,7 +458,7 @@ sun.charsets_COPY := .dat
 jdk.localedata_COPY := _dict _th
 # Exclude BreakIterator classes that are just used in compile process to generate
 # data files and shouldn't go in the product
-jdk.localedata_EXCLUDE_FILES += sun/text/resources/th/BreakIteratorRules_th.java
+jdk.localedata_EXCLUDE_FILES += sun/text/resources/ext/BreakIteratorRules_th.java

 ################################################################################
 # Setup the compilation for the module