Skip to content
Snippets Groups Projects
Verified Commit 429a8390 authored by Hans-Christoph Steiner's avatar Hans-Christoph Steiner
Browse files

tor-droid-make.sh: use standard paths for NDK

"NDK Side-by-side" packages are installed into $ANDROID_SDK_ROOT/ndk/
without the trailing "s":

Android's sdkmanager was warning:

Warning: Observed package id 'ndk;21.3.6528147' in inconsistent location
'/opt/android-sdk/ndks/21.3.6528147' (Expected
'/opt/android-sdk/ndk/21.3.6528147')

closes #55
parent d3bfbc90
No related branches found
No related tags found
1 merge request!2update upstream
......@@ -32,11 +32,11 @@ check_android_dependencies()
# openssl wants a var called ANDROID_NDK_HOME
if [ ! -e "$ANDROID_NDK_HOME" ]; then
ndkVersion=$(sed -En 's,NDK_REQUIRED_REVISION *:?= *([0-9.]+).*,\1,p' external/Makefile)
echo $ANDROID_HOME/ndks/$ndkVersion/source.properties
echo $ANDROID_HOME/ndk/$ndkVersion/source.properties
if [ -n "$ANDROID_NDK_ROOT" ]; then
export ANDROID_NDK_HOME="$ANDROID_NDK_ROOT"
elif [ -e "$ANDROID_HOME/ndks/$ndkVersion/source.properties" ]; then
export ANDROID_NDK_HOME="$ANDROID_HOME/ndks/$ndkVersion"
elif [ -e "$ANDROID_HOME/ndk/$ndkVersion/source.properties" ]; then
export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/$ndkVersion"
elif [ -e "$ANDROID_HOME/ndk-bundle/source.properties" ]; then
export ANDROID_NDK_HOME="$ANDROID_HOME/ndk-bundle"
else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment