From b1b233192267f12e7ca50788da4fe18d2a0e1039 Mon Sep 17 00:00:00 2001 From: AMZN-Gene Date: Tue, 16 Jul 2024 18:10:01 -0700 Subject: [PATCH 1/3] Adding runtime dependencies for AWSNativeSDK on Linux Signed-off-by: AMZN-Gene --- .../AWSNativeSDK/FindAWSNativeSDK.cmake.Linux | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Linux b/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Linux index 9bc99627..4b715b6c 100644 --- a/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Linux +++ b/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Linux @@ -32,7 +32,7 @@ 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}) @@ -61,6 +61,11 @@ function(ly_declare_aws_library) ) ly_add_dependencies(${TARGET_WITH_NAMESPACE} ${AWSNATIVE_SDK_LIB_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${ly_declare_aws_library_LIB_FILE}${CMAKE_SHARED_LIBRARY_SUFFIX} ${ly_declare_aws_library_BUILD_DEPENDENCIES}) + + # Add any runtime dependencies if exist + 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) @@ -97,6 +102,22 @@ set(CORE_STATIC_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libcurl.a ) +set(CORE_SHARED_LIBS + ${AWSNATIVE_SDK_LIB_PATH}/libaws-crt-cpp.so + ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-mqtt.so.1.0.0 + ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream.so.1.0.0 + ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-s3.so.0unstable + ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-auth.so.1.0.0 + ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-http.so.1.0.0 + ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-io.so.1.0.0 + ${AWSNATIVE_SDK_LIB_PATH}/libs2n.so.1 + ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-compression.so.1.0.0 + ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-cal.so.1.0.0 + ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-sdkutils.so.1.0.0 + ${AWSNATIVE_SDK_LIB_PATH}/libaws-checksums.so.1.0.0 + ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.so.1 +) + if(LY_MONOLITHIC_GAME) ly_declare_aws_library( NAME @@ -113,6 +134,8 @@ else() LIB_FILE aws-cpp-sdk-core curl + RUNTIME_DEPENDENCIES + ${CORE_SHARED_LIBS} ) endif() From 689fcf5bf5418805ee646154f99c3a4bbb4095d7 Mon Sep 17 00:00:00 2001 From: AMZN-Gene Date: Thu, 18 Jul 2024 09:56:36 -0700 Subject: [PATCH 2/3] Bumping AWS SDK to linux revision 2 Signed-off-by: AMZN-Gene --- package_build_list_host_linux.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json index 3f8cf344..b21f1668 100644 --- a/package_build_list_host_linux.json +++ b/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.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux --clean", "AWSGameLiftServerSDK-5.1.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux-aarch64 --clean", - "AWSNativeSDK-1.11.361-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --clean", - "AWSNativeSDK-1.11.361-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean", + "AWSNativeSDK-1.11.361-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --clean", + "AWSNativeSDK-1.11.361-rev2-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", @@ -55,8 +55,8 @@ "assimp-5.2.5-rev1-linux": "package-system/assimp-linux", "AWSGameLiftServerSDK-5.1.2-rev1-linux": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux", "AWSGameLiftServerSDK-5.1.2-rev1-linux-aarch64": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux-aarch64", - "AWSNativeSDK-1.11.361-rev1-linux": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux", - "AWSNativeSDK-1.11.361-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64", + "AWSNativeSDK-1.11.361-rev2-linux": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux", + "AWSNativeSDK-1.11.361-rev2-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", From fd7dd0a7bf3d805bbd1f27dd348eee1f65806560 Mon Sep 17 00:00:00 2001 From: AMZN-Gene Date: Thu, 18 Jul 2024 10:36:33 -0700 Subject: [PATCH 3/3] Bumping AWS SDK to linux revision 2 Signed-off-by: AMZN-Gene --- package-system/AWSNativeSDK/build_config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-system/AWSNativeSDK/build_config.json b/package-system/AWSNativeSDK/build_config.json index 0badb4df..47daf3cd 100644 --- a/package-system/AWSNativeSDK/build_config.json +++ b/package-system/AWSNativeSDK/build_config.json @@ -63,7 +63,7 @@ [ "OpenSSL-1.1.1t-rev1-linux", "63aea898b7afe8faccd0c7261e62d2f8b7b870f678a4520d5be81e5815542b39", "" ], [ "zlib-1.2.11-rev5-linux", "9be5ea85722fc27a8645a9c8a812669d107c68e6baa2ca0740872eaeb6a8b0fc", "" ] ], - "package_version":"1.11.361-rev1", + "package_version":"1.11.361-rev2", "cmake_find_source":"FindAWSNativeSDK.cmake.Linux", "custom_build_cmd": [ "./build-linux.sh", @@ -81,7 +81,7 @@ [ "OpenSSL-1.1.1t-rev1-linux-aarch64", "f32721bec9c82d1bd7fb244d78d5dc4e2a47e7b808bb36027236ad377e241ea5", "" ], [ "zlib-1.2.11-rev5-linux-aarch64", "ce9d1ed2883d77ffc69c7982c078595c1f89ca55ec19d89fe7e6beb05f774775", "" ] ], - "package_version":"1.11.361-rev1", + "package_version":"1.11.361-rev2", "cmake_find_source":"FindAWSNativeSDK.cmake.Linux", "custom_build_cmd": [ "./build-linux.sh",