Skip to content

Commit

Permalink
Remove newly added truffle dependencies & update jvmti-agent-base loc…
Browse files Browse the repository at this point in the history
…ation

oracle/graal@1e639c9
introduces some more dependencies on Truffle that Mandrel doesn't really
depend on

oracle/graal@d81403a
change the location of the jvmti-agent-base.jar

Both changes were part of oracle/graal#3446
  • Loading branch information
zakkak committed Jun 30, 2021
1 parent 0419b75 commit da035ec
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion build.java
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,9 @@ static void removeDependencies(Tasks.FileReplace.Effects effects, Function<Path,
final List<String> dependencies = Arrays.asList(
"truffle:TRUFFLE_NFI",
"com.oracle.svm.truffle",
"com.oracle.svm.truffle.api to org.graalvm.truffle",
"com.oracle.truffle.api.TruffleLanguage.Provider",
"com.oracle.truffle.api.instrumentation.TruffleInstrument.Provider",
"com.oracle.svm.polyglot",
"truffle:TRUFFLE_API",
"com.oracle.svm.truffle.nfi",
Expand Down Expand Up @@ -1095,7 +1098,7 @@ class Maven
new SimpleEntry<>("compiler", Path.of("compiler", "mxbuild", "dists", "jdk11", "graal")),
new SimpleEntry<>("objectfile", Path.of("substratevm", "mxbuild", "dists", "jdk11", "objectfile")),
new SimpleEntry<>("svm-driver", Path.of("substratevm", "mxbuild", "dists", "jdk11", "svm-driver")),
new SimpleEntry<>("jvmti-agent-base", Path.of("substratevm", "mxbuild", "dists", "jdk1.8", "jvmti-agent-base")),
new SimpleEntry<>("jvmti-agent-base", Path.of("substratevm", "mxbuild", "dists", "jdk11", "jvmti-agent-base")),
new SimpleEntry<>("svm-agent", Path.of("substratevm", "mxbuild", "dists", "jdk11", "svm-agent")),
new SimpleEntry<>("svm-diagnostics-agent", Path.of("substratevm", "mxbuild", "dists", "jdk1.8", "svm-diagnostics-agent"))
);
Expand Down

0 comments on commit da035ec

Please sign in to comment.