From dd80668da0b48dc9136c570cfef8ab768224c499 Mon Sep 17 00:00:00 2001
From: Aaron Ruiz Mora <moraaar@amazon.com>
Date: Mon, 17 May 2021 19:41:32 +0100
Subject: [PATCH] Fix iOS and android compilation errors from nightly build

---
 .../Android/AzCore/Module/DynamicModuleHandle_Android.cpp     | 1 +
 .../Platform/iOS/AzCore/Module/DynamicModuleHandle_iOS.cpp    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Code/Framework/AzCore/Platform/Android/AzCore/Module/DynamicModuleHandle_Android.cpp b/Code/Framework/AzCore/Platform/Android/AzCore/Module/DynamicModuleHandle_Android.cpp
index 30ec08538a..ec97727148 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/Module/DynamicModuleHandle_Android.cpp
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/Module/DynamicModuleHandle_Android.cpp
@@ -11,6 +11,7 @@
 */
 
 #include <AzCore/std/string/osstring.h>
+#include <AzCore/Utils/Utils.h>
 #include <dlfcn.h>
 
 namespace AZ
diff --git a/Code/Framework/AzCore/Platform/iOS/AzCore/Module/DynamicModuleHandle_iOS.cpp b/Code/Framework/AzCore/Platform/iOS/AzCore/Module/DynamicModuleHandle_iOS.cpp
index 569aae6f53..53514c89e4 100644
--- a/Code/Framework/AzCore/Platform/iOS/AzCore/Module/DynamicModuleHandle_iOS.cpp
+++ b/Code/Framework/AzCore/Platform/iOS/AzCore/Module/DynamicModuleHandle_iOS.cpp
@@ -39,8 +39,8 @@ namespace AZ
             // Append .framework to the name of full path
             // Afterwards use the AZ::IO::Path Append function append the filename as a child
             // of the framework directory
-            AZ::IO::FixedMaxPathString fileName = fullPath.Filename().Native();
-            fullPath.ReplaceFilename(fileName + ".framework");
+            AZ::IO::FixedMaxPathString fileName{ fullPath.Filename().Native() };
+            fullPath.ReplaceFilename(AZ::IO::PathView((fileName + ".framework").c_str()));
             fullPath /= fileName;
         }
     }