From e356003fb558374b6f1a2598cfe03a3fd3a49385 Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Tue, 14 Sep 2021 14:10:17 -0700
Subject: [PATCH] Fixes for VS < 17 and Android

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
---
 Gems/LyShine/Code/Source/Animation/AnimSplineTrack.h  | 8 ++++----
 Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.h | 8 ++++----
 cmake/Platform/Common/MSVC/Configurations_msvc.cmake  | 1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.h b/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.h
index bf49546916..414b1cb3cb 100644
--- a/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.h
+++ b/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.h
@@ -326,16 +326,16 @@ public:
         m_defaultValue = value;
     }
 
-    ColorB GetCustomColor() const override
+    ColorB GetCustomColor() const
     { return m_customColor; }
-    void SetCustomColor(ColorB color) override
+    void SetCustomColor(ColorB color)
     {
         m_customColor = color;
         m_bCustomColorSet = true;
     }
-    bool HasCustomColor() const override
+    bool HasCustomColor() const
     { return m_bCustomColorSet; }
-    void ClearCustomColor() override
+    void ClearCustomColor()
     { m_bCustomColorSet = false; }
 
     static void Reflect(AZ::SerializeContext* serializeContext) {}
diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.h b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.h
index d6f969b21d..6388c9709e 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.h
@@ -329,16 +329,16 @@ public:
         m_defaultValue = value;
     }
 
-    ColorB GetCustomColor() const override
+    ColorB GetCustomColor() const
     { return m_customColor; }
-    void SetCustomColor(ColorB color) override
+    void SetCustomColor(ColorB color)
     {
         m_customColor = color;
         m_bCustomColorSet = true;
     }
-    bool HasCustomColor() const override
+    bool HasCustomColor() const
     { return m_bCustomColorSet; }
-    void ClearCustomColor() override
+    void ClearCustomColor()
     { m_bCustomColorSet = false; }
 
     void SetMultiplier(float trackMultiplier) override
diff --git a/cmake/Platform/Common/MSVC/Configurations_msvc.cmake b/cmake/Platform/Common/MSVC/Configurations_msvc.cmake
index 8885624a81..a4d8533626 100644
--- a/cmake/Platform/Common/MSVC/Configurations_msvc.cmake
+++ b/cmake/Platform/Common/MSVC/Configurations_msvc.cmake
@@ -141,7 +141,6 @@ endif()
 ly_set(LY_CXX_SYSTEM_INCLUDE_CONFIGURATION_FLAG 
     /experimental:external # Turns on "external" headers feature for MSVC compilers
     /external:W0 # Set warning level in external headers to 0. This is used to suppress warnings 3rdParty libraries which uses the "system_includes" option in their json configuration
-    /analyze:external- # disable analysis on external headers
 )
 if(NOT CMAKE_INCLUDE_SYSTEM_FLAG_CXX)
     ly_set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX /external:I)