6853152: JDK 7 cannot build w/o ALT_HOTSPOT_KERNEL_PATH set. - still broken

Summary: This problem was discovered testing initial changeset for implementing 6uX Deployment Features into JDK7
Reviewed-by: dgu, billyh

jdk/make/common/shared/Defs-windows.gmk

@@ -647,6 +647,25 @@ ifeq ($(ARCH_DATA_MODEL), 32)
   HOTSPOT_CLIENT_PATH:=$(call AltCheckValue,HOTSPOT_CLIENT_PATH)
 endif
 
+DO_KERNEL=false
+ifneq ($(KERNEL), off)
+  # HOTSPOT_KERNEL_PATH: location of kernel jvm library file.
+  ifeq ($(ARCH_DATA_MODEL), 32)
+    ifdef ALT_HOTSPOT_KERNEL_PATH
+       HOTSPOT_KERNEL_PATH := $(call FullPath,$(ALT_HOTSPOT_KERNEL_PATH))
+    else
+       # if ALT_HOTSPOT_KERNEL_PATH not set, try getting from hotspot build
+       HOTSPOT_KERNEL_PATH := $(call FullPath,$(OUTPUTDIR)/bin/kernel)
+    endif
+    HOTSPOT_KERNEL_PATH:=$(call AltCheckSpaces,HOTSPOT_KERNEL_PATH)
+    DO_KERNEL = $(shell if [ -f $(HOTSPOT_KERNEL_PATH)/jvm.dll ] ; then \
+      $(ECHO) true ; \
+    else \
+      $(ECHO) false ; \
+    fi )
+  endif
+endif
+
 # HOTSPOT_SERVER_PATH: location of server jvm library file.
 ifdef ALT_HOTSPOT_SERVER_PATH
   HOTSPOT_SERVER_PATH :=$(call FullPath,$(ALT_HOTSPOT_SERVER_PATH))

jdk/make/java/redist/Makefile

@@ -106,8 +106,10 @@ ifeq ($(PLATFORM), windows)
 
 # Add the Java Kernel VM to the import path, but only on windows 32-bit Windows
 ifeq ($(ARCH_DATA_MODEL), 32)
-  IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_NAME) \
-                 $(LIB_LOCATION)/$(KERNEL_LOCATION)/Xusage.txt
+  ifeq ($(DO_KERNEL), true)
+    IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_NAME) \
+                   $(LIB_LOCATION)/$(KERNEL_LOCATION)/Xusage.txt
+  endif
 endif
 
 IMPORT_LIST += $(MS_RUNTIME_LIBRARIES:%=$(BINDIR)/%)
@@ -131,8 +133,10 @@ IMPORT_LIST += \
 ifeq ($(ARCH_DATA_MODEL), 32)
   IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \
                  $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME)
-  IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMMAP_NAME) \
-                 $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMPDB_NAME)
+  ifeq ($(DO_KERNEL), true)
+    IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMMAP_NAME) \
+                   $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMPDB_NAME)
+  endif
 endif
 
 $(LIBDIR)/$(JVMLIB_NAME): $(HOTSPOT_LIB_PATH)/$(JVMLIB_NAME)