make/modules/java.base/Copy.gmk

rev 59102 : imported patch build

*** 147,157 ****
  DEF_POLICY_DST := $(LIB_DST_DIR)/security/default.policy
  
  DEF_POLICY_SRC_LIST := $(DEF_POLICY_SRC)
  DEF_POLICY_SRC_LIST += $(CUSTOM_POLICY_SRC_LIST)
  
! ifeq ($(call isTargetOs, windows solaris), true)
    DEF_POLICY_SRC_LIST += $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/lib/security/default.policy
  endif
  
  # Allow imported modules to modify the java.policy
  ifneq ($(IMPORT_MODULES_CONF), )
--- 147,157 ----
  DEF_POLICY_DST := $(LIB_DST_DIR)/security/default.policy
  
  DEF_POLICY_SRC_LIST := $(DEF_POLICY_SRC)
  DEF_POLICY_SRC_LIST += $(CUSTOM_POLICY_SRC_LIST)
  
! ifeq ($(call isTargetOs, windows), true)
    DEF_POLICY_SRC_LIST += $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/lib/security/default.policy
  endif
  
  # Allow imported modules to modify the java.policy
  ifneq ($(IMPORT_MODULES_CONF), )
*** 187,197 ****
      DEST := $(CONF_DST_DIR), \
  ))
  
  TARGETS += $(COPY_NET_PROPERTIES)
  
! ifeq ($(call isTargetOs, solaris linux), true)
    $(eval $(call SetupCopyFiles, COPY_SDP_CONF, \
        FILES := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, \
        DEST := $(CONF_DST_DIR)/sdp, \
    ))
  
--- 187,197 ----
      DEST := $(CONF_DST_DIR), \
  ))
  
  TARGETS += $(COPY_NET_PROPERTIES)
  
! ifeq ($(call isTargetOs, linux), true)
    $(eval $(call SetupCopyFiles, COPY_SDP_CONF, \
        FILES := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, \
        DEST := $(CONF_DST_DIR)/sdp, \
    ))