From 2361490c8bf0f89d4e32b84e60aa7dcc10e85a64 Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Tue, 10 Aug 2021 20:18:59 -0700
Subject: [PATCH] Fixes for Android

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
---
 Code/Legacy/CryCommon/platform.h                                | 2 +-
 .../AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Code/Legacy/CryCommon/platform.h b/Code/Legacy/CryCommon/platform.h
index 88d06c9b1e..030fd4186e 100644
--- a/Code/Legacy/CryCommon/platform.h
+++ b/Code/Legacy/CryCommon/platform.h
@@ -192,7 +192,7 @@
 #else
     #if defined(WIN64)
         #include "Win64specific.h"
-    #elif defined(LINUX64)
+    #elif defined(LINUX64) && !defined(ANDROID)
         #include "Linux64Specific.h"
     #elif defined(MAC)
         #include "MacSpecific.h"
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
index 7dd2629bd0..44de9656d2 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
@@ -20,6 +20,7 @@
 #include <AzCore/std/parallel/shared_mutex.h>
 #include <AzCore/Asset/AssetCommon.h>
 #include <map>
+#include <unordered_map>
 
 #include <AzFramework/Font/FontInterface.h>
 #include <AzFramework/Scene/SceneSystemInterface.h>