merge stabilization/2106 into development

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-06 17:34:04 +01:00
parent eb0b7346c4 5fdb33b1d7
commit 2ea9bfb144
377 changed files with 6549 additions and 9214 deletions
@@ -49,14 +49,7 @@ set(ENABLED_GEMS
    HttpRequestor
    Atom_AtomBridge
    PythonCoverage
+    AWSCore
+    AWSClientAuth
+    AWSMetrics
 )
-
-# TODO remove conditional add once AWSNativeSDK libs are fixed for Android and Linux Monolithic release.
-set(aws_excluded_platforms Android)
-if (NOT (LY_MONOLITHIC_GAME AND ${PAL_PLATFORM_NAME} IN_LIST aws_excluded_platforms))
-    list(APPEND ENABLED_GEMS
-        AWSCore
-        AWSClientAuth
-        AWSMetrics
-    )
-endif()