comparison make/CreateSecurityJars.gmk @ 8875:ed979f9b40cd

8022212: Intermittent test failures in java/net Reviewed-by: chegar
author tyan
date Thu, 21 Nov 2013 13:42:54 +0000
parents 348ffbd19feb
children 427c78c88229 d92379723173
comparison
equal deleted inserted replaced
1:35a890a95b7b 0:42ecce960b1e
36 ########################################################################################## 36 ##########################################################################################
37 # Create manifest for security jars 37 # Create manifest for security jars
38 # 38 #
39 # Include these extra attributes for now, should probably take out. 39 # Include these extra attributes for now, should probably take out.
40 # 40 #
41 MAINMANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf 41 MAINMANIFEST := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf
42 JCE_MANIFEST := $(JDK_OUTPUTDIR)/lib/_the.security.manifest.mf 42 JCE_MANIFEST := $(JDK_OUTPUTDIR)/lib/_the.security.manifest.mf
43 43
44 $(JCE_MANIFEST): $(MAINMANIFEST) 44 $(JCE_MANIFEST): $(MAINMANIFEST)
45 $(MKDIR) -p $(@D) 45 $(MKDIR) -p $(@D)
46 $(RM) $@ $@.tmp 46 $(RM) $@ $@.tmp
187 # then we don't need this extra copying 187 # then we don't need this extra copying
188 # 188 #
189 # NOTE: We currently do not place restrictions on our limited export 189 # NOTE: We currently do not place restrictions on our limited export
190 # policy. This was not a typo. 190 # policy. This was not a typo.
191 # 191 #
192 US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited 192 US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/data/cryptopolicy/unlimited
193 US_EXPORT_POLICY_JAR_TMP := $(JDK_OUTPUTDIR)/US_export_policy_jar.tmp 193 US_EXPORT_POLICY_JAR_TMP := $(JDK_OUTPUTDIR)/US_export_policy_jar.tmp
194 194
195 $(US_EXPORT_POLICY_JAR_TMP)/%: $(US_EXPORT_POLICY_JAR_SRC_DIR)/% 195 $(US_EXPORT_POLICY_JAR_TMP)/%: $(US_EXPORT_POLICY_JAR_SRC_DIR)/%
196 $(install-file) 196 $(install-file)
197 197
229 # then we don't need this extra copying 229 # then we don't need this extra copying
230 # 230 #
231 LOCAL_POLICY_JAR_TMP := $(JDK_OUTPUTDIR)/local_policy_jar.tmp 231 LOCAL_POLICY_JAR_TMP := $(JDK_OUTPUTDIR)/local_policy_jar.tmp
232 232
233 ifeq ($(UNLIMITED_CRYPTO), true) 233 ifeq ($(UNLIMITED_CRYPTO), true)
234 LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited 234 LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/data/cryptopolicy/unlimited
235 LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/default_local.policy 235 LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/default_local.policy
236 LOCAL_POLICY_JAR_ATTR := Crypto-Strength: unlimited 236 LOCAL_POLICY_JAR_ATTR := Crypto-Strength: unlimited
237 else 237 else
238 LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/limited 238 LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/data/cryptopolicy/limited
239 LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/exempt_local.policy \ 239 LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/exempt_local.policy \
240 $(LOCAL_POLICY_JAR_TMP)/default_local.policy 240 $(LOCAL_POLICY_JAR_TMP)/default_local.policy
241 LOCAL_POLICY_JAR_ATTR := Crypto-Strength: limited 241 LOCAL_POLICY_JAR_ATTR := Crypto-Strength: limited
242 endif 242 endif
243 243