Browse Source

AWS C++ SDK 1.11.144 (Sans Android) (#218)

AWS C++ SDK upgrade from 1.9 to 1.11 in order to support GameLift 5.1.1
Leaving Android back at 1.9 due to a bug: [Errors when building for
Android · Issue #2452 · aws/aws-sdk-cpp
(github.com)](https://github.com/aws/aws-sdk-cpp/issues/2452)

AWS MobileAnalytics no longer exists and was replaced by AWS Pinpoint.
Removing MobileAnalytics and can bring back AWS Pinpoint at a later date
if desired.

Pass AWSCore.Tests
Pass AWSClientAuth.Tests
Pass AWSGameLift.Client.Tests
Pass AWSGameLift.Server.Tests
Pass AWSMetrics.Tests

Deployed GameLift server on Windows and Linux
Gene Walters 1 year ago
parent
commit
7901137c1e

+ 0 - 40
package-system/AWSNativeSDK/AWSNativeSDK-1.9.50-ios.patch

@@ -1,40 +0,0 @@
-diff --git a/crt/aws-crt-cpp/include/aws/crt/io/TlsOptions.h b/crt/aws-crt-cpp/include/aws/crt/io/TlsOptions.h
-index 7205d8f..fa6a909 100644
---- a/crt/aws-crt-cpp/include/aws/crt/io/TlsOptions.h
-+++ b/crt/aws-crt-cpp/include/aws/crt/io/TlsOptions.h
-@@ -89,6 +89,7 @@ namespace Aws
-                     const char *pkcs12_pwd,
-                     Allocator *allocator = g_allocator) noexcept;
- 
-+#if !defined(AWS_OS_IOS)
-                 /**
-                  * By default the certificates and private keys are stored in the default keychain
-                  * of the account of the process. If you instead wish to provide your own keychain
-@@ -96,6 +97,8 @@ namespace Aws
-                  * NOTE: The password of your keychain must be empty.
-                  */
-                 bool SetKeychainPath(ByteCursor &keychain_path) noexcept;
-+#endif /* !AWS_OS_IOS */
-+
- #endif
- 
- #ifdef _WIN32
-diff --git a/crt/aws-crt-cpp/source/io/TlsOptions.cpp b/crt/aws-crt-cpp/source/io/TlsOptions.cpp
-index b9305e5..f32f873 100644
---- a/crt/aws-crt-cpp/source/io/TlsOptions.cpp
-+++ b/crt/aws-crt-cpp/source/io/TlsOptions.cpp
-@@ -106,11 +106,14 @@ namespace Aws
-                 return ctxOptions;
-             }
- 
-+#if !defined(AWS_OS_IOS)
-             bool TlsContextOptions::SetKeychainPath(ByteCursor &keychain_path) noexcept
-             {
-                 AWS_ASSERT(m_isInit);
-                 return aws_tls_ctx_options_set_keychain_path(&m_options, &keychain_path) == 0;
-             }
-+#endif /* !AWS_OS_IOS */
-+
- #endif /* AWS_OS_APPLE */
- 
- #ifdef _WIN32

+ 0 - 125
package-system/AWSNativeSDK/AWSNativeSDK-1.9.50-linux-openssl3.patch

@@ -1,125 +0,0 @@
-diff --git a/aws-cpp-sdk-core/CMakeLists.txt b/aws-cpp-sdk-core/CMakeLists.txt
-index 17b4e46442..f71a925288 100644
---- a/aws-cpp-sdk-core/CMakeLists.txt
-+++ b/aws-cpp-sdk-core/CMakeLists.txt
-@@ -100,7 +100,22 @@ include(CheckCXXSourceRuns)
- if(ENABLE_CURL_CLIENT)
-     file(GLOB HTTP_CURL_CLIENT_HEADERS "include/aws/core/http/curl/*.h")
-     file(GLOB HTTP_CURL_CLIENT_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/source/http/curl/*.cpp")
--    set(CMAKE_REQUIRED_LIBRARIES ${CURL_LIBRARIES})
-+
-+    set(CMAKE_REQUIRED_INCLUDES ${CURL_INCLUDE_DIR})
-+
-+    set(REQUIRED_CURL_TEST_LIBRARIES ${CURL_LIBRARIES})
-+
-+    get_filename_component(DEP_CURL_FILE_EXTN ${CURL_LIBRARY} EXT)
-+
-+    if(DEP_CURL_FILE_EXTN STREQUAL ".a")
-+        message("Adding additional static dependencies for curl")
-+        LIST(APPEND REQUIRED_CURL_TEST_LIBRARIES ${OPENSSL_LIBRARIES})
-+        LIST(APPEND REQUIRED_CURL_TEST_LIBRARIES ${ZLIB_LIBRARIES})
-+        SET(CMAKE_REQUIRED_FLAGS "-pthread -ldl")
-+    endif()
-+
-+    set(CMAKE_REQUIRED_LIBRARIES ${REQUIRED_CURL_TEST_LIBRARIES})
-+
-     set(CHECK_CURL_HAS_H2 "
-     #include <curl/curl.h>
-     int main() {
-diff --git a/aws-cpp-sdk-core/source/utils/crypto/openssl/CryptoImpl.cpp b/aws-cpp-sdk-core/source/utils/crypto/openssl/CryptoImpl.cpp
-index af3e33e045..228625417e 100644
---- a/aws-cpp-sdk-core/source/utils/crypto/openssl/CryptoImpl.cpp
-+++ b/aws-cpp-sdk-core/source/utils/crypto/openssl/CryptoImpl.cpp
-@@ -51,6 +51,11 @@ namespace Aws
- #define OPENSSL_VERSION_NUMBER 0x1000107fL
- #endif
- #define OPENSSL_VERSION_LESS_1_1 (OPENSSL_VERSION_NUMBER < 0x10100003L)
-+#define OPENSSL_VERSION_LESS_3_0 (OPENSSL_VERSION_NUMBER < 0x30000000L)
-+
-+#if !OPENSSL_VERSION_LESS_3_0
-+#include <openssl/core_names.h>
-+#endif
- 
- #if OPENSSL_VERSION_LESS_1_1
-                 static const char* OPENSSL_INTERNALS_TAG = "OpenSSLCallbackState";
-@@ -328,8 +333,11 @@ namespace Aws
-                 HMACRAIIGuard() {
- #if OPENSSL_VERSION_LESS_1_1
-                     m_ctx = Aws::New<HMAC_CTX>("AllocSha256HAMCOpenSSLContext");
--#else
-+#elif OPENSSL_VERSION_LESS_3_0
-                     m_ctx = HMAC_CTX_new();
-+#else
-+                    mac = EVP_MAC_fetch(NULL, "HMAC", NULL);
-+                    m_ctx = EVP_MAC_CTX_new(mac);
- #endif
-                     assert(m_ctx != nullptr);
-                 }
-@@ -337,17 +345,28 @@ namespace Aws
-                 ~HMACRAIIGuard() {
- #if OPENSSL_VERSION_LESS_1_1
-                     Aws::Delete<HMAC_CTX>(m_ctx);
--#else
-+#elif OPENSSL_VERSION_LESS_3_0
-                     HMAC_CTX_free(m_ctx);
-+#else
-+                    EVP_MAC_CTX_free(m_ctx);
- #endif
-                     m_ctx = nullptr;
-                 }
- 
-+#if OPENSSL_VERSION_LESS_3_0
-                 HMAC_CTX* getResource() {
-+#else
-+                EVP_MAC_CTX* getResource() {
-+#endif
-                     return m_ctx;
-                 }
-             private:
-+#if OPENSSL_VERSION_LESS_3_0
-                 HMAC_CTX *m_ctx;
-+#else
-+                EVP_MAC *mac;
-+                EVP_MAC_CTX *m_ctx;
-+#endif
-             };
- 
-             HashResult Sha256HMACOpenSSLImpl::Calculate(const ByteBuffer& toSign, const ByteBuffer& secret)
-@@ -357,20 +376,36 @@ namespace Aws
-                 memset(digest.GetUnderlyingData(), 0, length);
- 
-                 HMACRAIIGuard guard;
-+#if OPENSSL_VERSION_LESS_3_0
-                 HMAC_CTX* m_ctx = guard.getResource();
-+#else
-+                EVP_MAC_CTX* m_ctx = guard.getResource();
-+#endif
- 
- #if OPENSSL_VERSION_LESS_1_1
-                 HMAC_CTX_init(m_ctx);
- #endif
- 
-+#if OPENSSL_VERSION_LESS_3_0
-                 HMAC_Init_ex(m_ctx, secret.GetUnderlyingData(), static_cast<int>(secret.GetLength()), EVP_sha256(),
-                              NULL);
-                 HMAC_Update(m_ctx, toSign.GetUnderlyingData(), toSign.GetLength());
-                 HMAC_Final(m_ctx, digest.GetUnderlyingData(), &length);
-+#else
-+                char sha256[] {"SHA256"};
-+                OSSL_PARAM ossl_params[2];
-+                ossl_params[0] =
-+                  OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST, sha256, 0);
-+                ossl_params[1] = OSSL_PARAM_construct_end();
-+                EVP_MAC_init(m_ctx, secret.GetUnderlyingData(),
-+                             static_cast<int>(secret.GetLength()), ossl_params);
-+                EVP_MAC_update(m_ctx, toSign.GetUnderlyingData(), toSign.GetLength());
-+                EVP_MAC_final(m_ctx, digest.GetUnderlyingData(), NULL, length);
-+#endif
- 
- #if OPENSSL_VERSION_LESS_1_1
-                 HMAC_CTX_cleanup(m_ctx);
--#else
-+#elif OPENSSL_VERSION_LESS_3_0
-                 HMAC_CTX_reset(m_ctx);
- #endif
-                 return HashResult(std::move(digest));

+ 0 - 26
package-system/AWSNativeSDK/AWSNativeSDK-1.9.50-windows.patch

@@ -1,26 +0,0 @@
-diff --git a/aws-cpp-sdk-core/include/aws/core/auth/AWSAuthSigner.h b/aws-cpp-sdk-core/include/aws/core/auth/AWSAuthSigner.h
-index 8061ee1e25..591d65555a 100644
---- a/aws-cpp-sdk-core/include/aws/core/auth/AWSAuthSigner.h
-+++ b/aws-cpp-sdk-core/include/aws/core/auth/AWSAuthSigner.h
-@@ -399,6 +399,21 @@ namespace Aws
-              */
-             bool SignRequest(Aws::Http::HttpRequest&) const override { return true; }
- 
-+            /**
-+             * Do nothing
-+             */
-+            bool SignRequest(Aws::Http::HttpRequest&, bool) const override { return true; }
-+
-+            /**
-+             * Do nothing
-+             */
-+            bool SignRequest(Aws::Http::HttpRequest&, const char*, bool) const override { return true; }
-+
-+            /**
-+             * Do nothing
-+             */
-+            bool SignRequest(Aws::Http::HttpRequest&, const char*, const char*, bool) const override { return true; }
-+
-             /**
-              * Do nothing
-              */

+ 2 - 6
package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Linux

@@ -92,6 +92,7 @@ set(CORE_STATIC_LIBS
     ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-compression.a
     ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-cal.a
     ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.a
+    ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-sdkutils.a
     ${AWSNATIVE_SDK_LIB_PATH}/libs2n.a
     ${AWSNATIVE_SDK_LIB_PATH}/libcurl.a
 )
@@ -188,12 +189,7 @@ ly_declare_aws_library(
 )
 
 #### MobileAnalytics ####
-ly_declare_aws_library(
-    NAME 
-        MobileAnalytics
-    LIB_FILE 
-        aws-cpp-sdk-mobileanalytics
-)
+# MobileAnalytics library no longer exists and should be replaced with AWS PinPoint or other equivalent API
 
 #### Queues ####
 ly_declare_aws_library(

+ 1 - 6
package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Mac

@@ -226,12 +226,7 @@ ly_declare_aws_library(
 )
 
 #### MobileAnalytics ####
-ly_declare_aws_library(
-    NAME 
-        MobileAnalytics
-    LIB_FILE 
-        aws-cpp-sdk-mobileanalytics
-)
+# MobileAnalytics library no longer exists and should be replaced with AWS PinPoint or other equivalent API
 
 #### Queues ####
 ly_declare_aws_library(

+ 3 - 6
package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Windows

@@ -100,6 +100,7 @@ set(CORE_STATIC_LIBS
     ${AWSNATIVE_SDK_LIB_PATH}/aws-c-compression.lib
     ${AWSNATIVE_SDK_LIB_PATH}/aws-c-cal.lib
     ${AWSNATIVE_SDK_LIB_PATH}/aws-c-common.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-sdkutils.lib
     Ncrypt
     Secur32
     Shlwapi
@@ -120,6 +121,7 @@ set(CORE_SHARED_LIBS
     ${AWSNATIVE_SDK_LIB_PATH}/aws-c-compression.dll
     ${AWSNATIVE_SDK_LIB_PATH}/aws-c-cal.dll
     ${AWSNATIVE_SDK_LIB_PATH}/aws-c-common.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-sdkutils.dll
 )
 
 if(LY_MONOLITHIC_GAME)
@@ -217,12 +219,7 @@ ly_declare_aws_library(
 )
 
 #### MobileAnalytics ####
-ly_declare_aws_library(
-    NAME 
-        MobileAnalytics
-    LIB_FILE 
-        aws-cpp-sdk-mobileanalytics
-)
+# MobileAnalytics library no longer exists and should be replaced with AWS PinPoint or other equivalent API
 
 #### Queues ####
 ly_declare_aws_library(

+ 1 - 6
package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.iOS

@@ -163,12 +163,7 @@ ly_declare_aws_library(
 )
 
 #### MobileAnalytics ####
-ly_declare_aws_library(
-    NAME 
-        MobileAnalytics
-    LIB_FILE 
-        aws-cpp-sdk-mobileanalytics
-)
+# MobileAnalytics library no longer exists and should be replaced with AWS PinPoint or other equivalent API
 
 #### Queues ####
 ly_declare_aws_library(

+ 2 - 2
package-system/AWSNativeSDK/README.md

@@ -28,8 +28,8 @@ Modify AWSNativeSDK build script by adding ElasticSearch as a build target. The
             -DTARGET_ARCH=WINDOWS ^
             -DCMAKE_CXX_STANDARD=17 ^
             -DCPP_STANDARD=17 ^
--           -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;mobileanalytics;queues;s3;sns;sqs;sts;transfer" ^
-+           -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;es;gamelift;identity-management;kinesis;lambda;mobileanalytics;queues;s3;sns;sqs;sts;transfer" ^
+-           -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" ^
++           -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;es;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" ^
             -DENABLE_TESTING=OFF ^
             -DENABLE_RTTI=ON ^
             -DCUSTOM_MEMORY_MANAGEMENT=ON ^

+ 1 - 1
package-system/AWSNativeSDK/build_AWSNativeSDK_ios.sh

@@ -28,7 +28,7 @@ configure_and_build_static() {
           -DENABLE_TESTING=OFF \
           -DENABLE_RTTI=ON \
           -DCUSTOM_MEMORY_MANAGEMENT=ON \
-          -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;mobileanalytics;queues;s3;sns;sqs;sts;transfer" \
+          -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" \
           -DBUILD_SHARED_LIBS=OFF \
           -DCMAKE_BUILD_TYPE=$build_type \
           -DCURL_LIBRARY="temp/curl_install/lib/libcurl.a" \

+ 2 - 2
package-system/AWSNativeSDK/build_AWSNativeSDK_mac.sh

@@ -23,7 +23,7 @@ configure_and_build() {
     fi
 
     echo "CMake Configure $build_type $lib_type"
-    CFLAGS="-Wno-deprecated-declarations -fPIC" CXXFLAGS="-Wno-deprecated-declarations -fPIC" cmake -S "$src_path" -B "$bld_path/${build_type}_${lib_type}" \
+    CFLAGS="-Wno-deprecated-declarations -Wno-shorten-64-to-32 -fPIC" CXXFLAGS="-Wno-deprecated-declarations -Wno-shorten-64-to-32 -fPIC" cmake -S "$src_path" -B "$bld_path/${build_type}_${lib_type}" \
           -G "Xcode" \
           -DTARGET_ARCH=APPLE \
           -DCMAKE_OSX_ARCHITECTURES="x86_64" \
@@ -33,7 +33,7 @@ configure_and_build() {
           -DENABLE_TESTING=OFF \
           -DENABLE_RTTI=ON \
           -DCUSTOM_MEMORY_MANAGEMENT=ON \
-          -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;mobileanalytics;queues;s3;sns;sqs;sts;transfer" \
+          -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" \
           -DBUILD_SHARED_LIBS=$build_shared \
           -DCMAKE_BUILD_TYPE=$build_type \
           -DCMAKE_INSTALL_BINDIR="bin" \

+ 4 - 3
package-system/AWSNativeSDK/build_AWSNativeSDK_windows.cmd

@@ -53,12 +53,12 @@ IF %LIB_TYPE% EQU Shared (
 )
 ECHO "CMake Configure %BUILD_TYPE% %LIB_TYPE%"
 call cmake -S %SRC_PATH% -B %BLD_PATH%\%BUILD_TYPE%_%LIB_TYPE% ^
-           -G "Visual Studio 16 2019" ^
+           -G "Visual Studio 17 2022" ^
            -A x64 ^
            -DTARGET_ARCH=WINDOWS ^
            -DCMAKE_CXX_STANDARD=17 ^
            -DCPP_STANDARD=17 ^
-           -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;mobileanalytics;queues;s3;sns;sqs;sts;transfer" ^
+           -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" ^
            -DENABLE_TESTING=OFF ^
            -DENABLE_RTTI=ON ^
            -DCUSTOM_MEMORY_MANAGEMENT=ON ^
@@ -66,7 +66,8 @@ call cmake -S %SRC_PATH% -B %BLD_PATH%\%BUILD_TYPE%_%LIB_TYPE% ^
            -DBUILD_SHARED_LIBS=%BUILD_SHARED% ^
            -DCMAKE_BUILD_TYPE="%BUILD_TYPE%" ^
            -DCMAKE_INSTALL_BINDIR="bin" ^
-           -DCMAKE_INSTALL_LIBDIR="lib"
+           -DCMAKE_INSTALL_LIBDIR="lib" ^
+           -DLEGACY_MODE=OFF
 IF %ERRORLEVEL% NEQ 0 (
     ECHO "CMake Configure %BUILD_TYPE% %LIB_TYPE% failed"
     exit /b 1

+ 7 - 11
package-system/AWSNativeSDK/build_config.json

@@ -1,8 +1,8 @@
 {
    "git_url":"https://github.com/aws/aws-sdk-cpp.git",
-   "git_tag":"1.9.50",
+   "git_tag":"1.11.144",
    "package_name":"AWSNativeSDK",
-   "package_version":"1.9.50-rev1",
+   "package_version":"1.11.144-rev1",
    "package_url":"https://github.com/aws/aws-sdk-cpp",
    "package_license":"Apache-2.0",
    "package_license_file":"LICENSE",
@@ -12,8 +12,7 @@
    "Platforms":{
       "Windows":{
          "Windows":{
-            "package_version":"1.9.50-rev2",
-            "patch_file":"AWSNativeSDK-1.9.50-windows.patch",
+            "package_version":"1.11.144-rev1",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Windows",
             "custom_build_cmd": [
                "build_AWSNativeSDK_windows.cmd"
@@ -49,7 +48,6 @@
             ]
          },
          "iOS":{
-            "patch_file":"AWSNativeSDK-1.9.50-ios.patch",
             "cmake_find_source":"FindAWSNativeSDK.cmake.iOS",
             "custom_build_cmd": [
                "./build_AWSNativeSDK_ios.sh"
@@ -65,12 +63,11 @@
                [ "OpenSSL-1.1.1t-rev1-linux", "63aea898b7afe8faccd0c7261e62d2f8b7b870f678a4520d5be81e5815542b39", "" ],
                [ "zlib-1.2.11-rev5-linux", "9be5ea85722fc27a8645a9c8a812669d107c68e6baa2ca0740872eaeb6a8b0fc", "" ]
             ],
-            "package_version":"1.9.50-rev4",
-            "patch_file":"AWSNativeSDK-1.9.50-linux-openssl3.patch",
+            "package_version":"1.11.144-rev1",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Linux",
             "custom_build_cmd": [
                "./build-linux.sh",
-               "aws_native_sdk_1_9_50",
+               "aws_native_sdk_1_11_144",
                "20.04",
                "curl-7_68_0",
                "x86_64"
@@ -84,12 +81,11 @@
                [ "OpenSSL-1.1.1t-rev1-linux-aarch64", "f32721bec9c82d1bd7fb244d78d5dc4e2a47e7b808bb36027236ad377e241ea5", "" ],
                [ "zlib-1.2.11-rev5-linux-aarch64", "ce9d1ed2883d77ffc69c7982c078595c1f89ca55ec19d89fe7e6beb05f774775", "" ]
             ],
-            "package_version":"1.9.50-rev4",
-            "patch_file":"AWSNativeSDK-1.9.50-linux-openssl3.patch",
+            "package_version":"1.11.144-rev1",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Linux",
             "custom_build_cmd": [
                "./build-linux.sh",
-               "aws_native_sdk_1_9_50",
+               "aws_native_sdk_1_11_144",
                "20.04",
                "curl-7_68_0",
                "aarch64"

+ 9 - 3
package-system/AWSNativeSDK/docker_build_aws_sdk.sh

@@ -160,14 +160,20 @@ configure_and_build() {
  -DENABLE_TESTING=OFF \
  -DENABLE_RTTI=ON \
  -DCUSTOM_MEMORY_MANAGEMENT=ON \
- -DBUILD_ONLY=\"access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;mobileanalytics;queues;s3;sns;sqs;sts;transfer\" \
+ -DBUILD_ONLY=\"access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer\" \
  -DBUILD_SHARED_LIBS=$build_shared \
  -DCMAKE_BUILD_TYPE=Release \
  -DCMAKE_INSTALL_BINDIR=\"bin\" \
  -DCMAKE_INSTALL_LIBDIR=\"lib\" \
- -DCMAKE_MODULE_PATH=\"$DOWNLOADED_PACKAGE_FOLDERS\" \
  -DCURL_INCLUDE_DIR=${CURL_INSTALL}/include \
- -DCURL_LIBRARY=${dep_curl_lib}"
+ -DCURL_LIBRARY=${dep_curl_lib} \
+ -Dcrypto_INCLUDE_DIR=${DEPENDENT_OPENSSL_BASE}/include \
+ -Dcrypto_LIBRARY=${DEPENDENT_OPENSSL_BASE}/lib/libcrypto.a \
+ -DOPENSSL_CRYPTO_LIBRARY=${DEPENDENT_OPENSSL_BASE}/lib/libssl.a \
+ -DOPENSSL_INCLUDE_DIR=${DEPENDENT_OPENSSL_BASE}/include \
+ -DZLIB_LIBRARY=${DEPENDENT_ZLIB_BASE}/lib/libz.a \
+ -DZLIB_INCLUDE_DIR=${DEPENDENT_ZLIB_BASE}/include \
+ -DLEGACY_BUILD=ON"
 
     echo ${CMD}
     eval ${CMD}

+ 4 - 4
package_build_list_host_darwin.json

@@ -5,8 +5,8 @@
     "comment4" : "Note:  Build from source occurs before build_from_folder",
     "build_from_source": {
         "assimp-5.2.5-rev1-mac":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Mac --package-root ../../package-system --clean",
-        "AWSNativeSDK-1.9.50-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean",
-        "AWSNativeSDK-1.9.50-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name iOS --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.11.144-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.11.144-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name iOS --package-root ../../package-system --clean",
         "Lua-5.4.4-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Mac --package-root ../../package-system/Lua/temp --clean",
         "Lua-5.4.4-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name iOS --package-root ../../package-system/Lua/temp --clean",
         "AwsIotDeviceSdkCpp-1.15.2-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Mac --package-root ../../package-system --clean",
@@ -56,8 +56,8 @@
     },
     "build_from_folder": {
         "assimp-5.2.5-rev1-mac": "package-system/assimp-mac",
-        "AWSNativeSDK-1.9.50-rev1-mac": "package-system/AWSNativeSDK-mac",
-        "AWSNativeSDK-1.9.50-rev1-ios": "package-system/AWSNativeSDK-ios",
+        "AWSNativeSDK-1.11.144-rev1-mac": "package-system/AWSNativeSDK-mac",
+        "AWSNativeSDK-1.11.144-rev1-ios": "package-system/AWSNativeSDK-ios",
         "AwsIotDeviceSdkCpp-1.15.2-rev2-mac": "package-system/AwsIotDeviceSdkCpp-mac",
         "Lua-5.4.4-rev1-mac": "package-system/Lua/temp/Lua-mac",
         "Lua-5.4.4-rev1-ios": "package-system/Lua/temp/Lua-ios",

+ 2 - 2
package_build_list_host_linux-aarch64.json

@@ -8,7 +8,7 @@
         "astc-encoder-3.2-rev3-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Linux-aarch64 --clean",
         "AWSGameLiftServerSDK-5.0.0-rev3-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux-aarch64 --clean",
         "AwsIotDeviceSdkCpp-1.15.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux-aarch64 --clean",
-        "AWSNativeSDK-1.9.50-rev4-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean",
+        "AWSNativeSDK-1.11.144-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean",
         "azslc-1.8.15-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Linux-aarch64 --clean",
         "cityhash-1.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/cityhash --platform-name Linux-aarch64 --clean",
         "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux-aarch64 --clean",
@@ -49,7 +49,7 @@
         "astc-encoder-3.2-rev3-linux-aarch64": "package-system/astc-encoder/temp/astc-encoder-linux-aarch64",
         "AWSGameLiftServerSDK-5.0.0-rev3-linux-aarch64": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux-aarch64",
         "AwsIotDeviceSdkCpp-1.15.2-rev1-linux-aarch64": "package-system/AwsIotDeviceSdkCpp/temp/AwsIotDeviceSdkCpp-linux-aarch64",
-        "AWSNativeSDK-1.9.50-rev4-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64",
+        "AWSNativeSDK-1.11.144-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64",
         "azslc-1.8.15-rev1-linux-aarch64": "package-system/azslc/temp/azslc-linux-aarch64",
         "cityhash-1.1-rev1-linux-aarch64": "package-system/cityhash/temp/cityhash-linux-aarch64",
         "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux-aarch64": "package-system/DirectXShaderCompiler/temp/DirectXShaderCompilerDxc-linux-aarch64",

+ 4 - 4
package_build_list_host_linux.json

@@ -7,8 +7,8 @@
         "assimp-5.2.5-rev1-linux":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Linux --package-root ../../package-system --clean",
         "AWSGameLiftServerSDK-5.0.0-rev3-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux-aarch64 --clean",
         "AWSGameLiftServerSDK-5.0.0-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux --clean",
-        "AWSNativeSDK-1.9.50-rev4-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --clean",
-        "AWSNativeSDK-1.9.50-rev4-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean",
+        "AWSNativeSDK-1.11.144-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --clean",
+        "AWSNativeSDK-1.11.144-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean",
         "cityhash-1.1-rev1-linux":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/cityhash --platform-name Linux --clean",
         "Lua-5.4.4-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Linux --package-root ../../package-system/Lua/temp --clean",
         "AwsIotDeviceSdkCpp-1.15.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux --package-root ../../package-system --clean",
@@ -54,8 +54,8 @@
         "assimp-5.2.5-rev1-linux": "package-system/assimp-linux",
         "AWSGameLiftServerSDK-5.0.0-rev3-linux": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux",
         "AWSGameLiftServerSDK-5.0.0-rev3-linux-aarch64": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux-aarch64",
-        "AWSNativeSDK-1.9.50-rev4-linux": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux",
-        "AWSNativeSDK-1.9.50-rev4-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64",
+        "AWSNativeSDK-1.11.144-rev1-linux": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux",
+        "AWSNativeSDK-1.11.144-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64",
         "cityhash-1.1-rev1-linux": "package-system/cityhash/temp/cityhash-linux",
         "Lua-5.4.4-rev1-linux": "package-system/Lua/temp/Lua-linux",
         "AwsIotDeviceSdkCpp-1.15.2-rev1-linux": "package-system/AwsIotDeviceSdkCpp-linux",

+ 2 - 2
package_build_list_host_windows.json

@@ -10,7 +10,7 @@
         "AWSGameLiftServerSDK-5.0.0-rev2-windows": "package-system/AWSGameLiftServerSDK/build_package_image.py --platform-name windows",
         "AwsIotDeviceSdkCpp-1.15.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --build-path c:/Temp/awsiot --platform-name Windows --package-root ../../package-system --clean",
         "AWSNativeSDK-1.9.50-rev2-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean",
-        "AWSNativeSDK-1.9.50-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.11.144-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean",
         "Blast-v1.1.7_rc2-9-geb169fe-rev2-windows": "package-system/Blast/build_package_image.py --platform-name windows",
         "Crashpad-0.8.0-rev1-windows": "package-system/Crashpad/build_package_image.py",
         "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Windows --package-root ../../package-system --clean",
@@ -72,7 +72,7 @@
     "AWSGameLiftServerSDK-5.0.0-rev2-windows": "package-system/AWSGameLiftServerSDK-windows",
     "AwsIotDeviceSdkCpp-1.15.2-rev1-windows": "package-system/AwsIotDeviceSdkCpp-windows",
     "AWSNativeSDK-1.9.50-rev2-android": "package-system/AWSNativeSDK-android",
-    "AWSNativeSDK-1.9.50-rev2-windows": "package-system/AWSNativeSDK-windows",
+    "AWSNativeSDK-1.11.144-rev1-windows": "package-system/AWSNativeSDK-windows",
     "Blast-v1.1.7_rc2-9-geb169fe-rev1-windows": "package-system/Blast-windows",
     "cityhash-1.1-multiplatform": "package-system/cityhash-multiplatform",
     "civetweb-1.8-rev1-windows": "package-system/civetweb-windows",