Merge lastest upstream/main

Signed-off-by: AMZN-Gene <[email protected]>
o3de · Nov 30, 2023 · 30cfbab · 30cfbab
2 parents 757df11 + 7901137
commit 30cfbab
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Linux b/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Linux
@@ -188,6 +188,9 @@ ly_declare_aws_library(
         aws-cpp-sdk-lambda
 )
 
+#### MobileAnalytics ####
+# MobileAnalytics library no longer exists and should be replaced with AWS PinPoint or other equivalent API
+
 #### Queues ####
 ly_declare_aws_library(
     NAME 

diff --git a/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Mac b/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Mac
@@ -225,6 +225,9 @@ ly_declare_aws_library(
         aws-cpp-sdk-lambda
 )
 
+#### MobileAnalytics ####
+# MobileAnalytics library no longer exists and should be replaced with AWS PinPoint or other equivalent API
+
 #### Queues ####
 ly_declare_aws_library(
     NAME 

diff --git a/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Windows b/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Windows
@@ -218,6 +218,9 @@ ly_declare_aws_library(
         aws-cpp-sdk-lambda
 )
 
+#### MobileAnalytics ####
+# MobileAnalytics library no longer exists and should be replaced with AWS PinPoint or other equivalent API
+
 #### Queues ####
 ly_declare_aws_library(
     NAME 

diff --git a/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.iOS b/package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.iOS
@@ -162,6 +162,9 @@ ly_declare_aws_library(
         aws-cpp-sdk-lambda
 )
 
+#### MobileAnalytics ####
+# MobileAnalytics library no longer exists and should be replaced with AWS PinPoint or other equivalent API
+
 #### Queues ####
 ly_declare_aws_library(
     NAME 

diff --git a/package-system/AWSNativeSDK/docker_build_aws_sdk.sh b/package-system/AWSNativeSDK/docker_build_aws_sdk.sh
@@ -168,7 +168,7 @@ configure_and_build() {
  -DCURL_INCLUDE_DIR=${CURL_INSTALL}/include \
  -DCURL_LIBRARY=${dep_curl_lib} \
  -Dcrypto_INCLUDE_DIR=${DEPENDENT_OPENSSL_BASE}/include \
- -Dcrypto_LIBRARY=$DEPENDENT_OPENSSL_BASE/lib/libcrypto.a \
+ -Dcrypto_LIBRARY=${DEPENDENT_OPENSSL_BASE}/lib/libcrypto.a \
  -DOPENSSL_CRYPTO_LIBRARY=${DEPENDENT_OPENSSL_BASE}/lib/libssl.a \
  -DOPENSSL_INCLUDE_DIR=${DEPENDENT_OPENSSL_BASE}/include \
  -DZLIB_LIBRARY=${DEPENDENT_ZLIB_BASE}/lib/libz.a \