From e19f1c0147ac3883f471019636972a18455f4309 Mon Sep 17 00:00:00 2001
From: nvsickle <nvsickle@amazon.com>
Date: Thu, 20 May 2021 17:09:05 -0700
Subject: [PATCH] Ensure AtomFont loads with the Editor

-Use PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE which will correctly be set to GEM_MODULE to get loaded at runtime with non-monolithic builds instead of PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE
-Removed the unneeded entries from AutomatedTesting's runtime config now that this is fixed (AtomBridge will bring it in again)
---
 AutomatedTesting/Gem/Code/runtime_dependencies.cmake | 1 -
 AutomatedTesting/Gem/Code/tool_dependencies.cmake    | 1 -
 Gems/AtomLyIntegration/AtomFont/Code/CMakeLists.txt  | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/AutomatedTesting/Gem/Code/runtime_dependencies.cmake b/AutomatedTesting/Gem/Code/runtime_dependencies.cmake
index 15715f2136..33c2bf8d5f 100644
--- a/AutomatedTesting/Gem/Code/runtime_dependencies.cmake
+++ b/AutomatedTesting/Gem/Code/runtime_dependencies.cmake
@@ -43,7 +43,6 @@ set(GEM_DEPENDENCIES
     Gem::GradientSignal
     Gem::Vegetation
     Gem::Atom_AtomBridge
-    Gem::AtomFont
     Gem::NvCloth
     Gem::Blast
     Gem::AWSCore
diff --git a/AutomatedTesting/Gem/Code/tool_dependencies.cmake b/AutomatedTesting/Gem/Code/tool_dependencies.cmake
index 1c0db5753b..c8eccab947 100644
--- a/AutomatedTesting/Gem/Code/tool_dependencies.cmake
+++ b/AutomatedTesting/Gem/Code/tool_dependencies.cmake
@@ -55,7 +55,6 @@ set(GEM_DEPENDENCIES
     Gem::Atom_RHI.Private
     Gem::Atom_Feature_Common.Editor
     Gem::Atom_AtomBridge.Editor
-    Gem::AtomFont
     Gem::NvCloth.Editor
     Gem::Blast.Editor
     Gem::AWSCore.Editor
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomFont/Code/CMakeLists.txt
index 1066cc33e8..d3b8c8cde7 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomFont/Code/CMakeLists.txt
@@ -12,7 +12,7 @@
 ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
 
 ly_add_target(
-    NAME AtomFont ${PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE}
+    NAME AtomFont ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
     NAMESPACE Gem
     FILES_CMAKE
         atomfont_files.cmake