From 2a42654df7a90a64d6a1a428a35d68105e8a18d1 Mon Sep 17 00:00:00 2001
From: puvvadar <puvvadar@amazon.com>
Date: Thu, 21 Oct 2021 14:36:51 -0700
Subject: [PATCH 1/2] Fix usages of AZStd::bitset not being found by serialize
 context

Signed-off-by: puvvadar <puvvadar@amazon.com>
---
 .../AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h          | 3 ++-
 .../Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantKey.h    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h
index c85c45dd3e..5a57fa1e72 100644
--- a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h
+++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h
@@ -10,12 +10,13 @@
 #pragma once
 
 #include <AzCore/Debug/TraceMessageBus.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/AZStdContainers.inl>
 #include <AzCore/std/string/regex.h>
 #include <AzCore/std/string/string.h>
 #include <AzCore/std/containers/vector.h>
 #include <AzCore/std/parallel/atomic.h>
 #include <AzCore/Asset/AssetCommon.h>
-#include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/std/containers/bitset.h>
 #include <AzFramework/Asset/AssetProcessorMessages.h>
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantKey.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantKey.h
index 74826d9f24..6dbfaaa948 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantKey.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantKey.h
@@ -7,6 +7,7 @@
  */
 #pragma once
 
+#include <AzCore/Serialization/AZStdContainers.inl>
 #include <AzCore/std/containers/bitset.h>
 
 #include <Atom/RHI.Reflect/Handle.h>

From 94f27fc2798bf026764e2c9ca7ad35649a7907f3 Mon Sep 17 00:00:00 2001
From: puvvadar <puvvadar@amazon.com>
Date: Fri, 22 Oct 2021 11:26:12 -0700
Subject: [PATCH 2/2] Add SerializeContext include for nounity builds

Signed-off-by: puvvadar <puvvadar@amazon.com>
---
 .../RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantKey.h  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantKey.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantKey.h
index 6dbfaaa948..e7a0672931 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantKey.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Shader/ShaderVariantKey.h
@@ -7,6 +7,7 @@
  */
 #pragma once
 
+#include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/AZStdContainers.inl>
 #include <AzCore/std/containers/bitset.h>