Merge branch 'Issue-308-firebase-module-support' into Issue-271-swift…

…-compilation-support
defold · Oct 20, 2023 · 943825f · 943825f
2 parents ac47a40 + 5e721bc
commit 943825f
Show file tree

Hide file tree

Showing 5 changed files with 566 additions and 74 deletions.
diff --git a/server/src/main/java/com/defold/extender/AsyncBuilder.java b/server/src/main/java/com/defold/extender/AsyncBuilder.java
@@ -37,6 +37,9 @@ public class AsyncBuilder {
     private long resultLifetime;
     private boolean keepJobDirectory = false;
 
+    private static final String DM_DEBUG_JOB_FOLDER = System.getenv("DM_DEBUG_JOB_FOLDER");
+    private static final String DM_DEBUG_KEEP_JOB_FOLDER = System.getenv("DM_DEBUG_KEEP_JOB_FOLDER");
+
     public AsyncBuilder(DefoldSdkService defoldSdkService,
                         DataCacheService dataCacheService,
                         GradleService gradleService,
@@ -48,7 +51,7 @@ public AsyncBuilder(DefoldSdkService defoldSdkService,
         this.gradleService = gradleService;
         this.cocoaPodsService = cocoaPodsService;
         this.jobResultLocation = new File(jobResultLocation);
-        this.keepJobDirectory = System.getenv("DM_DEBUG_KEEP_JOB_FOLDER") != null && System.getenv("DM_DEBUG_JOB_FOLDER") == null;
+        this.keepJobDirectory = (DM_DEBUG_KEEP_JOB_FOLDER != null) || (DM_DEBUG_JOB_FOLDER != null);
         this.resultLifetime = jobResultLifetime;
     }