Re: RFR: JDK-8060766: build of jdk9-b33 seems broken due to how security zip files are interfaced

[Tim Bell]

Erik:

Please review this small patch, fixing java compilation when crypto sources have been excluded and prebuilt.

Bug: https://bugs.openjdk.java.net/browse/JDK-8060766
Patch inline:

diff -r e4ba01b726e2 make/CompileJavaModules.gmk
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -479,6 +479,11 @@
   $1_DEPS := $$(call FindDepsForModule, $1)

   $1_CLASSPATH := $$(addprefix $(JDK_OUTPUTDIR)/modules/,$$($1_DEPS))

+ # When crypto classes are prebuilt, need to look for classes already in

+  # output dir.
+  ifneq ($(BUILD_CRYPTO), true)
+    $1_CLASSPATH += $(JDK_OUTPUTDIR)/modules/$1
+  endif
   ifeq ($1, jdk.hotspot.agent)

## The source of this module is compiled elsewhere, hotspot, and imported. ## Service types are required in the classpath when compiing module-info

Looks good to me.

Tim