From 8f9ab6e8ff10c5226ca6315da7346e9d6774be5a Mon Sep 17 00:00:00 2001
From: Kevin Ring <kevin@kotachrome.com>
Date: Thu, 15 Aug 2024 07:57:02 +1000
Subject: [PATCH] Changes from review.

---
 Editor/CompileCesiumForUnityNative.cs       | 28 ++++++++-------------
 native~/Editor/src/CesiumIonSessionImpl.cpp |  2 +-
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/Editor/CompileCesiumForUnityNative.cs b/Editor/CompileCesiumForUnityNative.cs
index 9afad04f..1b8657ab 100644
--- a/Editor/CompileCesiumForUnityNative.cs
+++ b/Editor/CompileCesiumForUnityNative.cs
@@ -550,29 +550,23 @@ private static void ConfigureEnvironmentVariables(IDictionary<string, string> en
             }
 #endif
 
-            // If the NDK root has a space in it, this will confuse broken software like OpenSSL's build process.
-            // So map a drive letter and rewrite the path.
-            if (ndkRoot != null && ndkRoot.Contains(' '))
-            {
-                if (!Directory.Exists("N:\\"))
-                {
-                    Process.Start("subst", "N: \"" + ndkRoot + "\"").WaitForExit();
-                }
-
-                ndkRoot = "N:\\";
-            }
-
             // On Windows, use the make program included in the NDK. Because Visual Studio (which is usually
             // the default) won't work to build for Android.
             if (library.Platform == BuildTarget.Android && Environment.OSVersion.Platform == PlatformID.Win32NT)
             {
                 library.ExtraConfigureArgs.Add("-G Ninja");
 
-                // if (!string.IsNullOrEmpty(ndkRoot))
-                // {
-                //     string make = Path.Combine(ndkRoot, "prebuilt", "windows-x86_64", "bin", "make.exe").Replace('\\', '/');
-                //     library.ExtraConfigureArgs.Add($"-DCMAKE_MAKE_PROGRAM=\"{make}\"");
-                // }
+                // If the NDK root has a space in it, this will confuse broken software like OpenSSL's build process.
+                // So map a drive letter and rewrite the path.
+                if (ndkRoot != null && ndkRoot.Contains(' '))
+                {
+                    if (!Directory.Exists("N:\\"))
+                    {
+                        Process.Start("subst", "N: \"" + ndkRoot + "\"").WaitForExit();
+                    }
+
+                    ndkRoot = "N:\\";
+                }
             }
 
             if (!string.IsNullOrEmpty(ndkRoot))
diff --git a/native~/Editor/src/CesiumIonSessionImpl.cpp b/native~/Editor/src/CesiumIonSessionImpl.cpp
index 0c92a2db..669c1c16 100644
--- a/native~/Editor/src/CesiumIonSessionImpl.cpp
+++ b/native~/Editor/src/CesiumIonSessionImpl.cpp
@@ -789,7 +789,7 @@ CesiumAsync::Future<bool> CesiumIonSessionImpl::ensureAppDataLoaded(
               CesiumIonClient::Response<CesiumIonClient::ApplicationData>&&
                   appData) {
             CesiumAsync::Promise<bool> promise =
-                _asyncSystem.createPromise<bool>();
+                asyncSystem.createPromise<bool>();
 
             if (session == nullptr) {
               UnityEngine::Debug::LogError(