提交 1f8e7ab0 编写于 作者: K ksrini

8039231: [javadoc] test failure caused by javax.crypto fix

Reviewed-by: jjg
上级 407d568a
......@@ -153,6 +153,8 @@ public abstract class Profiles {
final int maxProfile = 4; // Three compact profiles plus full JRE
MakefileProfiles(Properties p) {
// consider crypto, only if java/lang package exists
boolean foundJavaLang = false;
for (int profile = 1; profile <= maxProfile; profile++) {
String prefix = (profile < maxProfile ? "PROFILE_" + profile : "FULL_JRE");
String inclPackages = p.getProperty(prefix + "_RTJAR_INCLUDE_PACKAGES");
......@@ -161,6 +163,8 @@ public abstract class Profiles {
for (String pkg: inclPackages.substring(1).trim().split("\\s+")) {
if (pkg.endsWith("/"))
pkg = pkg.substring(0, pkg.length() - 1);
if (foundJavaLang == false && pkg.equals("java/lang"))
foundJavaLang = true;
includePackage(profile, pkg);
}
String inclTypes = p.getProperty(prefix + "_RTJAR_INCLUDE_TYPES");
......@@ -185,7 +189,8 @@ public abstract class Profiles {
* javax/net/ssl package. Thus, this package is added to compact1,
* implying that it should exist in all three profiles.
*/
includePackage(1, "javax/crypto");
if (foundJavaLang)
includePackage(1, "javax/crypto");
}
@Override
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册