makefiles/CompileJavaClasses.gmk

*** 275,284 ****
--- 275,303 ----
       # EXCLUDES+= tests/java/com/apple/jobjc
  
       EXCLUDES+= com/apple/jobjc
  endif
  
+ # The security classes should not end up in the classes directory as that will prevent them
+ # from working when running the exploded jdk image. Compile them separately to a different
+ # directory from where the jars can be created.
+ SECURITY_PKGS := sun/security/pkcs11 \
+                  com/sun/crypto/provider \
+                  javax/crypto \
+                  sun/security/internal \
+                  sun/security/mscapi \
+                  com/oracle/security/ucrypto
+ 
+ RT_SECURITY_CLASSES := sun/security/ec/ECParameters.java \
+                         sun/security/ec/ECPrivateKeyImpl.java \
+                         sun/security/ec/ECPublicKeyImpl.java \
+                         sun/security/ec/NamedCurve.java
+ 
+ NONRT_SECURITY_CLASSES := $(filter-out $(addprefix %,$(RT_SECURITY_CLASSES)),\
+                 $(wildcard $(JDK_TOPDIR)/src/share/classes/sun/security/ec/*.java))
+ 
+ 
  # The exception handling of swing beaninfo
  # These resources violates the convention of having code and resources together under
  # $(JDK_TOPDIR)/src/.../classes directories
  $(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%.gif: $(JDK_TOPDIR)/make/tools/swing-beans/beaninfo/images/%.gif
          $(call install-file)
*** 296,314 ****
                       $(MACOSX_SRC_DIRS) \
                       $(JDK_OUTPUTDIR)/gensrc \
                       $(JDK_OUTPUTDIR)/gensrc_no_srczip \
                       $(CLOSED_SRC_DIRS),\
                  INCLUDES:=$(JDK_USER_DEFINED_FILTER),\
!                 EXCLUDES:=$(EXCLUDES),\
!                 EXCLUDE_FILES:=$(EXFILES),\
                  BIN:=$(JDK_OUTPUTDIR)/classes,\
                  COPY:=$(COPY_PATTERNS),\
                  COPY_FILES:=$(COPY_FILES),\
                  HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers))
  
  ##########################################################################################
  
  ifndef OPENJDK
  
      $(eval $(call SetupJavaCompilation,BUILD_ALTCLASSES,\
                  SETUP:=GENERATE_JDKBYTECODE,\
                  SRC:=$(JDK_TOPDIR)/src/closed/share/altclasses, \
--- 315,349 ----
                       $(MACOSX_SRC_DIRS) \
                       $(JDK_OUTPUTDIR)/gensrc \
                       $(JDK_OUTPUTDIR)/gensrc_no_srczip \
                       $(CLOSED_SRC_DIRS),\
                  INCLUDES:=$(JDK_USER_DEFINED_FILTER),\
!                 EXCLUDES:=$(EXCLUDES) $(SECURITY_PKGS),\
!                 EXCLUDE_FILES:=$(EXFILES) $(NONRT_SECURITY_CLASSES),\
                  BIN:=$(JDK_OUTPUTDIR)/classes,\
                  COPY:=$(COPY_PATTERNS),\
                  COPY_FILES:=$(COPY_FILES),\
                  HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers))
  
  ##########################################################################################
  
+ $(eval $(call SetupJavaCompilation,BUILD_SECURITY,\
+                 SETUP:=GENERATE_JDKBYTECODE,\
+                 SRC:=$(JDK_TOPDIR)/src/share/classes \
+                      $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \
+                      $(MACOSX_SRC_DIRS) \
+                      $(CLOSED_SRC_DIRS),\
+                 INCLUDES:=$(SECURITY_PKGS) sun/security/ec,\
+                 EXCLUDES:=$(EXCLUDES),\
+                 EXCLUDE_FILES:=$(EXFILES),\
+                 BIN:=$(JDK_OUTPUTDIR)/classes_security,\
+                 HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers))
+ 
+ $(BUILD_SECURITY): $(BUILD_JDK)
+ 
+ ##########################################################################################
+ 
  ifndef OPENJDK
  
      $(eval $(call SetupJavaCompilation,BUILD_ALTCLASSES,\
                  SETUP:=GENERATE_JDKBYTECODE,\
                  SRC:=$(JDK_TOPDIR)/src/closed/share/altclasses, \
*** 400,410 ****
  endif
  endif
  
  ##########################################################################################
  
! all: $(BUILD_JDK) $(BUILD_ALTCLASSES) $(BUILD_JOBJC) $(BUILD_JOBJC_HEADERS) $(COPY_EXTRA) \
          $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
          $(BUILD_ACCESSBRIDGE_32) $(BUILD_ACCESSBRIDGE_64) \
          $(BUILD_ACCESSBRIDGE_LEGACY)
  
  .PHONY: all
--- 435,446 ----
  endif
  endif
  
  ##########################################################################################
  
! all: $(BUILD_JDK) $(BUILD_SECURITY) $(BUILD_ALTCLASSES) $(BUILD_JOBJC) \
!         $(BUILD_JOBJC_HEADERS) $(COPY_EXTRA) \
          $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
          $(BUILD_ACCESSBRIDGE_32) $(BUILD_ACCESSBRIDGE_64) \
          $(BUILD_ACCESSBRIDGE_LEGACY)
  
  .PHONY: all