From 3549db295e3732fa0e70652973881f0e801d96ab Mon Sep 17 00:00:00 2001
From: Junbo Liang <68558268+junbo75@users.noreply.github.com>
Date: Wed, 2 Jun 2021 11:36:20 -0700
Subject: [PATCH] [LYN-4184] AWSClientAuth, AWSCore and AWSMetrics don't have
 the expected target or alias defined (#1089)

[LYN-4184] AWSClientAuth, AWSCore and AWSMetrics don't have the expected target or alias defined
---
 Gems/AWSClientAuth/Code/CMakeLists.txt                  | 6 +++++-
 Gems/AWSCore/Code/CMakeLists.txt                        | 6 ++----
 Gems/AWSCore/Code/Include/Private/AWSCoreEditorModule.h | 6 +++---
 Gems/AWSCore/Code/Source/AWSCoreEditorModule.cpp        | 8 +++-----
 Gems/AWSCore/Code/Source/AWSCoreModule.cpp              | 2 --
 Gems/AWSCore/Code/awscore_editor_shared_files.cmake     | 2 --
 Gems/AWSMetrics/Code/CMakeLists.txt                     | 6 +++++-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Gems/AWSClientAuth/Code/CMakeLists.txt b/Gems/AWSClientAuth/Code/CMakeLists.txt
index 40f6e0fe36..3f85b6453e 100644
--- a/Gems/AWSClientAuth/Code/CMakeLists.txt
+++ b/Gems/AWSClientAuth/Code/CMakeLists.txt
@@ -56,9 +56,13 @@ ly_add_target(
         Gem::HttpRequestor
 )
 
-# servers and clients use the above module.
+# Load the "Gem::AWSClientAuth" module in all types of applications.
 ly_create_alias(NAME AWSClientAuth.Servers NAMESPACE Gem TARGETS Gem::AWSClientAuth)
 ly_create_alias(NAME AWSClientAuth.Clients NAMESPACE Gem TARGETS Gem::AWSClientAuth)
+if (PAL_TRAIT_BUILD_HOST_TOOLS)
+    ly_create_alias(NAME AWSClientAuth.Tools NAMESPACE Gem TARGETS Gem::AWSClientAuth)
+    ly_create_alias(NAME AWSClientAuth.Builders NAMESPACE Gem TARGETS Gem::AWSClientAuth)
+endif()
 
 ################################################################################
 # Tests
diff --git a/Gems/AWSCore/Code/CMakeLists.txt b/Gems/AWSCore/Code/CMakeLists.txt
index 46046c0791..7edb22124f 100644
--- a/Gems/AWSCore/Code/CMakeLists.txt
+++ b/Gems/AWSCore/Code/CMakeLists.txt
@@ -79,14 +79,12 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
         INCLUDE_DIRECTORIES
             PRIVATE
                 Include/Private
-        COMPILE_DEFINITIONS
-            PRIVATE
-                AWSCORE_EDITOR
         BUILD_DEPENDENCIES
             PRIVATE
                 AZ::AzCore
-                Gem::AWSCore.Static
                 Gem::AWSCore.Editor.Static
+        RUNTIME_DEPENDENCIES
+            Gem::AWSCore
     )
 
     ly_add_target(
diff --git a/Gems/AWSCore/Code/Include/Private/AWSCoreEditorModule.h b/Gems/AWSCore/Code/Include/Private/AWSCoreEditorModule.h
index 91a1af00d9..45a2c1f9f7 100644
--- a/Gems/AWSCore/Code/Include/Private/AWSCoreEditorModule.h
+++ b/Gems/AWSCore/Code/Include/Private/AWSCoreEditorModule.h
@@ -11,15 +11,15 @@
 
 #pragma once
 
-#include <AWSCoreModule.h>
+#include <AzCore/Module/Module.h>
 
 namespace AWSCore
 {
     class AWSCoreEditorModule
-        : public AWSCoreModule
+        :public AZ::Module
     {
     public:
-        AZ_RTTI(AWSCoreEditorModule, "{C1C9B898-848B-4C2F-A7AA-69642D12BCB5}", AWSCoreModule);
+        AZ_RTTI(AWSCoreEditorModule, "{C1C9B898-848B-4C2F-A7AA-69642D12BCB5}", AZ::Module);
         AZ_CLASS_ALLOCATOR(AWSCoreEditorModule, AZ::SystemAllocator, 0);
 
         AWSCoreEditorModule();
diff --git a/Gems/AWSCore/Code/Source/AWSCoreEditorModule.cpp b/Gems/AWSCore/Code/Source/AWSCoreEditorModule.cpp
index d8df1695c2..69e45bfd68 100644
--- a/Gems/AWSCore/Code/Source/AWSCoreEditorModule.cpp
+++ b/Gems/AWSCore/Code/Source/AWSCoreEditorModule.cpp
@@ -15,7 +15,6 @@
 namespace AWSCore
 {
     AWSCoreEditorModule::AWSCoreEditorModule()
-        : AWSCoreModule()
     {
         // Push results of [MyComponent]::CreateDescriptor() into m_descriptors here.
         m_descriptors.insert(m_descriptors.end(), {
@@ -28,10 +27,9 @@ namespace AWSCore
     */
     AZ::ComponentTypeList AWSCoreEditorModule::GetRequiredSystemComponents() const
     {
-        AZ::ComponentTypeList requiredComponents = AWSCoreModule::GetRequiredSystemComponents();
-        requiredComponents.push_back(azrtti_typeid<AWSCoreEditorSystemComponent>());
-
-        return requiredComponents;
+        return AZ::ComponentTypeList{
+            azrtti_typeid<AWSCoreEditorSystemComponent>()
+        };
     }
 
 }
diff --git a/Gems/AWSCore/Code/Source/AWSCoreModule.cpp b/Gems/AWSCore/Code/Source/AWSCoreModule.cpp
index 19a3ad4383..a80ca62b89 100644
--- a/Gems/AWSCore/Code/Source/AWSCoreModule.cpp
+++ b/Gems/AWSCore/Code/Source/AWSCoreModule.cpp
@@ -40,9 +40,7 @@ namespace AWSCore
 
 }
 
-#if !defined(AWSCORE_EDITOR)
 // DO NOT MODIFY THIS LINE UNLESS YOU RENAME THE GEM
 // The first parameter should be GemName_GemIdLower
 // The second should be the fully qualified name of the class above
 AZ_DECLARE_MODULE_CLASS(Gem_AWSCore, AWSCore::AWSCoreModule)
-#endif
diff --git a/Gems/AWSCore/Code/awscore_editor_shared_files.cmake b/Gems/AWSCore/Code/awscore_editor_shared_files.cmake
index 61ff9c3bf2..42cebe8dc4 100644
--- a/Gems/AWSCore/Code/awscore_editor_shared_files.cmake
+++ b/Gems/AWSCore/Code/awscore_editor_shared_files.cmake
@@ -11,7 +11,5 @@
 
 set(FILES
     Include/Private/AWSCoreEditorModule.h
-    Include/Private/AWSCoreModule.h
     Source/AWSCoreEditorModule.cpp
-    Source/AWSCoreModule.cpp
 )
diff --git a/Gems/AWSMetrics/Code/CMakeLists.txt b/Gems/AWSMetrics/Code/CMakeLists.txt
index aa790371d2..3e7118cb58 100644
--- a/Gems/AWSMetrics/Code/CMakeLists.txt
+++ b/Gems/AWSMetrics/Code/CMakeLists.txt
@@ -46,9 +46,13 @@ ly_add_target(
         Gem::AWSCore
 )
 
-# Servers and Clients use the above metrics module
+# Load the "Gem::AWSMetrics" module in all types of applications.
 ly_create_alias(NAME AWSMetrics.Servers NAMESPACE Gem TARGETS Gem::AWSMetrics)
 ly_create_alias(NAME AWSMetrics.Clients NAMESPACE Gem TARGETS Gem::AWSMetrics)
+if (PAL_TRAIT_BUILD_HOST_TOOLS)
+    ly_create_alias(NAME AWSMetrics.Tools NAMESPACE Gem TARGETS Gem::AWSMetrics)
+    ly_create_alias(NAME AWSMetrics.Builders NAMESPACE Gem TARGETS Gem::AWSMetrics)
+endif()
 
 ################################################################################
 # Tests