From cf3a31bc09f8614281470b755f3aca65daca1685 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sun, 7 Feb 2021 10:53:29 -0500
Subject: [PATCH] Update test scripts

---
 TestScripts/install-ndk.sh    | 2 ++
 TestScripts/setenv-android.sh | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/TestScripts/install-ndk.sh b/TestScripts/install-ndk.sh
index 99591794..191a6d7f 100755
--- a/TestScripts/install-ndk.sh
+++ b/TestScripts/install-ndk.sh
@@ -45,6 +45,7 @@ if [ -z "${ANDROID_NDK_ROOT}" ]; then
     exit 1
 fi
 
+if false; then
 if [[ ! -d "${ANDROID_SDK_ROOT}" ]]; then
     echo "ANDROID_SDK_ROOT does not exist. The directory will be created."
     if ! mkdir -p "${ANDROID_SDK_ROOT}"; then
@@ -60,6 +61,7 @@ if [[ ! -d "${ANDROID_NDK_ROOT}" ]]; then
         echo "Is ANDROID_NDK_ROOT writeable? Maybe you need to run this script with 'sudo -E'."
     fi
 fi
+fi # false
 
 # Temp directory
 if [[ -z "$TMPDIR" ]]; then
diff --git a/TestScripts/setenv-android.sh b/TestScripts/setenv-android.sh
index 1a1ad75e..f8428950 100755
--- a/TestScripts/setenv-android.sh
+++ b/TestScripts/setenv-android.sh
@@ -139,16 +139,14 @@ ANDROID_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${HOST_TAG}/sysroo
 # Error checking
 if [ ! -d "${ANDROID_TOOLCHAIN}" ]; then
     echo "ERROR: ANDROID_TOOLCHAIN is not a valid path. Please set it."
-    echo "Path is ${ANDROID_TOOLCHAIN}"
-    echo "ls of ANDROID_TOOLCHAIN is $(ls ${ANDROID_TOOLCHAIN})"
+    echo "ANDROID_TOOLCHAIN is '${ANDROID_TOOLCHAIN}'"
     [ "$0" = "${BASH_SOURCE[0]}" ] && exit 1 || return 1
 fi
 
 # Error checking
 if [ ! -d "${ANDROID_SYSROOT}" ]; then
     echo "ERROR: ANDROID_SYSROOT is not a valid path. Please set it."
-    echo "Path is ${ANDROID_SYSROOT}"
-    echo "ls of ANDROID_SYSROOT is $(ls ${ANDROID_SYSROOT})"
+    echo "ANDROID_SYSROOT is '${ANDROID_SYSROOT}'"
     [ "$0" = "${BASH_SOURCE[0]}" ] && exit 1 || return 1
 fi