Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/sym/Profiles.java	Thu Apr 03 12:04:58 2014 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/sym/Profiles.java	Fri Apr 04 18:36:16 2014 -0700
     1.3 @@ -153,6 +153,8 @@
     1.4          final int maxProfile = 4;  // Three compact profiles plus full JRE
     1.5  
     1.6          MakefileProfiles(Properties p) {
     1.7 +            // consider crypto, only if java/lang package exists
     1.8 +            boolean foundJavaLang = false;
     1.9              for (int profile = 1; profile <= maxProfile; profile++) {
    1.10                  String prefix = (profile < maxProfile ? "PROFILE_" + profile : "FULL_JRE");
    1.11                  String inclPackages = p.getProperty(prefix + "_RTJAR_INCLUDE_PACKAGES");
    1.12 @@ -161,6 +163,8 @@
    1.13                  for (String pkg: inclPackages.substring(1).trim().split("\\s+")) {
    1.14                      if (pkg.endsWith("/"))
    1.15                          pkg = pkg.substring(0, pkg.length() - 1);
    1.16 +                    if (foundJavaLang == false && pkg.equals("java/lang"))
    1.17 +                        foundJavaLang = true;
    1.18                      includePackage(profile, pkg);
    1.19                  }
    1.20                  String inclTypes =  p.getProperty(prefix + "_RTJAR_INCLUDE_TYPES");
    1.21 @@ -185,7 +189,8 @@
    1.22               * javax/net/ssl package. Thus, this package is added to compact1,
    1.23               * implying that it should exist in all three profiles.
    1.24               */
    1.25 -             includePackage(1, "javax/crypto");
    1.26 +            if (foundJavaLang)
    1.27 +                includePackage(1, "javax/crypto");
    1.28          }
    1.29  
    1.30          @Override