Merge "Fail early when android target does not include --sdk-path"

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 29aa3cc1958f53904ccb51b35deb6d8d39211ec5..f8383da270e7066c18d3e37eee2c50c089a8da0d 100644 (file)
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1015,6 +1015,10 @@ EOF
           ;;
 
         android*)
+          if [ -z "${sdk_path}" ]; then
+            die "Must specify --sdk-path for Android builds."
+          fi
+
           SDK_PATH=${sdk_path}
           COMPILER_LOCATION=`find "${SDK_PATH}" \
                              -name "arm-linux-androideabi-gcc*" -print -quit`