Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AWS SDK Update to Pass Apple AppStore Submission #256

Merged
merged 6 commits into from
Jul 8, 2024
Merged

AWS SDK Update to Pass Apple AppStore Submission #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6470c65
WiP. Upgrading the AWS SDK 11.344. Not enabling AWS_APPSTORE_SAFE yet…
AMZN-Gene Jun 11, 2024
16e42ed
Add AWS_APPSTORE_SAFE flag so that non-public APIs are stripped out
AMZN-Gene Jun 12, 2024
ea26524
Update package-system/AWSNativeSDK/build_config.json
AMZN-Gene Jun 12, 2024
e37e2ae
Update package-system/AWSNativeSDK/build_config.json
AMZN-Gene Jun 12, 2024
133c55e
Adding Windows patch to fix AWS bug (see https://github.com/aws/aws-s…
AMZN-Gene Jun 19, 2024
f07d14f
AWSSDK 361 fixes windows and android bug. (see https://github.com/aws…
AMZN-Gene Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package-system/AWSNativeSDK/build_AWSNativeSDK_ios.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ configure_and_build_static() {
build_type=$1

echo "CMake Configure $build_type Static"
CFLAGS="-DAWS_APPSTORE_SAFE" \
CXXFLAGS="-Wno-deprecated-declarations -Wno-shorten-64-to-32 -fPIC" \
cmake -S "$src_path" -B "$bld_path/${build_type}_Static" \
-DTARGET_ARCH=APPLE \
Expand Down
18 changes: 9 additions & 9 deletions package-system/AWSNativeSDK/build_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"git_url":"https://github.com/aws/aws-sdk-cpp.git",
"git_tag":"1.11.288",
"git_tag":"1.11.361",
"package_name":"AWSNativeSDK",
"package_version":"1.11.288-rev1",
"package_version":"1.11.361-rev1",
"package_url":"https://github.com/aws/aws-sdk-cpp",
"package_license":"Apache-2.0",
"package_license_file":"LICENSE",
Expand All @@ -12,7 +12,7 @@
"Platforms":{
"Windows":{
"Windows":{
"package_version":"1.11.288-rev1",
"package_version":"1.11.361-rev1",
"cmake_find_source":"FindAWSNativeSDK.cmake.Windows",
"custom_build_cmd": [
"build_AWSNativeSDK_windows.cmd"
Expand All @@ -22,7 +22,7 @@
]
},
"Android":{
"package_version":"1.11.288-rev2",
"package_version":"1.11.361-rev1",
"depends_on_packages": [
[ "zlib-1.2.11-rev5-android", "73c9e88892c237a3fc6eafc04268ccd9d479e6d55f9df2ed58b236c8f9cf2cae", "" ]
],
Expand All @@ -47,7 +47,7 @@
]
},
"iOS":{
"package_version":"1.11.288-rev2",
"package_version":"1.11.361-rev1",
"cmake_find_source":"FindAWSNativeSDK.cmake.iOS",
"custom_build_cmd": [
"./build_AWSNativeSDK_ios.sh"
Expand All @@ -63,11 +63,11 @@
[ "OpenSSL-1.1.1t-rev1-linux", "63aea898b7afe8faccd0c7261e62d2f8b7b870f678a4520d5be81e5815542b39", "" ],
[ "zlib-1.2.11-rev5-linux", "9be5ea85722fc27a8645a9c8a812669d107c68e6baa2ca0740872eaeb6a8b0fc", "" ]
],
"package_version":"1.11.288-rev1",
"package_version":"1.11.361-rev1",
"cmake_find_source":"FindAWSNativeSDK.cmake.Linux",
"custom_build_cmd": [
"./build-linux.sh",
"aws_native_sdk_1_11_288",
"aws_native_sdk_1_11_361",
"20.04",
"curl-7_68_0",
"x86_64"
Expand All @@ -81,11 +81,11 @@
[ "OpenSSL-1.1.1t-rev1-linux-aarch64", "f32721bec9c82d1bd7fb244d78d5dc4e2a47e7b808bb36027236ad377e241ea5", "" ],
[ "zlib-1.2.11-rev5-linux-aarch64", "ce9d1ed2883d77ffc69c7982c078595c1f89ca55ec19d89fe7e6beb05f774775", "" ]
],
"package_version":"1.11.288-rev1",
"package_version":"1.11.361-rev1",
"cmake_find_source":"FindAWSNativeSDK.cmake.Linux",
"custom_build_cmd": [
"./build-linux.sh",
"aws_native_sdk_1_11_288",
"aws_native_sdk_1_11_361",
"20.04",
"curl-7_68_0",
"aarch64"
Expand Down
8 changes: 4 additions & 4 deletions package_build_list_host_darwin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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-rev2-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name iOS --package-root ../../package-system --clean",
"AWSNativeSDK-1.11.361-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean",
"AWSNativeSDK-1.11.361-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",
Expand Down Expand Up @@ -56,8 +56,8 @@
},
"build_from_folder": {
"assimp-5.2.5-rev1-mac": "package-system/assimp-mac",
"AWSNativeSDK-1.11.288-rev1-mac": "package-system/AWSNativeSDK-mac",
"AWSNativeSDK-1.11.288-rev2-ios": "package-system/AWSNativeSDK-ios",
"AWSNativeSDK-1.11.361-rev1-mac": "package-system/AWSNativeSDK-mac",
"AWSNativeSDK-1.11.361-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",
Expand Down
4 changes: 2 additions & 2 deletions package_build_list_host_linux-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-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.288-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean",
"AWSNativeSDK-1.11.361-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",
Expand Down Expand Up @@ -49,7 +49,7 @@
"astc-encoder-3.2-rev3-linux-aarch64": "package-system/astc-encoder/temp/astc-encoder-linux-aarch64",
"AWSGameLiftServerSDK-5.1.2-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.288-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64",
"AWSNativeSDK-1.11.361-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",
Expand Down
8 changes: 4 additions & 4 deletions package_build_list_host_linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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",
"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",
"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",
Expand Down Expand Up @@ -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.288-rev1-linux": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux",
"AWSNativeSDK-1.11.288-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-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",
"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",
Expand Down
8 changes: 4 additions & 4 deletions package_build_list_host_windows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-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.288-rev2-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",
"AWSNativeSDK-1.11.361-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean",
"AWSNativeSDK-1.11.361-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",
Expand Down Expand Up @@ -71,8 +71,8 @@
"azslc-1.8.19-rev1-windows": "package-system/azslc/temp/azslc-windows",
"AWSGameLiftServerSDK-5.1.2-rev1-windows": "package-system/AWSGameLiftServerSDK-windows",
"AwsIotDeviceSdkCpp-1.15.2-rev1-windows": "package-system/AwsIotDeviceSdkCpp-windows",
"AWSNativeSDK-1.11.288-rev2-android": "package-system/AWSNativeSDK-android",
"AWSNativeSDK-1.11.288-rev1-windows": "package-system/AWSNativeSDK-windows",
"AWSNativeSDK-1.11.361-rev1-android": "package-system/AWSNativeSDK-android",
"AWSNativeSDK-1.11.361-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",
Expand Down
Loading