QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-25 08:37:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

android-aar: check more accurately that ANDROID_SDK is properly set

Browse Source
This commit is contained in:
Frank Denis
2025-02-20 15:25:13 +01:00
parent 7f2d076a8e
commit 4d9b52d234
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist-build/android-aar.sh
+14 -7
View File
@@ -12,14 +12,19 @@ if [ -z "$ANDROID_NDK_HOME" ]; then
exit 1
fi
if [ ! -f "${ANDROID_NDK_HOME}/ndk-build" ]; then
echo "The ANDROID_NDK_HOME directory does not contain an 'ndk-build' file."
exit 1
fi
if [ ! -d "${ANDROID_NDK_HOME}/toolchains" ]; then
echo "The ANDROID_NDK_HOME directory does not contain a 'toolchains' directory."
exit 1
fi
if [ ! -f "${ANDROID_NDK_HOME}/source.properties" ]; then
sp=$(find "${ANDROID_NDK_HOME}" -depth 2 -type f -name source.properties | head -n1)
if [ -n "$sp" ]; then
export ANDROID_NDK_HOME=$(dirname "$sp")
else
echo "The ANDROID_NDK_HOME directory does not contain a 'source.properties' file."
exit 1
fi
echo "The ANDROID_NDK_HOME directory does not contain a 'source.properties' file."
exit 1
fi
NDK_VERSION=$(grep "Pkg.Revision = " <"${ANDROID_NDK_HOME}/source.properties" | cut -f 2 -d '=' | cut -f 2 -d' ' | cut -f 1 -d'.')
@@ -41,6 +46,8 @@ fi
cd "$(dirname "$0")/../" || exit
trap 'kill -TERM -$$' INT
make_abi_json() {
echo "{\"abi\":\"${NDK_ARCH}\",\"api\":${SDK_VERSION},\"ndk\":${NDK_VERSION},\"stl\":\"none\"}" >"$1/abi.json"
}