diff --git a/build.gradle.kts b/build.gradle.kts index 3f5bb9c5..71b34c49 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -34,7 +34,6 @@ graalvmNative { buildArgs.add("-J-Dfile.encoding=UTF-8") buildArgs.add("-march=compatibility") resources.autodetect() - configurationFileDirectories.from(file("graalvm-config-dir")) if (System.getenv("GRAALVM_HOME") == null) { toolchainDetection.set(true) javaLauncher.set(javaToolchains.launcherFor { diff --git a/run_tests.sh b/run_tests.sh index 6753ad6f..3ca4f808 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -261,6 +261,6 @@ fi run_main -a "$NUMBER_2" deleteLocalAccountData || true if [ ! -z "$GRAALVM_HOME" ]; then - "$GRAALVM_HOME"/lib/svm/bin/native-image-configure generate --input-dir=graalvm-config-dir/ --input-dir=graalvm-config-dir-linked/ --input-dir=graalvm-config-dir-main/ --output-dir=graalvm-config-dir// + "$GRAALVM_HOME"/lib/svm/bin/native-image-configure generate --input-dir=src/main/resources/META-INF/native-image/org.asamk/signal-cli/ --input-dir=graalvm-config-dir-linked/ --input-dir=graalvm-config-dir-main/ --output-dir=src/main/resources/META-INF/native-image/org.asamk/signal-cli/ rm -r graalvm-config-dir-main graalvm-config-dir-linked fi diff --git a/graalvm-config-dir/reachability-metadata.json b/src/main/resources/META-INF/native-image/org.asamk/signal-cli/reachability-metadata.json similarity index 100% rename from graalvm-config-dir/reachability-metadata.json rename to src/main/resources/META-INF/native-image/org.asamk/signal-cli/reachability-metadata.json