[build,android] only use CMake from SDK

* only use CMake from android SDK
* abort if CMake or ndk-build are not detected

scripts/android-build-common.sh

@@ -217,11 +217,19 @@ function common_check_requirements {
 	else
 		echo "ndk-build not found in NDK directory $ANDROID_NDK"
 		echo "assuming ndk-build is in path..."
-		NDK_BUILD=ndk-build
+		NDK_BUILD=$(which ndk-build)
+		if [ -z $NDK_BUILD ]; then
+			echo "ndk-build not found in $ANDROID_NDK and not in PATH"
+			exit 1
+		fi
 	fi
 
 	if [ -z $CMAKE_PROGRAM ]; then
 		CMAKE_PROGRAM=$(find $ANDROID_SDK/cmake -name cmake $FIND_ARGS)
+		if [ -z $CMAKE_PROGRAM ]; then
+			echo "CMake not found in $ANDROID_SDK, install CMake from the android SDK!"
+			exit 1
+		fi
 	fi
 
 	for CMD in make git $CMAKE_PROGRAM $NDK_BUILD

scripts/android-build-freerdp.sh

@@ -183,7 +183,7 @@ do
 			-DCMAKE_INSTALL_LIBDIR=. \
 			$SRC_DIR
 		echo $(pwd)
-	common_run cmake --build . --target install
+		common_run $CMAKE_PROGRAM --build . --target install
 	fi
 done