Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8047387: Generate different version of java.policy file for windows 32-bit and 64-bit
authormchung
Thu, 19 Jun 2014 13:12:08 -0700
changeset 25150 14cc6eb021d5
parent 25149 7df9d6b3ef17
child 25151 7a670121602e
8047387: Generate different version of java.policy file for windows 32-bit and 64-bit Reviewed-by: erikj, tbell
jdk/make/CopyFiles.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/CopyFiles.gmk	Thu Jun 19 18:07:02 2014 +0400
+++ b/jdk/make/CopyFiles.gmk	Thu Jun 19 13:12:08 2014 -0700
@@ -373,7 +373,14 @@
   POLICY_SRC_LIST += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS)/lib/security/java.policy
 endif
 ifndef OPENJDK
-  ifneq (, $(filter $(OPENJDK_TARGET_OS), windows solaris))
+  ifeq ($(OPENJDK_TARGET_OS), windows)
+    ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
+      POLICY_SRC_LIST += $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS)/lib/security/java.policy-win32
+    else
+      POLICY_SRC_LIST += $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS)/lib/security/java.policy-win64
+    endif
+  endif
+  ifeq ($(OPENJDK_TARGET_OS), solaris)
     POLICY_SRC_LIST += $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS)/lib/security/java.policy
   endif
 endif
jdk-sandbox