From 425643763836aa0c951ff529fec6c26ae3637097 Mon Sep 17 00:00:00 2001 From: hanbowen Date: Mon, 11 Jul 2022 22:09:07 +0800 Subject: [PATCH] drop nessary custom android.cmake --- scripts/mbedtls/android.cmake | 9 --------- scripts/mbedtls/build.sh | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 scripts/mbedtls/android.cmake diff --git a/scripts/mbedtls/android.cmake b/scripts/mbedtls/android.cmake deleted file mode 100644 index 6e46fc4..0000000 --- a/scripts/mbedtls/android.cmake +++ /dev/null @@ -1,9 +0,0 @@ -# Enable NEON for all ARM processors -set(ANDROID_ARM_NEON TRUE) - -# By including this file all necessary variables that point to compiler, linker, etc. -# will be setup. Well, almost all. -# Two variables have to be set before this line though: -# ANDROID_PLATOFORM - the API level to compile against (number) -# ANDROID_ABI - the ABI of the target platform -include("$ENV{ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake") \ No newline at end of file diff --git a/scripts/mbedtls/build.sh b/scripts/mbedtls/build.sh index a0ac614..d634ac1 100755 --- a/scripts/mbedtls/build.sh +++ b/scripts/mbedtls/build.sh @@ -11,7 +11,7 @@ cd ${CMAKE_BUILD_DIR} ${CMAKE_EXECUTABLE} .. \ -DANDROID_PLATFORM=${ANDROID_PLATFORM} \ -DANDROID_ABI=${ANDROID_ABI} \ - -DCMAKE_TOOLCHAIN_FILE=${SCRIPTS_DIR}/mbedtls/android.cmake \ + -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \ -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \ -DENABLE_TESTING=0