make/CopyFiles.gmk

rev 12525 : 8157561: Ship the unlimited policy files in JDK Updates
Reviewed-by: wetmore, erikj

*** 1,7 ****
  #
! # Copyright (c) 2011, 2015, 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, 2016, 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
*** 355,376 ****
  ifndef OPENJDK
  
  RESTRICTED_PKGS_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/restricted.pkgs
  RESTRICTED_PKGS := $(shell $(CAT) $(RESTRICTED_PKGS_SRC) | $(TR) "\n" " ")
  
  $(PROPS_DST): $(PROPS_SRC)
          $(MKDIR) -p $(@D)
          $(TOOL_ADDTORESTRICTEDPKGS) $^ $@.tmp $(RESTRICTED_PKGS)
          $(MV) $@.tmp $@
  
- else
- 
- $(PROPS_DST): $(PROPS_SRC)
-         $(call install-file)
- 
- endif
- 
  COPY_FILES += $(PROPS_DST)
  
  ##########################################################################################
  
  POLICY_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.policy
--- 355,379 ----
  ifndef OPENJDK
  
  RESTRICTED_PKGS_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/restricted.pkgs
  RESTRICTED_PKGS := $(shell $(CAT) $(RESTRICTED_PKGS_SRC) | $(TR) "\n" " ")
  
+ endif
+ 
  $(PROPS_DST): $(PROPS_SRC)
          $(MKDIR) -p $(@D)
+         ifndef OPENJDK
            $(TOOL_ADDTORESTRICTEDPKGS) $^ $@.tmp $(RESTRICTED_PKGS)
+         else
+           $(CP) $^ $@.tmp
+         endif
+         ifeq ($(UNLIMITED_CRYPTO), true)
+           $(TOOL_CRYPTOLEVEL) $@.tmp $@.tmp2 unlimited
+           $(MV) $@.tmp2 $@.tmp
+         endif
          $(MV) $@.tmp $@
  
  COPY_FILES += $(PROPS_DST)
  
  ##########################################################################################
  
  POLICY_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.policy