makefiles/Setup.gmk

*** 33,48 ****
       JAVAC:=$(NEW_JAVAC),\
       FLAGS:=-source 7 -target 7 -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS),\
       SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
       SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
  
  # The generate new bytecode javac setup uses the new compiler to compile for the
  # new jdk. This new bytecode might only be possible to run using the new jvm.
  $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\
       JVM:=$(JAVA),\
       JAVAC:=$(NEW_JAVAC),\
!      FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS),\
       SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
       SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
  
  # After the jdk is built, we want to build demos using only the recently
  # generated jdk classes and nothing else, no jdk source, etc etc.
--- 33,57 ----
       JAVAC:=$(NEW_JAVAC),\
       FLAGS:=-source 7 -target 7 -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS),\
       SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
       SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
  
+ ifndef OPENJDK
+   # Some licensees do not get the Security Source bundles.  We will
+   # fall back on the prebuilt jce.jar so that we can do a best
+   # attempt at building.
+   ifeq ($(wildcard $(JDK_TOPDIR)/src/share/classes/javax/crypto/Cipher.java),)
+     JCE_PATH := $(PATH_SEP)$(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar
+   endif
+ endif
+ 
  # The generate new bytecode javac setup uses the new compiler to compile for the
  # new jdk. This new bytecode might only be possible to run using the new jvm.
  $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\
       JVM:=$(JAVA),\
       JAVAC:=$(NEW_JAVAC),\
!      FLAGS:=-bootclasspath "$(JDK_OUTPUTDIR)/classes$(JCE_PATH)" -source 8 -target 8 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS),\
       SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
       SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
  
  # After the jdk is built, we want to build demos using only the recently
  # generated jdk classes and nothing else, no jdk source, etc etc.