Updated for Linux/Android/iOS

Signed-off-by: AMZN-Gene <[email protected]>

package-system/AWSNativeSDK/AWSNativeSDK-1.9.50-android.patch

@@ -1,24 +0,0 @@
-diff --git a/android-build/CMakeLists.txt b/android-build/CMakeLists.txt
-index d88f235750..b9c6ad0041 100644
---- a/android-build/CMakeLists.txt
-+++ b/android-build/CMakeLists.txt
-@@ -86,5 +86,6 @@ if(BUILD_CURL)
-         -DBUILD_CURL_EXE=ON
-         -DBUILD_CURL_TESTS=OFF
-         -DCURL_ZLIB=${CURL_USE_ZLIB}
-+        -DCMAKE_MODULE_PATH="D:/3p-package-source/package-system/OpenSSL-1.1.1m-rev1-android"
-         )
- endif()
-diff --git a/cmake/build_external.cmake b/cmake/build_external.cmake
-index f8cfb63232..f8087965e1 100644
---- a/cmake/build_external.cmake
-+++ b/cmake/build_external.cmake
-@@ -65,6 +65,8 @@ if(BUILD_CURL OR BUILD_OPENSSL OR BUILD_ZLIB)
- 
-         set(LibCrypto_INCLUDE_DIR "${OPENSSL_INCLUDE_DIR}" CACHE INTERNAL "crypto include dir")
-         set(LibCrypto_STATIC_LIBRARY "${OPENSSL_LIBRARY_DIR}/libcrypto.a" CACHE INTERNAL "crypto static library")
-+    else()
-+        set(OPENSSL_LINKER_FLAGS "-L${OPENSSL_LIBS_DIR}" CACHE INTERNAL "linker flags to find openssl")
-     endif()
- 
-     # curl

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

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));

package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Android

@@ -106,6 +106,7 @@ if(LY_MONOLITHIC_GAME)
             ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream${CMAKE_STATIC_LIBRARY_SUFFIX}
             ${AWSNATIVE_SDK_LIB_PATH}/libaws-checksums${CMAKE_STATIC_LIBRARY_SUFFIX}
             ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common${CMAKE_STATIC_LIBRARY_SUFFIX}
+            ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-sdkutils${CMAKE_STATIC_LIBRARY_SUFFIX}
             ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-compression${CMAKE_STATIC_LIBRARY_SUFFIX}
             ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-cal${CMAKE_STATIC_LIBRARY_SUFFIX}
             ${AWSNATIVE_SDK_LIB_PATH}/libs2n${CMAKE_STATIC_LIBRARY_SUFFIX}
@@ -203,14 +204,6 @@ ly_declare_aws_library(
         aws-cpp-sdk-lambda
 )
 
-#### MobileAnalytics ####
-ly_declare_aws_library(
-    NAME 
-        MobileAnalytics
-    LIB_FILE 
-        aws-cpp-sdk-mobileanalytics
-)
-
 #### Queues ####
 ly_declare_aws_library(
     NAME 
@@ -280,20 +273,6 @@ else()
     )
 endif()
 
-#### IdentityMetrics ####
-ly_declare_aws_library(
-    NAME 
-        IdentityMetrics
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::CognitoIdentity
-        3rdParty::AWSNativeSDK::CognitoIdp
-        3rdParty::AWSNativeSDK::Core
-        3rdParty::AWSNativeSDK::IdentityManagement
-        3rdParty::AWSNativeSDK::MobileAnalytics
-        3rdParty::AWSNativeSDK::STS
-        3rdParty::AWSNativeSDK::Dependencies
-)
-
 #### IdentityLambda ####
 ly_declare_aws_library(
     NAME 

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
 )
@@ -187,14 +188,6 @@ ly_declare_aws_library(
         aws-cpp-sdk-lambda
 )
 
-#### MobileAnalytics ####
-ly_declare_aws_library(
-    NAME 
-        MobileAnalytics
-    LIB_FILE 
-        aws-cpp-sdk-mobileanalytics
-)
-
 #### Queues ####
 ly_declare_aws_library(
     NAME 

package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Mac

@@ -225,14 +225,6 @@ ly_declare_aws_library(
         aws-cpp-sdk-lambda
 )
 
-#### MobileAnalytics ####
-ly_declare_aws_library(
-    NAME 
-        MobileAnalytics
-    LIB_FILE 
-        aws-cpp-sdk-mobileanalytics
-)
-
 #### Queues ####
 ly_declare_aws_library(
     NAME 

package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.iOS

@@ -162,14 +162,6 @@ ly_declare_aws_library(
         aws-cpp-sdk-lambda
 )
 
-#### MobileAnalytics ####
-ly_declare_aws_library(
-    NAME 
-        MobileAnalytics
-    LIB_FILE 
-        aws-cpp-sdk-mobileanalytics
-)
-
 #### Queues ####
 ly_declare_aws_library(
     NAME 

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 ^

package-system/AWSNativeSDK/build_AWSNativeSDK_android.cmd

@@ -62,7 +62,7 @@ call cmake -S %SRC_PATH% -B %BLD_PATH%\%BUILD_TYPE%_%LIB_TYPE% ^
            -DCPP_STANDARD=17 ^
            -DCMAKE_C_FLAGS="-fPIC" ^
            -DCMAKE_CXX_FLAGS="-fPIC" ^
-           -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^

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" \

package-system/AWSNativeSDK/build_AWSNativeSDK_mac.sh

@@ -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" \

package-system/AWSNativeSDK/build_config.json

@@ -27,7 +27,6 @@
                [ "OpenSSL-1.1.1m-rev1-android", "b11fe493af5d6b03ebbf1a2c97fea443b125e88def5cd1c32b854220b3ad4681", "" ],
                [ "zlib-1.2.11-rev5-android", "73c9e88892c237a3fc6eafc04268ccd9d479e6d55f9df2ed58b236c8f9cf2cae", "" ]
             ],
-            "patch_file":"AWSNativeSDK-1.11.144-android.patch",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Android",
             "custom_build_cmd": [
                "build_AWSNativeSDK_android.cmd"
@@ -48,7 +47,6 @@
             ]
          },
          "iOS":{
-            "patch_file":"AWSNativeSDK-1.11.144-ios.patch",
             "cmake_find_source":"FindAWSNativeSDK.cmake.iOS",
             "custom_build_cmd": [
                "./build_AWSNativeSDK_ios.sh"
@@ -65,11 +63,10 @@
                [ "zlib-1.2.11-rev5-linux", "9be5ea85722fc27a8645a9c8a812669d107c68e6baa2ca0740872eaeb6a8b0fc", "" ]
             ],
             "package_version":"1.11.144-rev1",
-            "patch_file":"AWSNativeSDK-1.11.144-linux-openssl3.patch",
             "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,11 +81,10 @@
                [ "zlib-1.2.11-rev5-linux-aarch64", "ce9d1ed2883d77ffc69c7982c078595c1f89ca55ec19d89fe7e6beb05f774775", "" ]
             ],
             "package_version":"1.11.144-rev1",
-            "patch_file":"AWSNativeSDK-1.11.144-linux-openssl3.patch",
             "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"

package-system/AWSNativeSDK/docker_build_aws_sdk.sh

@@ -160,7 +160,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=Release \
  -DCMAKE_INSTALL_BINDIR=\"bin\" \

package_build_list_host_windows.json

@@ -70,7 +70,7 @@
     "azslc-1.8.15-rev2-windows": "package-system/azslc/temp/azslc-windows",
     "AWSGameLiftServerSDK-5.0.0-rev2-windows": "package-system/AWSGameLiftServerSDK-windows",
     "AwsIotDeviceSdkCpp-1.15.2-rev1-windows": "package-system/AwsIotDeviceSdkCpp-windows",
-    "AWSNativeSDK-1.11.144-rev-android": "package-system/AWSNativeSDK-android",
+    "AWSNativeSDK-1.11.144-rev1-android": "package-system/AWSNativeSDK-android",
     "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",