From 50ee3fd0734a59247af0782759d03ceb74ebf129 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 29 Jul 2026 21:32:49 +0200
Subject: [PATCH] Fix build regressions

---
 Source/Engine/Engine/CommandLine.cpp               | 2 +-
 Source/Engine/Platform/Android/AndroidPlatform.cpp | 2 +-
 Source/Tools/Flax.Build/CommandLine.cs             | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Source/Engine/Engine/CommandLine.cpp b/Source/Engine/Engine/CommandLine.cpp
index 0afcdaac9..696f378aa 100644
--- a/Source/Engine/Engine/CommandLine.cpp
+++ b/Source/Engine/Engine/CommandLine.cpp
@@ -152,7 +152,7 @@ bool CommandLine::Parse(const StringView& commandLine, Array<Arg>& args)
         int32 nameStart = i;
         while (i < length && commandLine[i] != '-' && commandLine[i] != '=' && !StringUtils::IsWhitespace(commandLine[i]))
             i++;
-        if (wholeQuote)
+        if (wholeQuote && commandLine[i] == '\"')
             i--;
         int32 nameEnd = i;
         StringView name = commandLine.Substring(nameStart, nameEnd - nameStart);
diff --git a/Source/Engine/Platform/Android/AndroidPlatform.cpp b/Source/Engine/Platform/Android/AndroidPlatform.cpp
index 9f4a2d5d1..03040a864 100644
--- a/Source/Engine/Platform/Android/AndroidPlatform.cpp
+++ b/Source/Engine/Platform/Android/AndroidPlatform.cpp
@@ -917,7 +917,7 @@ bool AndroidPlatform::Init()
         DeviceId.C = (uint32)Platform::GetMemoryStats().TotalPhysicalMemory;
 
         // D - cpuid
-        DeviceId.D = (uint32)AndroidCpu.ClockSpeed * AndroidCpu.LogicalProcessorCount * AndroidCpu.ProcessorCoreCount * AndroidCpu.CacheLineSize;
+        DeviceId.D = (uint32)CpuInfo.ClockSpeed * CpuInfo.LogicalProcessorCount * CpuInfo.ProcessorCoreCount * CpuInfo.CacheLineSize;
     }
 
     AndroidRegisterCrashHandling();
diff --git a/Source/Tools/Flax.Build/CommandLine.cs b/Source/Tools/Flax.Build/CommandLine.cs
index 523134618..dabd727b0 100644
--- a/Source/Tools/Flax.Build/CommandLine.cs
+++ b/Source/Tools/Flax.Build/CommandLine.cs
@@ -253,9 +253,8 @@ namespace Flax.Build
                     i++;
                 if (i == length)
                     break;
-                if (commandLine[i] == '-')
-                    i++;
-                else if (commandLine[i] == '/')
+                var hasArgPrefix = commandLine[i] == '-' || commandLine[i] == '/';
+                if (hasArgPrefix)
                     i++;
 
                 // Skip white space
@@ -266,7 +265,7 @@ namespace Flax.Build
                 int nameStart = i;
                 while (i < length && commandLine[i] != '-' && commandLine[i] != '=' && !char.IsWhiteSpace(commandLine[i]))
                     i++;
-                if (wholeQuote)
+                if (wholeQuote && commandLine[i] == '\"')
                     i--;
                 int nameEnd = i;
                 string name = commandLine.Substring(nameStart, nameEnd - nameStart);