Add more config generated by agent

hummans · Jan 23, 2021 · b4311c7 · b4311c7
1 parent de3b077
commit b4311c7
Show file tree

Hide file tree

Showing 5 changed files with 488 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -83,19 +83,18 @@ dependencies. If you have a recent gradle version installed, you can replace `./
 
         ./gradlew distTar
 
-### Building a native binary with GraalVM
+### Building a native binary with GraalVM (EXPERIMENTAL)
 
 It is possible to build a native binary with [GraalVM](https://www.graalvm.org).
+This is still experimental and will not work in all situations.
 
 1. [Install GraalVM and setup the enviroment](https://www.graalvm.org/docs/getting-started/#install-graalvm)
 2. [Install prerequisites](https://www.graalvm.org/reference-manual/native-image/#prerequisites)
-2. Execute Gradle:
+3. Execute Gradle:
 
-        ./gradle nativeImage
+        ./gradlew assembleNativeImage
 
-   The binary is available at
-
-        build/native-image/signal-cli
+   The binary is available at *build/native-image/signal-cli*
 
 ## Troubleshooting
 If you use a version of the Oracle JRE and get an InvalidKeyException you need to enable unlimited strength crypto. See https://stackoverflow.com/questions/6481627/java-security-illegal-key-size-or-default-parameters for instructions.

diff --git a/build.gradle b/build.gradle
@@ -75,8 +75,8 @@ task checkLibVersions {
     }
 }
 
-task buildNativeBinary {
-    dependsOn("build")
+task assembleNativeImage {
+    dependsOn("assemble")
     doLast {
         def graalVMHome = System.getenv("GRAALVM_HOME")
         if (!graalVMHome) {
@@ -92,18 +92,16 @@ task buildNativeBinary {
             commandLine "$graalVMHome/bin/native-image",
                         "-H:Path=$nativeBinaryOutputPath",
                         "-H:Name=$nativeBinaryName",
-                        "-H:JNIConfigurationFiles=",
-                        "-H:DynamicProxyConfigurationFiles=",
-                        "-H:ReflectionConfigurationFiles=",
-                        "-H:ResourceConfigurationFiles=",
+                        "-H:JNIConfigurationFiles=graalvm-config-dir/jni-config.json",
+                        "-H:DynamicProxyConfigurationFiles=graalvm-config-dir/proxy-config.json",
+                        "-H:ResourceConfigurationFiles=graalvm-config-dir/resource-config.json",
+                        "-H:ReflectionConfigurationFiles=graalvm-config-dir/reflect-config.json",
                         "--no-fallback",
                         "--allow-incomplete-classpath",
                         "--report-unsupported-elements-at-runtime",
                         "--enable-url-protocols=http,https",
                         "--enable-https",
                         "--enable-all-security-services",
-                        "-H:ResourceConfigurationFiles=graalvm-config-dir/resource-config.json",
-                        "-H:ReflectionConfigurationFiles=graalvm-config-dir/reflect-config.json",
                         "-cp",
                         sourceSets.main.runtimeClasspath.asPath,
                         project.mainClassName

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
@@ -0,0 +1,13 @@
+[
+{
+  "name":"java.lang.ClassLoader",
+  "methods":[{"name":"getPlatformClassLoader","parameterTypes":[] }]
+},
+{
+  "name":"java.lang.NoSuchMethodError"
+},
+{
+  "name":"java.lang.UnsatisfiedLinkError",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+}
+]
diff --git a/graalvm-config-dir/proxy-config.json b/graalvm-config-dir/proxy-config.json
@@ -0,0 +1,3 @@
+[
+  ["org.freedesktop.DBus"]
+]