[GR-47923] Clean up Native Image config files and options.

PullRequest: js/2893

Author: fniephaus

graal-js/ci.jsonnet

@@ -39,7 +39,7 @@ local ci = import '../ci.jsonnet';
   local nativeImageSmokeTest = checkoutJsBenchmarks + {
     suiteimports+:: ['substratevm'],
     nativeimages+:: ['lib:jsvm'],
-    extraimagebuilderarguments+:: ['-H:+TruffleCheckBlockListMethods', '-H:+ReportExceptionStackTraces'],
+    extraimagebuilderarguments+:: ['-H:+ReportExceptionStackTraces'],
     run+: [
       ['mx', 'build'],
       ['set-export', 'GRAALVM_HOME', ['mx', '--quiet', 'graalvm-home']],

graal-js/mx.graal-js/mx_graal_js.py

@@ -412,7 +412,7 @@ def is_included(path):
             launchers=['bin/<exe:js>'],
             jar_distributions=['graal-js:GRAALJS_LAUNCHER'],
             main_class='com.oracle.truffle.js.shell.JSLauncher',
-            build_args=['-H:+TruffleCheckBlockListMethods'],
+            build_args=[],
             build_args_enterprise=[
                 '-H:+AuxiliaryEngineCache',
                 '-H:ReservedAuxiliaryImageBytes=2145482548',

graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/svmnodejs.jniconfig renamed to graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/META-INF/native-image/com.oracle.truffle.trufflenode/jni-config.json

@@ -2,6 +2,4 @@ Requires = language:js
 
 Args = -H:MaxRuntimeCompileMethods=500 \
        -H:+ReportExceptionStackTraces \
-       -H:JNIConfigurationResources=svmnodejs.jniconfig \
-       -H:ReflectionConfigurationResources=svmnodejs.reflectconfig \
        --initialize-at-build-time=com.oracle.truffle.trufflenode

graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/svmnodejs.reflectconfig renamed to graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/META-INF/native-image/com.oracle.truffle.trufflenode/reflect-config.json

@@ -12,5 +12,4 @@ JavaArgs = -Dpolyglot.engine.PreinitializeContexts=js \
            -Dpolyglot.js.syntax-extensions=false
 
 Args = -H:MaxRuntimeCompileMethods=500 \
-       -H:Kind=SHARED_LIBRARY \
-       -H:+MultiThreaded
+       --shared