[LYN-6779] AWSNativeSDK update and AWSCore platform cmake update (#4231)

Signed-off-by: onecent1101 <liug@amazon.com>

Gems/AWSCore/Code/CMakeLists.txt

@@ -6,18 +6,18 @@
 #
 #
 
-ly_get_list_relative_pal_filename(pal_editor_include_dir ${CMAKE_CURRENT_LIST_DIR}/Include/Private/Editor/Platform/${PAL_PLATFORM_NAME})
+ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
-ly_get_list_relative_pal_filename(pal_cafile_include_dir ${CMAKE_CURRENT_LIST_DIR}/Source/Framework/Platform/${PAL_PLATFORM_NAME})
 
 ly_add_target(
     NAME AWSCore.Static STATIC
     NAMESPACE Gem
     FILES_CMAKE
         awscore_files.cmake
-         ${pal_cafile_include_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
+         ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
     INCLUDE_DIRECTORIES
         PUBLIC
             Include/Public
+            ${pal_dir}
         PRIVATE
             Include/Private
     BUILD_DEPENDENCIES
@@ -65,11 +65,11 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
         NAMESPACE Gem
         FILES_CMAKE
             awscore_editor_files.cmake
-            ${pal_editor_include_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
+            ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_editor_files.cmake
         INCLUDE_DIRECTORIES
             PRIVATE
                 Include/Private
-                ${pal_editor_include_dir}
+                ${pal_dir}
             PUBLIC
                 Include/Public
         BUILD_DEPENDENCIES
@@ -164,12 +164,12 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
             NAMESPACE Gem
             FILES_CMAKE
                 awscore_editor_tests_files.cmake
-                ${pal_editor_include_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
+                ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_editor_files.cmake
-                Tests/Editor/Platform/${PAL_PLATFORM_NAME}/awscore_editor_tests_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
+                ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_editor_tests_files.cmake
             INCLUDE_DIRECTORIES
                 PRIVATE
                     Include/Private
-                    ${pal_editor_include_dir}
+                    ${pal_dir}
                     Include/Public
                     Tests
             COMPILE_DEFINITIONS

Gems/AWSCore/Code/Include/Public/Framework/AWSApiJobConfig.h

@@ -13,12 +13,15 @@
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzCore/Memory/SystemAllocator.h>
 
+#include <AWSCore_Traits_Platform.h>
+
 // The AWS Native SDK AWSAllocator triggers a warning due to accessing members of std::allocator directly.
 // AWSAllocator.h(70): warning C4996: 'std::allocator<T>::pointer': warning STL4010: Various members of std::allocator are deprecated in C++17.
 // Use std::allocator_traits instead of accessing these members directly.
 // You can define _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING or _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS to acknowledge that you have received this warning.
 
 AZ_PUSH_DISABLE_WARNING(4251 4996, "-Wunknown-warning-option")
+#include <aws/core/client/ClientConfiguration.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/core/http/Scheme.h>
 #include <aws/core/Region.h>
@@ -136,7 +139,11 @@ namespace AWSCore
         Override<std::shared_ptr<Aws::Utils::RateLimits::RateLimiterInterface>> writeRateLimiter;
         Override<std::shared_ptr<Aws::Utils::RateLimits::RateLimiterInterface>> readRateLimiter;
         Override<Aws::Http::TransferLibType> httpLibOverride;
+#if AWSCORE_BACKWARD_INCOMPATIBLE_CHANGE
+        Override<Aws::Client::FollowRedirectsPolicy> followRedirects;
+#else
         Override<bool> followRedirects;
+#endif
         Override<Aws::String> caFile;
 
         /// Applys settings changes made after first use.

Gems/AWSCore/Code/Platform/Android/AWSCore_Traits_Android.h

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#define AWSCORE_BACKWARD_INCOMPATIBLE_CHANGE 1

Gems/AWSCore/Code/Platform/Android/AWSCore_Traits_Platform.h

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AWSCore_Traits_Android.h>

Gems/AWSCore/Code/Platform/Android/platform_android_files.cmake

@@ -0,0 +1,13 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(FILES
+    AWSCore_Traits_Platform.h
+    AWSCore_Traits_Android.h
+    GetCertsPath_Android.cpp
+)

Gems/AWSCore/Code/Platform/Linux/AWSCore_Traits_Linux.h

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#define AWSCORE_BACKWARD_INCOMPATIBLE_CHANGE 0

Gems/AWSCore/Code/Platform/Linux/AWSCore_Traits_Platform.h

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AWSCore_Traits_Linux.h>

Gems/AWSCore/Code/Platform/Linux/platform_linux_files.cmake

@@ -7,5 +7,7 @@
 #
 
 set(FILES
+    AWSCore_Traits_Platform.h
+    AWSCore_Traits_Linux.h
     ../Common/GetCertsPath_Null.cpp
 )

Gems/AWSCore/Code/Platform/Mac/AWSCore_Traits_Mac.h

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#define AWSCORE_BACKWARD_INCOMPATIBLE_CHANGE 0

Gems/AWSCore/Code/Platform/Mac/AWSCore_Traits_Platform.h

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AWSCore_Traits_Mac.h>

Gems/AWSCore/Code/Platform/Mac/platform_mac_editor_tests_files.cmake

@@ -7,5 +7,4 @@
 #
 
 set(FILES 
-    GetCertsPath_Android.cpp
 )

Gems/AWSCore/Code/Platform/Mac/platform_mac_files.cmake

@@ -7,5 +7,7 @@
 #
 
 set(FILES
+    AWSCore_Traits_Platform.h
+    AWSCore_Traits_Mac.h
     ../Common/GetCertsPath_Null.cpp
 )

Gems/AWSCore/Code/Platform/Windows/AWSCore_Traits_Platform.h

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AWSCore_Traits_Windows.h>

Gems/AWSCore/Code/Platform/Windows/AWSCore_Traits_Windows.h

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#define AWSCORE_BACKWARD_INCOMPATIBLE_CHANGE 0

Gems/AWSCore/Code/Platform/Windows/platform_windows_editor_tests_files.cmake

@@ -0,0 +1,19 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(FILES 
+    ../../Tests/Editor/AWSCoreEditorSystemComponentTest.cpp
+    ../../Tests/Editor/Attribution/AWSCoreAttributionManagerTest.cpp
+    ../../Tests/Editor/Attribution/AWSCoreAttributionMetricTest.cpp
+    ../../Tests/Editor/Attribution/AWSCoreAttributionSystemComponentTest.cpp
+    ../../Tests/Editor/Attribution/AWSAttributionServiceApiTest.cpp
+    ../../Tests/Editor/UI/AWSCoreEditorMenuTest.cpp
+    ../../Tests/Editor/UI/AWSCoreEditorUIFixture.h
+    ../../Tests/Editor/UI/AWSCoreResourceMappingToolActionTest.cpp
+    ../../Tests/Editor/AWSCoreEditorManagerTest.cpp
+)

Gems/AWSCore/Code/Platform/Windows/platform_windows_files.cmake

@@ -0,0 +1,13 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(FILES
+    AWSCore_Traits_Platform.h
+    AWSCore_Traits_Windows.h
+    ../Common/GetCertsPath_Null.cpp
+)

Gems/AWSCore/Code/Platform/iOS/AWSCore_Traits_Platform.h

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <AWSCore_Traits_iOS.h>

Gems/AWSCore/Code/Platform/iOS/AWSCore_Traits_iOS.h

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#define AWSCORE_BACKWARD_INCOMPATIBLE_CHANGE 0

Gems/AWSCore/Code/Platform/iOS/platform_ios_editor_tests_files.cmake

@@ -7,5 +7,4 @@
 #
 
 set(FILES 
-    ../Common/GetCertsPath_Null.cpp
 )

Gems/AWSCore/Code/Platform/iOS/platform_ios_files.cmake

@@ -7,5 +7,7 @@
 #
 
 set(FILES
+    AWSCore_Traits_Platform.h
+    AWSCore_Traits_iOS.h
     ../Common/GetCertsPath_Null.cpp
 )

Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp

@@ -78,7 +78,7 @@ namespace AWSCore
 
     void AWSCoreEditorMenu::InitializeResourceMappingToolAction()
     {
-#ifdef AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED
+#if AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED
         AWSCoreResourceMappingToolAction* resourceMappingTool =
             new AWSCoreResourceMappingToolAction(QObject::tr(AWSResourceMappingToolActionText), this);
         QObject::connect(resourceMappingTool, &QAction::triggered, this,

Gems/AWSCore/Code/Source/Framework/AWSApiJobConfig.cpp

@@ -12,16 +12,6 @@
 #include <AWSCoreBus.h>
 #include <Credential/AWSCredentialBus.h>
 
-// The AWS Native SDK AWSAllocator triggers a warning due to accessing members of std::allocator directly.
-// AWSAllocator.h(70): warning C4996: 'std::allocator<T>::pointer': warning STL4010: Various members of std::allocator are deprecated in C++17.
-// Use std::allocator_traits instead of accessing these members directly.
-// You can define _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING or _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS to acknowledge that you have received this warning.
-
-AZ_PUSH_DISABLE_WARNING(4251 4996, "-Wunknown-warning-option")
-#include <aws/core/client/ClientConfiguration.h>
-AZ_POP_DISABLE_WARNING
-
-
 namespace AWSCore
 {
     void AwsApiJobConfig::ApplySettings()

Gems/AWSCore/Code/Tests/Editor/Platform/Windows/awscore_editor_tests_windows_files.cmake

@@ -1,19 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES 
-    ../../AWSCoreEditorSystemComponentTest.cpp
-    ../../Attribution/AWSCoreAttributionManagerTest.cpp
-    ../../Attribution/AWSCoreAttributionMetricTest.cpp
-    ../../Attribution/AWSCoreAttributionSystemComponentTest.cpp
-    ../../Attribution/AWSAttributionServiceApiTest.cpp
-    ../../UI/AWSCoreEditorMenuTest.cpp
-    ../../UI/AWSCoreEditorUIFixture.h
-    ../../UI/AWSCoreResourceMappingToolActionTest.cpp
-    ../../AWSCoreEditorManagerTest.cpp
-)

cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake

@@ -18,7 +18,7 @@ ly_associate_package(PACKAGE_NAME lux_core-2.2-rev5-multiplatform    TARGETS lux
 # platform-specific:
 ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-rev2-android         TARGETS tiff            PACKAGE_HASH 252b99e5886ec59fdccf38603c1399dd3fc02d878641aba35a7f8d2504065a06)
 ly_associate_package(PACKAGE_NAME freetype-2.10.4.16-android         TARGETS freetype        PACKAGE_HASH df9e4d559ea0f03b0666b48c79813b1cd4d9624429148a249865de9f5c2c11cd)
-ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev6-android  TARGETS AWSNativeSDK    PACKAGE_HASH 1624ba9aaf03d001ed0ffc57d2f945ff82590e75a7ea868de35043cf673e82fb)
+ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.9.50-rev1-android   TARGETS AWSNativeSDK    PACKAGE_HASH 33771499f9080cbaab613459927e52911e68f94fa356397885e85005efbd1490)
 ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-android             TARGETS Lua             PACKAGE_HASH 1f638e94a17a87fe9e588ea456d5893876094b4db191234380e4c4eb9e06c300)
 ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev3-android  TARGETS PhysX           PACKAGE_HASH b8cb6aa46b2a21671f6cb1f6a78713a3ba88824d0447560ff5ce6c01014b9f43)
 ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-android          TARGETS mikkelsen       PACKAGE_HASH 075e8e4940884971063b5a9963014e2e517246fa269c07c7dc55b8cf2cd99705)

cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake

@@ -19,7 +19,7 @@ ly_associate_package(PACKAGE_NAME lux_core-2.2-rev5-multiplatform    TARGETS lux
 # platform-specific:
 ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-rev2-ios         TARGETS tiff            PACKAGE_HASH d864beb0c955a55f28c2a993843afb2ecf6e01519ddfc857cedf34fc5db68d49)
 ly_associate_package(PACKAGE_NAME freetype-2.10.4.16-ios         TARGETS freetype        PACKAGE_HASH 3ac3c35e056ae4baec2e40caa023d76a7a3320895ef172b6655e9261b0dc2e29)
-ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev3-ios  TARGETS AWSNativeSDK    PACKAGE_HASH 1246219a213ccfff76b526011febf521586d44dbc1753e474f8fb5fd861654a4)
+ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev4-ios  TARGETS AWSNativeSDK    PACKAGE_HASH d10e7496ca705577032821011beaf9f2507689f23817bfa0ed4d2a2758afcd02)
 ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-ios             TARGETS Lua             PACKAGE_HASH c2d3c4e67046c293049292317a7d60fdb8f23effeea7136aefaef667163e5ffe)
 ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev3-ios  TARGETS PhysX           PACKAGE_HASH b1bbc1fc068d2c6e1eb18eecd4e8b776adc516833e8da3dcb1970cef2a8f0cbd)
 ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-ios          TARGETS mikkelsen       PACKAGE_HASH 976aaa3ccd8582346132a10af253822ccc5d5bcc9ea5ba44d27848f65ee88a8a)