From 354e7ca7c97ef2df9f4e4aac34ac84cf1940de6b Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 9 Dec 2018 08:11:04 -0500 Subject: [PATCH] Update Travis Android SDK and NDK gear --- TestScripts/install-android.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/TestScripts/install-android.sh b/TestScripts/install-android.sh index 49ca3300..da71ff1e 100755 --- a/TestScripts/install-android.sh +++ b/TestScripts/install-android.sh @@ -2,8 +2,16 @@ set -e # for local debugging -if [[ -f setenv-travis.sh ]]; then - source setenv-travis.sh +if [[ -f ./setenv-travis.sh ]]; then + echo "Setting variables in setenv-travis.sh" + source ./setenv-travis.sh +elif [[ -f ./TestScripts/setenv-travis.sh ]]; then + echo "Setting variables in TestScripts/setenv-travis.sh" + source ./TestScripts/setenv-travis.sh +fi + +if [[ -z "$ANDROID_SDK_ROOT" ]] || [[ -z "$ANDROID_NDK_ROOT" ]]; then + echo "ANDROID_SDK_ROOT or ANDROID_NDK_ROOT is not set" fi # install android deps