make/launcher/Launcher-java.base.gmk

rev 12497 : 8027634: Support @argfiles for java command-line tool
Reviewed-by: ksrini, mchung

*** 29,39 ****
  
  # On windows, the debuginfo files get the same name as for java.dll. Build
  # into another dir and copy selectively so debuginfo for java.dll isn't
  # overwritten.
  $(eval $(call SetupLauncher,java, \
!     -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
      $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jli_static.lib, $(JAVA_RC_FLAGS), \
      $(JAVA_VERSION_INFO_RESOURCE), $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs,true))
  
  $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java)
          $(MKDIR) -p $(@D)
--- 29,39 ----
  
  # On windows, the debuginfo files get the same name as for java.dll. Build
  # into another dir and copy selectively so debuginfo for java.dll isn't
  # overwritten.
  $(eval $(call SetupLauncher,java, \
!     -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES,,,user32.lib comctl32.lib, \
      $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jli_static.lib, $(JAVA_RC_FLAGS), \
      $(JAVA_VERSION_INFO_RESOURCE), $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs,true))
  
  $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java)
          $(MKDIR) -p $(@D)
*** 42,52 ****
  
  TARGETS += $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX)
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
    $(eval $(call SetupLauncher,javaw, \
!       -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
        $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jli_static.lib, $(JAVA_RC_FLAGS), \
        $(JAVA_VERSION_INFO_RESOURCE),,true))
  endif
  
  $(eval $(call SetupLauncher,keytool, \
--- 42,52 ----
  
  TARGETS += $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX)
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
    $(eval $(call SetupLauncher,javaw, \
!       -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES,,,user32.lib comctl32.lib, \
        $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jli_static.lib, $(JAVA_RC_FLAGS), \
        $(JAVA_VERSION_INFO_RESOURCE),,true))
  endif
  
  $(eval $(call SetupLauncher,keytool, \