make/Images.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 159,175 ****
  JDKJRE_BIN_LIST := $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES)), $(ALL_BIN_LIST))
  JRE_BIN_LIST := $(filter-out $(addprefix %, $(WINDOWS_JDKJRE_BIN_FILES)), $(JDKJRE_BIN_LIST))
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
    JDK_BIN_LIST := $(filter $(addprefix %, $(WINDOWS_JDK_BIN_FILES)), $(ALL_BIN_LIST))
!   # On windows x86, the server jvm is filtered out from the j2re image. This could possibly
!   # be handled by profiles in the future. If no client jvm is built, leave server in.
    ifeq ($(OPENJDK_TARGET_CPU), x86)
      ifeq ($(JVM_VARIANT_CLIENT), true)
        JRE_BIN_LIST := $(filter-out $(JDK_OUTPUTDIR)/bin/server/%, $(JRE_BIN_LIST))
      endif
    endif
  else
    JDK_BIN_LIST := $(ALL_BIN_LIST)
  endif
  
  ifneq ($(OPENJDK_TARGET_CPU_ISADIR), )
--- 159,177 ----
  JDKJRE_BIN_LIST := $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES)), $(ALL_BIN_LIST))
  JRE_BIN_LIST := $(filter-out $(addprefix %, $(WINDOWS_JDKJRE_BIN_FILES)), $(JDKJRE_BIN_LIST))
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
    JDK_BIN_LIST := $(filter $(addprefix %, $(WINDOWS_JDK_BIN_FILES)), $(ALL_BIN_LIST))
!   # On windows x86, the server jvm is filtered out from the j2re image. This is historical
!   # and is not applied to compact profiles. If no client jvm is built, leave server in.
    ifeq ($(OPENJDK_TARGET_CPU), x86)
      ifeq ($(JVM_VARIANT_CLIENT), true)
+       ifeq ($(PROFILE), )
          JRE_BIN_LIST := $(filter-out $(JDK_OUTPUTDIR)/bin/server/%, $(JRE_BIN_LIST))
        endif
      endif
+   endif
  else
    JDK_BIN_LIST := $(ALL_BIN_LIST)
  endif
  
  ifneq ($(OPENJDK_TARGET_CPU_ISADIR), )