Skip to content

Commit c7f3d9c

Browse files
author
Aleksandar Gradinac
committed
Support enabling the agent in the DSL
1 parent cd1d951 commit c7f3d9c

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/NativeImagePlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ private static Provider<String> agentProperty(Project project, AgentOptions opti
523523
}
524524
return options.getDefaultMode().get();
525525
})
526-
.orElse(project.provider(() -> "disabled"));
526+
.orElse(options.getEnabled().map(enabled -> enabled ? options.getDefaultMode().get() : "disabled"));
527527
}
528528

529529
private static void registerServiceProvider(Project project, Provider<NativeImageService> nativeImageServiceProvider) {

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/dsl/agent/AgentOptions.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,13 @@ default void modes(Action<? super AgentModeOptions> spec) {
7272
@Optional
7373
Property<String> getDefaultMode();
7474

75+
/**
76+
* Enables the agent.
77+
*/
78+
@Input
79+
@Optional
80+
Property<Boolean> getEnabled();
81+
7582
/**
7683
* Caller-filter files that will be passed to the agent.
7784
*/

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/internal/DefaultGraalVmExtension.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public DefaultGraalVmExtension(NamedDomainObjectContainer<NativeImageOptions> na
7878
AgentOptions agentOpts = getAgent();
7979
agentOpts.getTasksToInstrumentPredicate().convention(t -> true);
8080
agentOpts.getDefaultMode().convention("standard");
81+
agentOpts.getEnabled().convention(false);
8182
agentOpts.getModes().getConditional().getParallel().convention(true);
8283
agentOpts.getMetadataCopy().getMergeWithExisting().convention(false);
8384
agentOpts.getFilterableEntries().convention(Arrays.asList("org.gradle.", "java.", "org.junit."));

0 commit comments

Comments
 (0)