make/CreateSecurityJars.gmk

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

*** 1,7 ****
  #
! # Copyright (c) 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) 2013, 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
*** 176,186 ****
  
  TARGETS += $(JCE_JAR_DST)
  
  ##########################################################################################
  
! US_EXPORT_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/US_export_policy.jar
  
  ifneq ($(BUILD_CRYPTO), no)
  
    US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED := \
        $(JDK_OUTPUTDIR)/jce/unsigned/policy/limited/US_export_policy.jar
--- 176,189 ----
  
  TARGETS += $(JCE_JAR_DST)
  
  ##########################################################################################
  
! US_EXPORT_POLICY_JAR_UNLIMITED_DST := \
!     $(JDK_OUTPUTDIR)/lib/security/policy/unlimited/US_export_policy.jar
! US_EXPORT_POLICY_JAR_LIMITED_DST := \
!     $(JDK_OUTPUTDIR)/lib/security/policy/limited/US_export_policy.jar
  
  ifneq ($(BUILD_CRYPTO), no)
  
    US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED := \
        $(JDK_OUTPUTDIR)/jce/unsigned/policy/limited/US_export_policy.jar
*** 218,248 ****
    TARGETS += $(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED) \
        $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED)
  endif
  
  ifndef OPENJDK
!   ifeq ($(UNLIMITED_CRYPTO), true)
!     $(error No prebuilt unlimited crypto jars available)
!   endif
!   $(US_EXPORT_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/US_export_policy.jar
          $(ECHO) $(LOG_INFO) Copying prebuilt $(@F)
          $(install-file)
  else
!   ifeq ($(UNLIMITED_CRYPTO), true)
!     $(US_EXPORT_POLICY_JAR_DST): $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED)
          $(install-file)
!   else
!     $(US_EXPORT_POLICY_JAR_DST): $(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED)
          $(install-file)
    endif
- endif
  
! TARGETS += $(US_EXPORT_POLICY_JAR_DST)
  
  ##########################################################################################
  
! LOCAL_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/local_policy.jar
  
  ifneq ($(BUILD_CRYPTO), no)
  
    LOCAL_POLICY_JAR_LIMITED_UNSIGNED := \
        $(JDK_OUTPUTDIR)/jce/unsigned/policy/limited/local_policy.jar
--- 221,253 ----
    TARGETS += $(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED) \
        $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED)
  endif
  
  ifndef OPENJDK
!   $(US_EXPORT_POLICY_JAR_UNLIMITED_DST): \
!     $(JDK_TOPDIR)/make/closed/tools/crypto/jce/unlimited/US_export_policy.jar
!         $(ECHO) $(LOG_INFO) Copying prebuilt $(@F)
!         $(install-file)
!   $(US_EXPORT_POLICY_JAR_LIMITED_DST): \
!     $(JDK_TOPDIR)/make/closed/tools/crypto/jce/limited/US_export_policy.jar
          $(ECHO) $(LOG_INFO) Copying prebuilt $(@F)
          $(install-file)
  else
!   $(US_EXPORT_POLICY_JAR_UNLIMITED_DST): $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED)
          $(install-file)
!   $(US_EXPORT_POLICY_JAR_LIMITED_DST): $(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED)
          $(install-file)
    endif
  
! TARGETS += $(US_EXPORT_POLICY_JAR_UNLIMITED_DST) $(US_EXPORT_POLICY_JAR_LIMITED_DST)
  
  ##########################################################################################
  
! LOCAL_POLICY_JAR_LIMITED_DST := \
!     $(JDK_OUTPUTDIR)/lib/security/policy/limited/local_policy.jar
! LOCAL_POLICY_JAR_UNLIMITED_DST := \
!     $(JDK_OUTPUTDIR)/lib/security/policy/unlimited/local_policy.jar
  
  ifneq ($(BUILD_CRYPTO), no)
  
    LOCAL_POLICY_JAR_LIMITED_UNSIGNED := \
        $(JDK_OUTPUTDIR)/jce/unsigned/policy/limited/local_policy.jar
*** 291,314 ****
      TARGETS += $(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/README.txt
    endif
  endif
  
  ifndef OPENJDK
!   $(LOCAL_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/local_policy.jar
          $(ECHO) $(LOG_INFO) Copying prebuilt $(@F)
          $(install-file)
  else
!   ifeq ($(UNLIMITED_CRYPTO), true)
!     $(LOCAL_POLICY_JAR_DST): $(LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED)
          $(install-file)
!   else
!     $(LOCAL_POLICY_JAR_DST): $(LOCAL_POLICY_JAR_LIMITED_UNSIGNED)
          $(install-file)
    endif
- endif
  
! TARGETS += $(LOCAL_POLICY_JAR_DST)
  
  ##########################################################################################
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
  
--- 296,319 ----
      TARGETS += $(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/README.txt
    endif
  endif
  
  ifndef OPENJDK
!   $(LOCAL_POLICY_JAR_UNLIMITED_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/unlimited/local_policy.jar
!         $(ECHO) $(LOG_INFO) Copying prebuilt $(@F)
!         $(install-file)
!   $(LOCAL_POLICY_JAR_LIMITED_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/limited/local_policy.jar
          $(ECHO) $(LOG_INFO) Copying prebuilt $(@F)
          $(install-file)
  else
!   $(LOCAL_POLICY_JAR_UNLIMITED_DST): $(LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED)
          $(install-file)
!   $(LOCAL_POLICY_JAR_LIMITED_DST): $(LOCAL_POLICY_JAR_LIMITED_UNSIGNED)
          $(install-file)
    endif
  
! TARGETS += $(LOCAL_POLICY_JAR_UNLIMITED_DST) $(LOCAL_POLICY_JAR_LIMITED_DST)
  
  ##########################################################################################
  
  ifeq ($(OPENJDK_TARGET_OS), windows)