2
0
Эх сурвалжийг харах

Android AWS SDK needs Android API>=33 to build AWS-Core which uses backtrace() in the standard c library

Signed-off-by: AMZN-Gene <[email protected]>
AMZN-Gene 1 жил өмнө
parent
commit
d3812c5936

+ 5 - 8
package-system/AWSNativeSDK/build_AWSNativeSDK_android.cmd

@@ -8,7 +8,6 @@ REM
 
 
 SET SRC_PATH=temp\src
 SET SRC_PATH=temp\src
 SET BLD_PATH=temp\build
 SET BLD_PATH=temp\build
-SET OPENSSL_PATH=temp\OpenSSL-1.1.1m-rev1-android\OpenSSL
 
 
 set "DOWNLOADED_PACKAGE_FOLDERS=%DOWNLOADED_PACKAGE_FOLDERS:\=/%"
 set "DOWNLOADED_PACKAGE_FOLDERS=%DOWNLOADED_PACKAGE_FOLDERS:\=/%"
 
 
@@ -58,12 +57,12 @@ call cmake -S %SRC_PATH% -B %BLD_PATH%\%BUILD_TYPE%_%LIB_TYPE% ^
            -DBUILD_SHARED_LIBS=%BUILD_SHARED% ^
            -DBUILD_SHARED_LIBS=%BUILD_SHARED% ^
            -DCMAKE_BUILD_TYPE="%BUILD_TYPE%" ^
            -DCMAKE_BUILD_TYPE="%BUILD_TYPE%" ^
            -DTARGET_ARCH=ANDROID ^
            -DTARGET_ARCH=ANDROID ^
-           -DANDROID_NATIVE_API_LEVEL=21 ^
+           -DANDROID_NATIVE_API_LEVEL=33 ^
            -DANDROID_ABI=arm64-v8a ^
            -DANDROID_ABI=arm64-v8a ^
            -DCPP_STANDARD=17 ^
            -DCPP_STANDARD=17 ^
            -DCMAKE_C_FLAGS="-fPIC" ^
            -DCMAKE_C_FLAGS="-fPIC" ^
            -DCMAKE_CXX_FLAGS="-fPIC" ^
            -DCMAKE_CXX_FLAGS="-fPIC" ^
-           -DBUILD_ONLY="access-management;bedrock;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;mobileanalytics;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_TESTING=OFF ^
            -DENABLE_RTTI=ON ^
            -DENABLE_RTTI=ON ^
            -DCUSTOM_MEMORY_MANAGEMENT=ON^
            -DCUSTOM_MEMORY_MANAGEMENT=ON^
@@ -72,12 +71,10 @@ call cmake -S %SRC_PATH% -B %BLD_PATH%\%BUILD_TYPE%_%LIB_TYPE% ^
            -DCMAKE_INSTALL_PREFIX="%BLD_PATH%/%BUILD_TYPE%_%LIB_TYPE%" ^
            -DCMAKE_INSTALL_PREFIX="%BLD_PATH%/%BUILD_TYPE%_%LIB_TYPE%" ^
            -DANDROID_BUILD_OPENSSL=OFF ^
            -DANDROID_BUILD_OPENSSL=OFF ^
            -DANDROID_BUILD_ZLIB=OFF ^
            -DANDROID_BUILD_ZLIB=OFF ^
+           -DANDROID_BUILD_CURL=ON ^
            -DCMAKE_MODULE_PATH="%DOWNLOADED_PACKAGE_FOLDERS%" ^
            -DCMAKE_MODULE_PATH="%DOWNLOADED_PACKAGE_FOLDERS%" ^
-           -Dcrypto_LIBRARY="%OPENSSL_PATH%/lib/libcrypto.a" ^
-           -Dcrypto_INCLUDE_DIR="%OPENSSL_PATH%/include" ^
-           -DOPENSSL_ROOT_DIR="%OPENSSL_PATH%" ^
-           -DOPENSSL_INCLUDE_DIR="%OPENSSL_PATH%/include" ^
-           -DFORCE_CURL=ON
+           -DLEGACY_MODE=OFF
+           
 
 
 IF %ERRORLEVEL% NEQ 0 (
 IF %ERRORLEVEL% NEQ 0 (
     ECHO "CMake Configure %BUILD_TYPE% %LIB_TYPE% failed"
     ECHO "CMake Configure %BUILD_TYPE% %LIB_TYPE% failed"

+ 2 - 1
package-system/AWSNativeSDK/build_config.json

@@ -27,6 +27,7 @@
                [ "OpenSSL-1.1.1m-rev1-android", "b11fe493af5d6b03ebbf1a2c97fea443b125e88def5cd1c32b854220b3ad4681", "" ],
                [ "OpenSSL-1.1.1m-rev1-android", "b11fe493af5d6b03ebbf1a2c97fea443b125e88def5cd1c32b854220b3ad4681", "" ],
                [ "zlib-1.2.11-rev5-android", "73c9e88892c237a3fc6eafc04268ccd9d479e6d55f9df2ed58b236c8f9cf2cae", "" ]
                [ "zlib-1.2.11-rev5-android", "73c9e88892c237a3fc6eafc04268ccd9d479e6d55f9df2ed58b236c8f9cf2cae", "" ]
             ],
             ],
+            "patch_file":"AWSNativeSDK-1.11.288-android.patch",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Android",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Android",
             "custom_build_cmd": [
             "custom_build_cmd": [
                "build_AWSNativeSDK_android.cmd"
                "build_AWSNativeSDK_android.cmd"
@@ -66,7 +67,7 @@
             "cmake_find_source":"FindAWSNativeSDK.cmake.Linux",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Linux",
             "custom_build_cmd": [
             "custom_build_cmd": [
                "./build-linux.sh",
                "./build-linux.sh",
-               "aws_native_sdk_1_11_264",
+               "aws_native_sdk_1_11_288",
                "20.04",
                "20.04",
                "curl-7_68_0",
                "curl-7_68_0",
                "x86_64"
                "x86_64"