From 67b4dea6b319c0627b27d448d15f48ebab1b4b5e Mon Sep 17 00:00:00 2001 From: AMZN-Gene Date: Thu, 21 Sep 2023 16:53:44 -0700 Subject: [PATCH] Keeping Android at AWS SDK 1.9.50 due to bug: https://github.com/aws/aws-sdk-cpp/issues/2452 Signed-off-by: AMZN-Gene --- .../AWSNativeSDK-1.9.50-android.patch | 24 +++++++++++++++++++ .../FindAWSNativeSDK.cmake.Android | 23 +++++++++++++++++- .../build_AWSNativeSDK_android.cmd | 2 +- package-system/AWSNativeSDK/build_config.json | 3 ++- package_build_list_host_windows.json | 4 ++-- 5 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 package-system/AWSNativeSDK/AWSNativeSDK-1.9.50-android.patch diff --git a/package-system/AWSNativeSDK/AWSNativeSDK-1.9.50-android.patch b/package-system/AWSNativeSDK/AWSNativeSDK-1.9.50-android.patch new file mode 100644 index 00000000..2034a097 --- /dev/null +++ b/package-system/AWSNativeSDK/AWSNativeSDK-1.9.50-android.patch @@ -0,0 +1,24 @@ +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 diff --git a/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Android b/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Android index 8889b49f..f03508bc 100644 --- a/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Android +++ b/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Android @@ -106,7 +106,6 @@ 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} @@ -204,6 +203,14 @@ 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 @@ -273,6 +280,20 @@ 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 diff --git a/package-system/AWSNativeSDK/build_AWSNativeSDK_android.cmd b/package-system/AWSNativeSDK/build_AWSNativeSDK_android.cmd index ec854e4a..addd9eee 100644 --- a/package-system/AWSNativeSDK/build_AWSNativeSDK_android.cmd +++ b/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;queues;s3;sns;sqs;sts;transfer" ^ + -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^ diff --git a/package-system/AWSNativeSDK/build_config.json b/package-system/AWSNativeSDK/build_config.json index ed75c659..864cc479 100644 --- a/package-system/AWSNativeSDK/build_config.json +++ b/package-system/AWSNativeSDK/build_config.json @@ -22,11 +22,12 @@ ] }, "Android":{ - "package_version":"1.11.144-rev1", + "package_version":"1.9.50-rev2", "depends_on_packages": [ [ "OpenSSL-1.1.1m-rev1-android", "b11fe493af5d6b03ebbf1a2c97fea443b125e88def5cd1c32b854220b3ad4681", "" ], [ "zlib-1.2.11-rev5-android", "73c9e88892c237a3fc6eafc04268ccd9d479e6d55f9df2ed58b236c8f9cf2cae", "" ] ], + "patch_file":"AWSNativeSDK-1.9.50-android.patch", "cmake_find_source":"FindAWSNativeSDK.cmake.Android", "custom_build_cmd": [ "build_AWSNativeSDK_android.cmd" diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json index 0e659aa6..7d1ced80 100644 --- a/package_build_list_host_windows.json +++ b/package_build_list_host_windows.json @@ -9,7 +9,7 @@ "azslc-1.8.15-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Windows --package-root ../../package-system/azslc/temp --clean", "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.11.144-rev1-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-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --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", @@ -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-rev1-android": "package-system/AWSNativeSDK-android", + "AWSNativeSDK-1.9.50-rev2-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",