[LYN-4618] Upgrade Windows AWSNativeSDK to 1.9.50 (#74)

* Upgrade Windows AWSNativeSDK to 1.9.50
* Address whitespace change
* Patch to fix c4266 warning as AWSNullSigner miss override functions

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

@@ -0,0 +1,26 @@
+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
+              */

package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Windows

@@ -14,40 +14,51 @@ set(AWS_BASE_PATH ${CMAKE_CURRENT_LIST_DIR}/${AWSNATIVESDK_PACKAGE_NAME})
 # Include Path
 set(AWSNATIVESDK_INCLUDE_PATH ${AWS_BASE_PATH}/include)
 
-
 # Determine the lib path and possible bin path
 if (LY_MONOLITHIC_GAME)
-
-    set(AWSNATIVESDK_COMPILE_DEFINITIONS AWS_CUSTOM_MEMORY_MANAGEMENT PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
+    set(AWSNATIVESDK_COMPILE_DEFINITIONS 
+        AWS_CUSTOM_MEMORY_MANAGEMENT 
+        PLATFORM_SUPPORTS_AWS_NATIVE_SDK
+    )
     set(AWSNATIVE_SDK_LIB_PATH ${AWS_BASE_PATH}/lib/$<IF:$<CONFIG:Debug>,Debug,Release>)
-    unset(AWSNATIVE_SDK_BIN_PATH)
-
 else()
-
-    set(AWSNATIVESDK_COMPILE_DEFINITIONS AWS_CUSTOM_MEMORY_MANAGEMENT PLATFORM_SUPPORTS_AWS_NATIVE_SDK USE_IMPORT_EXPORT)
+    set(AWSNATIVESDK_COMPILE_DEFINITIONS 
+        AWS_CUSTOM_MEMORY_MANAGEMENT 
+        PLATFORM_SUPPORTS_AWS_NATIVE_SDK 
+        USE_IMPORT_EXPORT
+        USE_WINDOWS_DLL_SEMANTICS
+        AWS_CRT_CPP_USE_IMPORT_EXPORT
+        AWS_HTTP_USE_IMPORT_EXPORT
+        AWS_IO_USE_IMPORT_EXPORT
+        AWS_USE_IO_COMPLETION_PORTS
+        AWS_COMMON_USE_IMPORT_EXPORT
+        AWS_CAL_USE_IMPORT_EXPORT
+        AWS_COMPRESSION_USE_IMPORT_EXPORT
+        AWS_MQTT_USE_IMPORT_EXPORT
+        AWS_MQTT_WITH_WEBSOCKETS
+        AWS_AUTH_USE_IMPORT_EXPORT
+        AWS_CHECKSUMS_USE_IMPORT_EXPORT
+        AWS_EVENT_STREAM_USE_IMPORT_EXPORT
+        AWS_S3_USE_IMPORT_EXPORT
+    )
     set(AWSNATIVE_SDK_LIB_PATH ${AWS_BASE_PATH}/bin/$<IF:$<CONFIG:Debug>,Debug,Release>)
-    set(AWSNATIVE_SDK_BIN_PATH ${AWS_BASE_PATH}/bin/$<IF:$<CONFIG:Debug>,Debug,Release>)
-
 endif()
 
 # Helper function to define individual AWSNativeSDK Libraries
 function(ly_declare_aws_library)
-
     set(options)
     set(oneValueArgs NAME LIB_FILE)
-    set(multiValueArgs BUILD_DEPENDENCIES)
-    
+    set(multiValueArgs BUILD_DEPENDENCIES RUNTIME_DEPENDENCIES)
+
     cmake_parse_arguments(ly_declare_aws_library "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     set(TARGET_WITH_NAMESPACE "3rdParty::${AWSNATIVESDK_PACKAGE_NAME}::${ly_declare_aws_library_NAME}")
     if (NOT TARGET ${TARGET_WITH_NAMESPACE})
-
         add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
 
         ly_target_include_system_directories(TARGET ${TARGET_WITH_NAMESPACE} INTERFACE ${AWSNATIVESDK_INCLUDE_PATH})
 
         if (ly_declare_aws_library_LIB_FILE)
-
             target_link_libraries(${TARGET_WITH_NAMESPACE} 
                 INTERFACE
                     ${AWSNATIVE_SDK_LIB_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}${ly_declare_aws_library_LIB_FILE}${CMAKE_STATIC_LIBRARY_SUFFIX}
@@ -55,69 +66,83 @@ function(ly_declare_aws_library)
             )
 
             if (NOT LY_MONOLITHIC_GAME)
-                ly_add_dependencies(${TARGET_WITH_NAMESPACE} ${AWSNATIVE_SDK_BIN_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${ly_declare_aws_library_LIB_FILE}${CMAKE_SHARED_LIBRARY_SUFFIX})
+                ly_add_dependencies(${TARGET_WITH_NAMESPACE} ${AWSNATIVE_SDK_LIB_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${ly_declare_aws_library_LIB_FILE}${CMAKE_SHARED_LIBRARY_SUFFIX})
+
+                if (ly_declare_aws_library_RUNTIME_DEPENDENCIES)
+                    ly_add_dependencies(${TARGET_WITH_NAMESPACE} ${ly_declare_aws_library_RUNTIME_DEPENDENCIES})
+                endif()
             endif()
-                    
         elseif (ly_declare_aws_library_BUILD_DEPENDENCIES)
             target_link_libraries(${TARGET_WITH_NAMESPACE} 
                 INTERFACE
                     ${ly_declare_aws_library_BUILD_DEPENDENCIES}
             )
         endif()
-        
-        target_link_options(${TARGET_WITH_NAMESPACE} INTERFACE ${AWSNATIVESDK_LINK_OPTIONS})
 
+        target_link_options(${TARGET_WITH_NAMESPACE} INTERFACE ${AWSNATIVESDK_LINK_OPTIONS})
 
         target_compile_definitions(${TARGET_WITH_NAMESPACE} INTERFACE ${AWSNATIVESDK_COMPILE_DEFINITIONS})
 
     endif()
-    
 endfunction()
 
 
-#### Common ####
-ly_declare_aws_library(
-    NAME 
-        Common
-    LIB_FILE 
-        aws-c-common
-    BUILD_DEPENDENCIES
-        Bcrypt.lib
-        Userenv.lib
-        Version.lib
-        Wininet.lib
-        Winhttp.lib
-        Ws2_32.lib            
-)       
-
-#### Checksums ####
-ly_declare_aws_library(
-    NAME 
-        Checksums
-    LIB_FILE 
-        aws-checksums
+#### Core ####
+set(CORE_STATIC_LIBS
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-crt-cpp.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-s3.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-auth.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-mqtt.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-http.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-event-stream.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-io.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-checksums.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-compression.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-cal.lib
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-common.lib
+    Ncrypt
+    Secur32
+    Shlwapi
+    Userenv
+    Wininet
+    Winhttp
 )
 
-#### EventStream ####
-ly_declare_aws_library(
-    NAME 
-        EventStream
-    LIB_FILE 
-        aws-c-event-stream
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Checksums
+set(CORE_SHARED_LIBS
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-crt-cpp.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-s3.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-auth.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-mqtt.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-http.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-event-stream.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-io.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-checksums.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-compression.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-cal.dll
+    ${AWSNATIVE_SDK_LIB_PATH}/aws-c-common.dll
 )
 
-#### Core ####
-ly_declare_aws_library(
-    NAME 
-        Core
-    LIB_FILE 
-        aws-cpp-sdk-core
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Common
-        3rdParty::AWSNativeSDK::EventStream
-)
+if(LY_MONOLITHIC_GAME)
+    ly_declare_aws_library(
+        NAME 
+            Core
+        LIB_FILE 
+            aws-cpp-sdk-core
+        BUILD_DEPENDENCIES
+            ${CORE_STATIC_LIBS}
+    )
+else()
+    ly_declare_aws_library(
+        NAME 
+            Core
+        LIB_FILE 
+            aws-cpp-sdk-core
+        BUILD_DEPENDENCIES
+            ${CORE_STATIC_LIBS}
+        RUNTIME_DEPENDENCIES
+            ${CORE_SHARED_LIBS}
+    )
+endif()
 
 #### AccessManagement ####
 ly_declare_aws_library(
@@ -251,46 +276,6 @@ ly_declare_aws_library(
 #########
 ######### Grouping Definitions #########
 #########
-
-
-#### Dependencies ####
-ly_declare_aws_library(
-    NAME 
-        Dependencies
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Checksums
-        3rdParty::AWSNativeSDK::Common
-        3rdParty::AWSNativeSDK::EventStream
-)
-
-#### IdentityMetrics ####
-ly_declare_aws_library(
-    NAME 
-        IdentityMetrics
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Dependencies
-        3rdParty::AWSNativeSDK::CognitoIdentity
-        3rdParty::AWSNativeSDK::CognitoIdp
-        3rdParty::AWSNativeSDK::Core
-        3rdParty::AWSNativeSDK::IdentityManagement
-        3rdParty::AWSNativeSDK::STS
-        3rdParty::AWSNativeSDK::MobileAnalytics
-)
-
-#### IdentityLambda ####
-ly_declare_aws_library(
-    NAME 
-        IdentityLambda
-    BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Dependencies
-        3rdParty::AWSNativeSDK::CognitoIdentity
-        3rdParty::AWSNativeSDK::CognitoIdp
-        3rdParty::AWSNativeSDK::Core
-        3rdParty::AWSNativeSDK::IdentityManagement
-        3rdParty::AWSNativeSDK::Lambda
-        3rdParty::AWSNativeSDK::STS
-)
-
 #### GameLiftClient ####
 ly_declare_aws_library(
     NAME 
@@ -298,7 +283,6 @@ ly_declare_aws_library(
     BUILD_DEPENDENCIES 
         3rdParty::AWSNativeSDK::Core
         3rdParty::AWSNativeSDK::GameLift
-        3rdParty::AWSNativeSDK::Dependencies
 )
 
 #### AWSClientAuth ####
@@ -306,7 +290,7 @@ ly_declare_aws_library(
     NAME 
         AWSClientAuth
     BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Dependencies
+        3rdParty::AWSNativeSDK::Core
         3rdParty::AWSNativeSDK::CognitoIdentity
         3rdParty::AWSNativeSDK::CognitoIdp
         3rdParty::AWSNativeSDK::STS
@@ -319,10 +303,8 @@ ly_declare_aws_library(
     NAME 
         AWSCore
     BUILD_DEPENDENCIES 
-        3rdParty::AWSNativeSDK::Dependencies
         3rdParty::AWSNativeSDK::Core
         3rdParty::AWSNativeSDK::DynamoDB
         3rdParty::AWSNativeSDK::Lambda
         3rdParty::AWSNativeSDK::S3
 )
-

package-system/AWSNativeSDK/build_AWSNativeSDK_windows.cmd

@@ -8,6 +8,14 @@ REM
 
 SET SRC_PATH=temp\src
 SET BLD_PATH=temp\build
+SET INST_PATH=temp\install
+
+ECHO "Command: rmdir /Q /S %INST_PATH%"
+rmdir /Q /S %INST_PATH%
+IF %ERRORLEVEL% NEQ 0 (
+    ECHO "Command: rmdir /Q /S %INST_PATH% failed"
+    exit /b 1
+)
 
 REM Debug Shared
 call:ConfigureAndBuild Debug Shared
@@ -48,15 +56,17 @@ call cmake -S %SRC_PATH% -B %BLD_PATH%\%BUILD_TYPE%_%LIB_TYPE% ^
            -G "Visual Studio 16 2019" ^
            -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" ^
            -DENABLE_TESTING=OFF ^
            -DENABLE_RTTI=ON ^
-           -DCUSTOM_MEMORY_MANAGEMENT=ON^
+           -DCUSTOM_MEMORY_MANAGEMENT=ON ^
+           -DFORCE_SHARED_CRT=ON ^
            -DBUILD_SHARED_LIBS=%BUILD_SHARED% ^
            -DCMAKE_BUILD_TYPE="%BUILD_TYPE%" ^
-           -DCMAKE_INSTALL_BINDIR="bin/%BUILD_TYPE%" ^
-           -DCMAKE_INSTALL_LIBDIR="lib/%BUILD_TYPE%"
+           -DCMAKE_INSTALL_BINDIR="bin" ^
+           -DCMAKE_INSTALL_LIBDIR="lib"
 IF %ERRORLEVEL% NEQ 0 (
     ECHO "CMake Configure %BUILD_TYPE% %LIB_TYPE% failed"
     exit /b 1

package-system/AWSNativeSDK/build_config.json

@@ -12,6 +12,9 @@
    "Platforms":{
       "Windows":{
          "Windows":{
+            "git_tag":"1.9.50",
+            "package_version":"1.9.50-rev2",
+            "patch_file":"AWSNativeSDK-1.9.50-windows.patch",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Windows",
             "custom_build_cmd": [
                "build_AWSNativeSDK_windows.cmd"

package-system/AWSNativeSDK/install_AWSNativeSDK_windows.cmd

@@ -23,18 +23,19 @@ mkdir %OUT_LIB_PATH%\Release
 
 REM CMake Install Debug and 3rdParty
 ECHO "CMake Install Debug Shared to %INST_PATH%"
-call cmake --install %BLD_PATH%\Debug_Shared --prefix %INST_PATH% --config Debug
+call cmake --install %BLD_PATH%\Debug_Shared --prefix %INST_PATH%\Debug_Shared --config Debug
 IF %ERRORLEVEL% NEQ 0 (
-    ECHO "CMake Install Debug Shared to %INST_PATH% failed"
+    ECHO "CMake Install Debug Shared to %INST_PATH%\Debug_Shared failed"
     exit /b 1
 )
 
 ECHO "CMake Install Debug Static to %INST_PATH%"
-call cmake --install %BLD_PATH%\Debug_Static --prefix %INST_PATH% --config Debug
+call cmake --install %BLD_PATH%\Debug_Static --prefix %INST_PATH%\Debug_Static --config Debug
 IF %ERRORLEVEL% NEQ 0 (
-    ECHO "CMake Install Debug Static to %INST_PATH% failed"
+    ECHO "CMake Install Debug Static to %INST_PATH%\Debug_Static failed"
     exit /b 1
 )
+
 call:CopyDynamicAndStaticLibs "Debug"
 IF %ERRORLEVEL% NEQ 0 (
     exit /b 1
@@ -42,18 +43,19 @@ IF %ERRORLEVEL% NEQ 0 (
 
 REM CMake Install Release and 3rdParty
 ECHO "CMake Install Release Shared to %INST_PATH%"
-call cmake --install %BLD_PATH%\Release_Shared --prefix %INST_PATH% --config Release
+call cmake --install %BLD_PATH%\Release_Shared --prefix %INST_PATH%\Release_Shared --config Release
 IF %ERRORLEVEL% NEQ 0 (
-    ECHO "CMake Install Release Shared to %INST_PATH% failed"
+    ECHO "CMake Install Release Shared to %INST_PATH%\Release_Shared failed"
     exit /b 1
 )
 
 ECHO "CMake Install Release Static to %INST_PATH%"
-call cmake --install %BLD_PATH%\Release_Static --prefix %INST_PATH% --config Release
+call cmake --install %BLD_PATH%\Release_Static --prefix %INST_PATH%\Release_Static --config Release
 IF %ERRORLEVEL% NEQ 0 (
-    ECHO "CMake Install Release Static to %INST_PATH% failed"
+    ECHO "CMake Install Release Static to %INST_PATH%\Release_Static failed"
     exit /b 1
 )
+
 call:CopyDynamicAndStaticLibs "Release"
 IF %ERRORLEVEL% NEQ 0 (
     exit /b 1
@@ -61,7 +63,7 @@ IF %ERRORLEVEL% NEQ 0 (
 
 REM Copy include headers
 ECHO "Copying include headers to %OUT_INCLUDE_PATH%"
-Xcopy %INST_PATH%\include\* %OUT_INCLUDE_PATH% /E /Y
+Xcopy %INST_PATH%\Release_Static\include\* %OUT_INCLUDE_PATH% /E /Y
 IF %ERRORLEVEL% NEQ 0 (
     ECHO "Copying include headers to %OUT_INCLUDE_PATH% failed"
     exit /b 1
@@ -81,44 +83,29 @@ exit /b 0
 :CopyDynamicAndStaticLibs
 SET BUILD_TYPE=%~1
 ECHO "Copying shared .dlls to %OUT_BIN_PATH%\%BUILD_TYPE%"
-copy /Y %INST_PATH%\bin\%BUILD_TYPE%\*.dll %OUT_BIN_PATH%\%BUILD_TYPE%\
+copy /Y %INST_PATH%\%BUILD_TYPE%_Shared\bin\*.dll %OUT_BIN_PATH%\%BUILD_TYPE%\
 IF %ERRORLEVEL% NEQ 0 (
     ECHO "Copying shared .dlls to %OUT_BIN_PATH%\%BUILD_TYPE% failed"
     exit /b 1
 )
 
 ECHO "Copying shared .libs to %OUT_BIN_PATH%\%BUILD_TYPE%"
-copy /Y %INST_PATH%\bin\%BUILD_TYPE%\*.lib %OUT_BIN_PATH%\%BUILD_TYPE%\
+copy /Y %INST_PATH%\%BUILD_TYPE%_Shared\bin\*.lib %OUT_BIN_PATH%\%BUILD_TYPE%\
 IF %ERRORLEVEL% NEQ 0 (
     ECHO "Copying shared .libs to %OUT_BIN_PATH%\%BUILD_TYPE% failed"
     exit /b 1
 )
 
-ECHO "Copying 3rdParty shared .dlls to %OUT_BIN_PATH%\%BUILD_TYPE%"
-copy /Y %BLD_PATH%\%BUILD_TYPE%_Shared\.deps\install\bin\*.dll %OUT_BIN_PATH%\%BUILD_TYPE%\
-IF %ERRORLEVEL% NEQ 0 (
-    ECHO "Copying 3rdParty shared .dlls to %OUT_BIN_PATH%\%BUILD_TYPE% failed"
-    exit /b 1
-)
-
-ECHO "Copying 3rdParty shared .libs to %OUT_BIN_PATH%\%BUILD_TYPE%"
-copy /Y %BLD_PATH%\%BUILD_TYPE%_Shared\.deps\install\lib\*.lib %OUT_BIN_PATH%\%BUILD_TYPE%\
+copy /Y %INST_PATH%\%BUILD_TYPE%_Shared\lib\*.lib %OUT_BIN_PATH%\%BUILD_TYPE%\
 IF %ERRORLEVEL% NEQ 0 (
-    ECHO "Copying 3rdParty shared .libs to %OUT_BIN_PATH%\%BUILD_TYPE% failed"
+    ECHO "Copying shared .libs to %OUT_BIN_PATH%\%BUILD_TYPE% failed"
     exit /b 1
 )
 
 ECHO "Copying static .libs to %OUT_LIB_PATH%\%BUILD_TYPE%"
-copy /Y %INST_PATH%\lib\%BUILD_TYPE%\*.lib %OUT_LIB_PATH%\%BUILD_TYPE%\
+copy /Y %INST_PATH%\%BUILD_TYPE%_Static\lib\*.lib %OUT_LIB_PATH%\%BUILD_TYPE%\
 IF %ERRORLEVEL% NEQ 0 (
     ECHO "Copying static .libs to %OUT_LIB_PATH%\%BUILD_TYPE% failed"
     exit /b 1
 )
-
-ECHO "Copying 3rdParty static .libs to %OUT_LIB_PATH%\%BUILD_TYPE%"
-copy /Y %BLD_PATH%\%BUILD_TYPE%_Static\.deps\install\lib\*.lib %OUT_LIB_PATH%\%BUILD_TYPE%\
-IF %ERRORLEVEL% NEQ 0 (
-    ECHO "Copying 3rdParty static .libs to %OUT_LIB_PATH%\%BUILD_TYPE% failed"
-    exit /b 1
-)
 GOTO:EOF

package_build_list_host_windows.json

@@ -3,9 +3,9 @@
     "comment2" : "build_from_source is package name --> build script to call with params",
     "comment3" : "build_from_folder is package name --> folder containing built image of package",
     "comment4" : "Note:  Build from source occurs before build_from_folder",
-    "build_from_source" : {
-        "AWSNativeSDK-1.7.167-rev4-windows" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean",
-        "AWSNativeSDK-1.9.50-rev1-android" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean",
+    "build_from_source": {
+        "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.9.50-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --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",
         "Lua-5.3.5-rev5-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Windows --package-root ../../package-system --clean",
@@ -50,8 +50,8 @@
   "build_from_folder": {
     "astc-encoder-3.2-rev2-windows" : "package-system/astc-encoder-windows",
     "AWSGameLiftServerSDK-3.4.1-rev1-windows" : "package-system/AWSGameLiftServerSDK/windows",
-    "AWSNativeSDK-1.7.167-rev3-windows": "package-system/AWSNativeSDK-windows",
-    "AWSNativeSDK-1.7.167-rev6-android": "package-system/AWSNativeSDK-android",
+    "AWSNativeSDK-1.9.50-rev2-windows": "package-system/AWSNativeSDK-windows",
+    "AWSNativeSDK-1.9.50-rev1-android": "package-system/AWSNativeSDK-android",
     "Blast-v1.1.7_rc2-9-geb169fe-rev1-windows": "package-system/Blast-windows",
     "Crashpad-0.8.0-rev1-windows" : "package-system/Crashpad-windows",
     "Lua-5.3.5-rev5-windows": "package-system/Lua-windows",