8058579: Copy-java.base.gmk no longer needs to differentiate win32 and win64 java.policy
Summary: replace java.policy-win32/64 with just java.policy
Reviewed-by: mchung, erikj
Contributed-by: peter.brunet@oracle.com
--- a/jdk/make/copy/Copy-java.base.gmk Tue Sep 16 09:26:06 2014 -0700
+++ b/jdk/make/copy/Copy-java.base.gmk Tue Sep 16 14:58:27 2014 -0500
@@ -172,14 +172,8 @@
POLICY_SRC_LIST += $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf/security/java.policy
endif
ifndef OPENJDK
- ifeq ($(OPENJDK_TARGET_OS), windows)
- ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
- POLICY_SRC_LIST += $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/conf/security/java.policy-win32
- else
- POLICY_SRC_LIST += $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/conf/security/java.policy-win64
- endif
- endif
- ifeq ($(OPENJDK_TARGET_OS), solaris)
+ # if $(OPENJDK_TARGET_OS) is windows or solaris
+ ifneq ($(findstring $(OPENJDK_TARGET_OS), windows solaris), )
POLICY_SRC_LIST += $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS)/conf/security/java.policy
endif
endif