From da035ecd04603b3846d92f4cae843b84f503a0cb Mon Sep 17 00:00:00 2001 From: Foivos Zakkak Date: Wed, 30 Jun 2021 13:39:33 +0300 Subject: [PATCH] Remove newly added truffle dependencies & update jvmti-agent-base location https://github.com/oracle/graal/commit/1e639c93bdd56031fffc8b45f48bde3ec4f6fb11 introduces some more dependencies on Truffle that Mandrel doesn't really depend on https://github.com/oracle/graal/commit/d81403ae7725610dc809b1d9a61797b15f5632de change the location of the jvmti-agent-base.jar Both changes were part of https://github.com/oracle/graal/pull/3446 --- build.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.java b/build.java index 9e4aca88..1c4f3115 100644 --- a/build.java +++ b/build.java @@ -799,6 +799,9 @@ static void removeDependencies(Tasks.FileReplace.Effects effects, Function 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", @@ -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")) );