Skip to content

Commit 4fb4542

Browse files
Add missing default jlink options
1 parent 1c1b554 commit 4fb4542

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

src/jdk.jpackage/share/classes/jdk/jpackage/internal/RuntimeBuilderBuilder.java

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,29 +78,40 @@ final class RuntimeBuilderConfigBuilder {
7878

7979
RuntimeBuilderBuilder appy() {
8080
impl = new BuildingRuntime(RuntimeBuilderBuilder.this, addModules,
81-
limitModules, options, startupInfos);
81+
limitModules, validatedOptions(), startupInfos);
8282
return RuntimeBuilderBuilder.this;
8383
}
8484

85-
public RuntimeBuilderConfigBuilder addModules(Set<String> v) {
85+
RuntimeBuilderConfigBuilder addModules(Set<String> v) {
8686
addModules = v;
8787
return this;
8888
}
8989

90-
public RuntimeBuilderConfigBuilder limitModules(Set<String> v) {
90+
RuntimeBuilderConfigBuilder limitModules(Set<String> v) {
9191
limitModules = v;
9292
return this;
9393
}
9494

95-
public RuntimeBuilderConfigBuilder options(List<String> v) {
95+
RuntimeBuilderConfigBuilder options(List<String> v) {
9696
options = v;
9797
return this;
9898
}
9999

100+
private List<String> validatedOptions() {
101+
return Optional.ofNullable(options).orElse(DEFAULT_JLINK_OPTIONS);
102+
}
103+
100104
private Set<String> addModules;
101105
private Set<String> limitModules;
102106
private List<String> options;
103107
private final List<LauncherStartupInfo> startupInfos;
108+
109+
private static final List<String> DEFAULT_JLINK_OPTIONS = List.of(
110+
"--strip-native-commands",
111+
"--strip-debug",
112+
"--no-man-pages",
113+
"--no-header-files"
114+
);
104115
}
105116

106117
private static RuntimeBuilder createCopyingRuntimeBuilder(Path runtimeDir,

0 commit comments

Comments
 (0)