equal
deleted
inserted
replaced
60 |
60 |
61 GENDATA += $(GENDATA_CURDATA) |
61 GENDATA += $(GENDATA_CURDATA) |
62 |
62 |
63 ########################################################################################## |
63 ########################################################################################## |
64 |
64 |
65 PROPS_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.security-$(OPENJDK_TARGET_OS) |
65 GENDATA_JAVA_SECURITY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.security |
66 PROPS_DST := $(JDK_OUTPUTDIR)/lib/security/java.security |
66 GENDATA_JAVA_SECURITY := $(JDK_OUTPUTDIR)/lib/security/java.security |
67 |
67 |
68 # Optionally set this variable to a file to add extra restricted packages. |
68 # RESTRICTED_PKGS_SRC is optionally set in custom extension for this makefile |
69 ifneq ($(RESTRICTED_PKGS_SRC), ) |
69 |
70 |
70 $(GENDATA_JAVA_SECURITY): $(BUILD_TOOLS) $(GENDATA_JAVA_SECURITY_SRC) $(RESTRICTED_PKGS_SRC) |
71 $(PROPS_DST): $(PROPS_SRC) $(RESTRICTED_PKGS_SRC) |
71 $(ECHO) "Generating java.security" |
72 $(MKDIR) -p $(@D) |
72 $(MKDIR) -p $(@D) |
73 $(TOOL_ADDTORESTRICTEDPKGS) $(PROPS_SRC) $@.tmp `$(CAT) $(RESTRICTED_PKGS_SRC) | $(TR) "\n" " "` |
73 $(TOOL_MAKEJAVASECURITY) $(GENDATA_JAVA_SECURITY_SRC) $@ $(OPENJDK_TARGET_OS) \ |
74 $(MV) $@.tmp $@ |
74 $(RESTRICTED_PKGS_SRC) || exit 1 |
75 |
75 |
76 else |
76 GENDATA += $(GENDATA_JAVA_SECURITY) |
77 |
|
78 $(PROPS_DST): $(PROPS_SRC) |
|
79 $(call install-file) |
|
80 |
|
81 endif |
|
82 |
|
83 GENDATA += $(PROPS_DST) |
|
84 |
77 |
85 ########################################################################################## |
78 ########################################################################################## |
86 |
79 |
87 $(GENDATA): $(BUILD_TOOLS_JDK) |
80 $(GENDATA): $(BUILD_TOOLS_JDK) |
88 |
81 |