equal
deleted
inserted
replaced
164 ################################################################################ |
164 ################################################################################ |
165 |
165 |
166 POLICY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.policy |
166 POLICY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.policy |
167 POLICY_DST := $(CONF_DST_DIR)/security/java.policy |
167 POLICY_DST := $(CONF_DST_DIR)/security/java.policy |
168 |
168 |
169 POLICY_SRC_LIST := |
169 POLICY_SRC_LIST := $(POLICY_SRC) |
170 |
|
171 ifeq ($(OPENJDK_TARGET_OS), windows) |
|
172 POLICY_SRC_LIST += $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf/security/java.policy |
|
173 endif |
|
174 |
|
175 # Allow imported modules to modify the java.policy |
|
176 ifneq ($(IMPORT_MODULES_CONF), ) |
|
177 POLICY_SRC_LIST += $(wildcard $(IMPORT_MODULES_CONF)/java.base/security/java.policy.extra) |
|
178 endif |
|
179 |
|
180 POLICY_SRC_LIST += $(POLICY_SRC) |
|
181 |
170 |
182 $(POLICY_DST): $(POLICY_SRC_LIST) |
171 $(POLICY_DST): $(POLICY_SRC_LIST) |
183 $(MKDIR) -p $(@D) |
172 $(MKDIR) -p $(@D) |
184 $(RM) $@ $@.tmp |
173 $(RM) $@ $@.tmp |
185 $(foreach f,$(POLICY_SRC_LIST),$(CAT) $(f) >> $@.tmp;) |
174 $(foreach f,$(POLICY_SRC_LIST),$(CAT) $(f) >> $@.tmp;) |
187 |
176 |
188 TARGETS += $(POLICY_DST) |
177 TARGETS += $(POLICY_DST) |
189 |
178 |
190 ################################################################################ |
179 ################################################################################ |
191 |
180 |
|
181 DEF_POLICY_SRC := $(JDK_TOPDIR)/src/java.base/share/lib/security/default.policy |
|
182 DEF_POLICY_DST := $(LIB_DST_DIR)/security/default.policy |
|
183 |
|
184 DEF_POLICY_SRC_LIST := $(DEF_POLICY_SRC) |
|
185 |
|
186 ifeq ($(OPENJDK_TARGET_OS), windows) |
|
187 DEF_POLICY_SRC_LIST += $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/lib/security/default.policy |
|
188 endif |
|
189 |
|
190 # Allow imported modules to modify the java.policy |
|
191 ifneq ($(IMPORT_MODULES_CONF), ) |
|
192 DEF_POLICY_SRC_LIST += $(wildcard $(IMPORT_MODULES_CONF)/java.base/security/java.policy.extra) |
|
193 endif |
|
194 |
|
195 $(DEF_POLICY_DST): $(DEF_POLICY_SRC_LIST) |
|
196 $(MKDIR) -p $(@D) |
|
197 $(RM) $@ $@.tmp |
|
198 $(foreach f,$(DEF_POLICY_SRC_LIST),$(CAT) $(f) >> $@.tmp;) |
|
199 $(MV) $@.tmp $@ |
|
200 |
|
201 TARGETS += $(DEF_POLICY_DST) |
|
202 |
|
203 ################################################################################ |
|
204 |
192 ifeq ($(CACERTS_FILE), ) |
205 ifeq ($(CACERTS_FILE), ) |
193 CACERTS_FILE := $(JDK_TOPDIR)/src/java.base/share/conf/security/cacerts |
206 CACERTS_FILE := $(JDK_TOPDIR)/src/java.base/share/conf/security/cacerts |
194 endif |
207 endif |
195 |
208 |
196 CACERTS_DST := $(LIB_DST_DIR)/security/cacerts |
209 CACERTS_DST := $(LIB_DST_DIR)/security/cacerts |