Fix for Linux log failure

Author: a-maurice

scripts/gha/desktop_tester.py

@@ -133,7 +133,11 @@ def run(self):
     open_process.kill()
     if platform.system() == 'Linux':
       # Linux seems to have a problem printing out too much information, so truncate it
-      logging.info("Test result: %s (Log might be truncated)", self.logs[:64000])
+      # It can also fail to save the logs correctly for some reason, so check for that
+      if self.logs is None:
+        logging.warning("Unable to print the logs")
+      else:
+        logging.info("Test result: %s (Log might be truncated)", self.logs[:64000])
     else:
       logging.info("Test result: %s", self.logs)
     logging.info("Finished running %s", self.testapp_path)

scripts/gha/integration_testing/AppBuilderHelper.cs

@@ -126,17 +126,13 @@ static AppBuilderHelper() {
         continue;
       }
     }
-    // This will set the appropriate values in Unity Preferences -> External Tools.
-    //SetUnityPrefWithEnvVar(ANDROID_SDK_KEY, ANDROID_SDK_ENVVAR);
-    //SetUnityPrefWithEnvVar(ANDROID_NDK_KEY, ANDROID_NDK_ENVVAR);
-    //SetUnityPrefWithEnvVar(ANDROID_JDK_KEY, ANDROID_JDK_ENVVAR);
 #if UNITY_ANDROID 
 #if UNITY_2019_3_OR_NEWER
-    // Unity 2019.3+ introduced new method of set values in Unity Preferences -> External Tools
-    AndroidExternalToolsSettings.sdkRootPath = null; //System.Environment.GetEnvironmentVariable(ANDROID_SDK_ENVVAR);
-    AndroidExternalToolsSettings.ndkRootPath = null; //System.Environment.GetEnvironmentVariable(ANDROID_NDK_ENVVAR);
-    AndroidExternalToolsSettings.jdkRootPath = null; //System.Environment.GetEnvironmentVariable(ANDROID_JDK_ENVVAR);
-    AndroidExternalToolsSettings.gradlePath = null; // use default Gradle tool integrated in Unity
+    // Make sure it uses the default Android tools installed with Unity.
+    AndroidExternalToolsSettings.sdkRootPath = null;
+    AndroidExternalToolsSettings.ndkRootPath = null;
+    AndroidExternalToolsSettings.jdkRootPath = null;
+    AndroidExternalToolsSettings.gradlePath = null;
 #endif
 #endif
   }