From 332cd71515afb2e820560c29417b08c536e15fa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claus=20R=C3=B8rbech?= <claus.rorbech@mongodb.com>
Date: Wed, 19 Aug 2020 09:38:34 +0200
Subject: [PATCH] Make ndk_stack resolution more robust

---
 tools/unroll_stacktrace.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/unroll_stacktrace.sh b/tools/unroll_stacktrace.sh
index 6c2d993fa5..49eb990ea7 100644
--- a/tools/unroll_stacktrace.sh
+++ b/tools/unroll_stacktrace.sh
@@ -48,7 +48,8 @@ find_ndkstack() {
     	echo "$PROPS_FILE not found! NDK location cannot be determined"
     	exit 1
 	fi
-	NDK_STACK=$(grep "ndk.dir" "$PROPS_FILE" | cut -d = -f2)/ndk-stack
+	NDK_STACK=$(grep "^ndk.dir" "$PROPS_FILE" | cut -d = -f2)/ndk-stack
+	which $NDK_STACK || { echo "Could not find 'ndk_stack' at $NDK_STACK"; exit ;}
 }
 
 download_and_unzip_stripped_libs() {