Android build fixes

Signed-off-by: Steve Pham <[email protected]>

package-system/AWSNativeSDK/AWSNativeSDK-1.11.288-android.patch

@@ -1,24 +1,13 @@
-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/tools/android-build/CMakeLists.txt b/tools/android-build/CMakeLists.txt
+index dedf79cec8..14beffaf14 100644
+--- a/tools/android-build/CMakeLists.txt
++++ b/tools/android-build/CMakeLists.txt
+@@ -37,7 +37,7 @@ if(BUILD_OPENSSL)
+     ExternalProject_Add(OPENSSL
+         SOURCE_DIR ${OPENSSL_SOURCE_DIR}
+         GIT_REPOSITORY https://github.com/openssl/openssl.git
+-        GIT_TAG e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72 # 1.1.1g
++        GIT_TAG ca2e0784d2c38edcefd5d68028f4d954bd8faddb # 1.1.1o
+         UPDATE_COMMAND ""
+         PATCH_COMMAND cd ${CMAKE_BINARY_DIR} && python ${AWS_NATIVE_SDK_ROOT}/tools/android-build/configure_openssl_cmake.py --source ${AWS_NATIVE_SDK_ROOT} --dest ${OPENSSL_SOURCE_DIR}
+         CMAKE_ARGS

package-system/AWSNativeSDK/build_AWSNativeSDK_android.cmd

@@ -12,7 +12,7 @@ SET BLD_PATH=temp\build
 set "DOWNLOADED_PACKAGE_FOLDERS=%DOWNLOADED_PACKAGE_FOLDERS:\=/%"
 
 IF "%ANDROID_NDK_ROOT%"=="" (
-    ECHO "Required envrironment variable ANDROID_NDK_ROOT is missing, please set it to local android ndk directory"
+    ECHO "Required envrironment variable ANDROID_NDK_ROOT is missing, please set it to a local android ndk directory that is at least version 25.2.9519653"
     exit /b 1
 )
 
@@ -62,14 +62,14 @@ 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;mobileanalytics;queues;s3;sns;sqs;sts;transfer" ^
+           -DBUILD_ONLY="access-management;bedrock;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" ^
            -DENABLE_TESTING=OFF ^
            -DENABLE_RTTI=ON ^
            -DCUSTOM_MEMORY_MANAGEMENT=ON^
            -DCMAKE_INSTALL_BINDIR="bin/%BUILD_TYPE%_%LIB_TYPE%" ^
            -DCMAKE_INSTALL_LIBDIR="lib/%BUILD_TYPE%_%LIB_TYPE%" ^
            -DCMAKE_INSTALL_PREFIX="%BLD_PATH%/%BUILD_TYPE%_%LIB_TYPE%" ^
-           -DANDROID_BUILD_OPENSSL=OFF ^
+           -DANDROID_BUILD_OPENSSL=ON ^
            -DANDROID_BUILD_ZLIB=OFF ^
            -DANDROID_BUILD_CURL=ON ^
            -DCMAKE_MODULE_PATH="%DOWNLOADED_PACKAGE_FOLDERS%" ^

package-system/AWSNativeSDK/build_config.json

@@ -24,7 +24,6 @@
          "Android":{
             "package_version":"1.11.288-rev1",
             "depends_on_packages": [
-               [ "OpenSSL-1.1.1m-rev1-android", "b11fe493af5d6b03ebbf1a2c97fea443b125e88def5cd1c32b854220b3ad4681", "" ],
                [ "zlib-1.2.11-rev5-android", "73c9e88892c237a3fc6eafc04268ccd9d479e6d55f9df2ed58b236c8f9cf2cae", "" ]
             ],
             "patch_file":"AWSNativeSDK-1.11.288-android.patch",