WiP. Adding Bedrock; compiles for Android, but unit tests still fail

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/FindAWSNativeSDK.cmake.Android

@@ -142,6 +142,17 @@ ly_declare_aws_library(
         3rdParty::AWSNativeSDK::Core 
 )
 
+#### Bedrock ####
+ly_declare_aws_library(
+    NAME 
+        Bedrock
+    LIB_FILE 
+        aws-cpp-sdk-bedrock
+    BUILD_DEPENDENCIES
+        # Even though AWS Core is a sibling module, make sure it's linked in first because this module depends on it.
+        3rdParty::AWSNativeSDK::Core 
+)
+
 #### CognitoIdentity ####
 ly_declare_aws_library(
     NAME 

package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Linux

@@ -127,6 +127,17 @@ ly_declare_aws_library(
         3rdParty::AWSNativeSDK::Core 
 )
 
+#### Bedrock ####
+ly_declare_aws_library(
+    NAME 
+        Bedrock
+    LIB_FILE 
+        aws-cpp-sdk-bedrock
+    BUILD_DEPENDENCIES
+        # Even though AWS Core is a sibling module, make sure it's linked in first because this module depends on it.
+        3rdParty::AWSNativeSDK::Core 
+)
+
 #### CognitoIdentity ####
 ly_declare_aws_library(
     NAME 

package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Mac

@@ -163,6 +163,16 @@ ly_declare_aws_library(
         3rdParty::AWSNativeSDK::Core
 )
 
+#### Bedrock ####
+ly_declare_aws_library(
+    NAME
+        Bedrock
+    LIB_FILE 
+        aws-cpp-sdk-bedrock
+    BUILD_DEPENDENCIES
+        3rdParty::AWSNativeSDK::Core
+)
+
 #### CognitoIdentity ####
 ly_declare_aws_library(
     NAME 

package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Windows

@@ -157,6 +157,17 @@ ly_declare_aws_library(
         3rdParty::AWSNativeSDK::Core 
 )
 
+#### Bedrock ####
+ly_declare_aws_library(
+    NAME
+        Bedrock
+    LIB_FILE
+        aws-cpp-sdk-bedrock
+    BUILD_DEPENDENCIES
+        # Even though AWS Core is a sibling module, make sure it's linked in first because this module depends on it.
+        3rdParty::AWSNativeSDK::Core 
+)
+
 #### CognitoIdentity ####
 ly_declare_aws_library(
     NAME 

package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.iOS

@@ -101,6 +101,17 @@ ly_declare_aws_library(
         3rdParty::AWSNativeSDK::Core 
 )
 
+#### Bedrock ####
+ly_declare_aws_library(
+    NAME 
+        Bedrock
+    LIB_FILE
+        aws-cpp-sdk-bedrock
+    BUILD_DEPENDENCIES
+        # Even though AWS Core is a sibling module, make sure it's linked in first because this module depends on it.
+        3rdParty::AWSNativeSDK::Core 
+)
+
 #### CognitoIdentity ####
 ly_declare_aws_library(
     NAME 

package-system/AWSNativeSDK/build_AWSNativeSDK_android.cmd

@@ -8,6 +8,7 @@ REM
 
 SET SRC_PATH=temp\src
 SET BLD_PATH=temp\build
+SET OPENSSL_PATH=temp\OpenSSL-1.1.1m-rev1-android\OpenSSL
 
 set "DOWNLOADED_PACKAGE_FOLDERS=%DOWNLOADED_PACKAGE_FOLDERS:\=/%"
 
@@ -62,7 +63,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;bedrock;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;mobileanalytics;queues;s3;sns;sqs;sts;transfer" ^
            -DENABLE_TESTING=OFF ^
            -DENABLE_RTTI=ON ^
            -DCUSTOM_MEMORY_MANAGEMENT=ON^
@@ -71,7 +72,13 @@ call cmake -S %SRC_PATH% -B %BLD_PATH%\%BUILD_TYPE%_%LIB_TYPE% ^
            -DCMAKE_INSTALL_PREFIX="%BLD_PATH%/%BUILD_TYPE%_%LIB_TYPE%" ^
            -DANDROID_BUILD_OPENSSL=OFF ^
            -DANDROID_BUILD_ZLIB=OFF ^
-           -DCMAKE_MODULE_PATH="%DOWNLOADED_PACKAGE_FOLDERS%"
+           -DCMAKE_MODULE_PATH="%DOWNLOADED_PACKAGE_FOLDERS%" ^
+           -Dcrypto_LIBRARY="%OPENSSL_PATH%/lib/libcrypto.a" ^
+           -Dcrypto_INCLUDE_DIR="%OPENSSL_PATH%/include" ^
+           -DOPENSSL_ROOT_DIR="%OPENSSL_PATH%" ^
+           -DOPENSSL_INCLUDE_DIR="%OPENSSL_PATH%/include" ^
+           -DFORCE_CURL=ON
+
 IF %ERRORLEVEL% NEQ 0 (
     ECHO "CMake Configure %BUILD_TYPE% %LIB_TYPE% failed"
     exit /b 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;queues;s3;sns;sqs;sts;transfer" \
+          -DBUILD_ONLY="access-management;bedrock;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;queues;s3;sns;sqs;sts;transfer" \
+          -DBUILD_ONLY="access-management;bedrock;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_AWSNativeSDK_windows.cmd

@@ -58,7 +58,7 @@ call cmake -S %SRC_PATH% -B %BLD_PATH%\%BUILD_TYPE%_%LIB_TYPE% ^
            -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;queues;s3;sns;sqs;sts;transfer" ^
+           -DBUILD_ONLY="access-management;bedrock;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_config.json

@@ -1,8 +1,8 @@
 {
    "git_url":"https://github.com/aws/aws-sdk-cpp.git",
-   "git_tag":"1.11.264",
+   "git_tag":"1.11.288",
    "package_name":"AWSNativeSDK",
-   "package_version":"1.11.264-rev1",
+   "package_version":"1.11.288-rev1",
    "package_url":"https://github.com/aws/aws-sdk-cpp",
    "package_license":"Apache-2.0",
    "package_license_file":"LICENSE",
@@ -12,7 +12,7 @@
    "Platforms":{
       "Windows":{
          "Windows":{
-            "package_version":"1.11.264-rev1",
+            "package_version":"1.11.288-rev1",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Windows",
             "custom_build_cmd": [
                "build_AWSNativeSDK_windows.cmd"
@@ -22,7 +22,7 @@
             ]
          },
          "Android":{
-            "package_version":"1.11.264-rev1",
+            "package_version":"1.11.288-rev1",
             "depends_on_packages": [
                [ "OpenSSL-1.1.1m-rev1-android", "b11fe493af5d6b03ebbf1a2c97fea443b125e88def5cd1c32b854220b3ad4681", "" ],
                [ "zlib-1.2.11-rev5-android", "73c9e88892c237a3fc6eafc04268ccd9d479e6d55f9df2ed58b236c8f9cf2cae", "" ]
@@ -62,7 +62,7 @@
                [ "OpenSSL-1.1.1t-rev1-linux", "63aea898b7afe8faccd0c7261e62d2f8b7b870f678a4520d5be81e5815542b39", "" ],
                [ "zlib-1.2.11-rev5-linux", "9be5ea85722fc27a8645a9c8a812669d107c68e6baa2ca0740872eaeb6a8b0fc", "" ]
             ],
-            "package_version":"1.11.264-rev1",
+            "package_version":"1.11.288-rev1",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Linux",
             "custom_build_cmd": [
                "./build-linux.sh",
@@ -80,7 +80,7 @@
                [ "OpenSSL-1.1.1t-rev1-linux-aarch64", "f32721bec9c82d1bd7fb244d78d5dc4e2a47e7b808bb36027236ad377e241ea5", "" ],
                [ "zlib-1.2.11-rev5-linux-aarch64", "ce9d1ed2883d77ffc69c7982c078595c1f89ca55ec19d89fe7e6beb05f774775", "" ]
             ],
-            "package_version":"1.11.264-rev1",
+            "package_version":"1.11.288-rev1",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Linux",
             "custom_build_cmd": [
                "./build-linux.sh",

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;queues;s3;sns;sqs;sts;transfer\" \
+ -DBUILD_ONLY=\"access-management;bedrock;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_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.11.264-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean",
-        "AWSNativeSDK-1.11.264-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name iOS --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.11.288-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.11.288-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.11.264-rev1-mac": "package-system/AWSNativeSDK-mac",
-        "AWSNativeSDK-1.11.264-rev1-ios": "package-system/AWSNativeSDK-ios",
+        "AWSNativeSDK-1.11.288-rev1-mac": "package-system/AWSNativeSDK-mac",
+        "AWSNativeSDK-1.11.288-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",

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.1.1-rev1-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.11.264-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean",
+        "AWSNativeSDK-1.11.288-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean",
         "azslc-1.8.19-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.1.1-rev1-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.11.264-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64",
+        "AWSNativeSDK-1.11.288-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64",
         "azslc-1.8.19-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",

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.1.1-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux --clean",
         "AWSGameLiftServerSDK-5.1.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux-aarch64 --clean",
-        "AWSNativeSDK-1.11.264-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --clean",
-        "AWSNativeSDK-1.11.264-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean",
+        "AWSNativeSDK-1.11.288-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --clean",
+        "AWSNativeSDK-1.11.288-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.1.1-rev1-linux": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux",
         "AWSGameLiftServerSDK-5.1.1-rev1-linux-aarch64": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux-aarch64",
-        "AWSNativeSDK-1.11.264-rev1-linux": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux",
-        "AWSNativeSDK-1.11.264-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64",
+        "AWSNativeSDK-1.11.288-rev1-linux": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux",
+        "AWSNativeSDK-1.11.288-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",

package_build_list_host_windows.json

@@ -9,8 +9,8 @@
         "azslc-1.8.19-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Windows --package-root ../../package-system/azslc/temp --clean",
         "AWSGameLiftServerSDK-5.1.1-rev1-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.11.264-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean",
-        "AWSNativeSDK-1.11.264-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.11.288-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.11.288-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",
@@ -71,8 +71,8 @@
     "azslc-1.8.19-rev1-windows": "package-system/azslc/temp/azslc-windows",
     "AWSGameLiftServerSDK-5.1.1-rev1-windows": "package-system/AWSGameLiftServerSDK-windows",
     "AwsIotDeviceSdkCpp-1.15.2-rev1-windows": "package-system/AwsIotDeviceSdkCpp-windows",
-    "AWSNativeSDK-1.11.264-rev1-android": "package-system/AWSNativeSDK-android",
-    "AWSNativeSDK-1.11.264-rev1-windows": "package-system/AWSNativeSDK-windows",
+    "AWSNativeSDK-1.11.288-rev1-android": "package-system/AWSNativeSDK-android",
+    "AWSNativeSDK-1.11.288-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",