[GR-7849] [GR-8810] Add basic support for standalone native launcher …

…outside of GraalVM. PullRequest: graal/1144
Utowoo · Mar 26, 2018 · ac78c6f · ac78c6f
2 parents 85309ca + dfaa6ac
commit ac78c6f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java
@@ -61,20 +61,22 @@ protected final void launch(String[] args) {
         }
     }
 
+    protected static final boolean IN_GRAALVM = !Boolean.getBoolean("org.graalvm.launcher.standalone");
+
     final void launch(List<String> args, Map<String, String> defaultOptions, boolean doNativeSetup) {
         Map<String, String> polyglotOptions = defaultOptions;
         if (polyglotOptions == null) {
             polyglotOptions = new HashMap<>();
         }
 
-        if (isAOT() && doNativeSetup) {
+        if (isAOT() && doNativeSetup && IN_GRAALVM) {
             assert nativeAccess != null;
             nativeAccess.setGraalVMProperties();
         }
 
         List<String> unrecognizedArgs = preprocessArguments(args, polyglotOptions);
 
-        if (isAOT() && doNativeSetup) {
+        if (isAOT() && doNativeSetup && IN_GRAALVM) {
             assert nativeAccess != null;
             nativeAccess.maybeExec(args, false, polyglotOptions, getDefaultVMType());
         }