Skip to content

Commit 9a8ed6d

Browse files
Beatriz Rizentalmhammond
authored andcommitted
Do not overwrite NDK related variables
1 parent cd9b7fe commit 9a8ed6d

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

libs/android_defaults.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
#!/usr/bin/env bash
22

33
# Find the NDK.
4-
pushd ..
5-
NDK_VERSION=$(./gradlew -q printNdkVersion | tail -1)
6-
export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/$NDK_VERSION"
7-
export ANDROID_NDK_ROOT="$ANDROID_NDK_HOME"
8-
popd || exit
4+
5+
if [[ -z "${ANDROID_NDK_HOME:-}" || -z "${ANDROID_NDK_ROOT:-}" ]]; then
6+
pushd ..
7+
NDK_VERSION=$(./gradlew -q printNdkVersion | tail -1)
8+
export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/$NDK_VERSION"
9+
export ANDROID_NDK_ROOT="$ANDROID_NDK_HOME"
10+
popd || exit
11+
else
12+
echo "Using ANDROID_NDK_HOME=${ANDROID_NDK_HOME} and ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT}"
13+
fi
914

1015
if [[ -z "${ANDROID_NDK_API_VERSION:-}" ]]; then
1116
export ANDROID_NDK_API_VERSION=21

0 commit comments

Comments
 (0)