add more sanity check about android sdk / ndk. dont do anything if sdk/ndk path are wrong, or if we dont found arm gcc compiler cause of missing sdk android platform tools

tito · tito · commit 7834473a88d0 · 2012-01-10T01:54:27.000+01:00
diff --git a/distribute.sh b/distribute.sh
@@ -104,6 +104,18 @@ function push_arm() {
 	fi
 
 	export PATH="$ANDROIDNDK/toolchains/$TOOLCHAIN_PREFIX-$TOOLCHAIN_VERSION/prebuilt/linux-x86/bin/:$ANDROIDNDK:$ANDROIDSDK/tools:$PATH"
+
+	# search compiler in the path, to fail now instead of later.
+	CC=$(which $TOOLCHAIN_PREFIX-gcc)
+	if [ "X$CC" == "X" ]; then
+		error "Unable to found compiler ($TOOLCHAIN_PREFIX-gcc) !!"
+		error "1. Ensure that SDK/NDK paths are correct"
+		error "2. Ensure that you've the Android API $ANDROIDAPI SDK Platform (via android tool)"
+		exit 1
+	else
+		debug "Compiler found at $CC"
+	fi
+
 	export CC="$TOOLCHAIN_PREFIX-gcc $CFLAGS"
 	export CXX="$TOOLCHAIN_PREFIX-g++ $CXXFLAGS"
 	export AR="$TOOLCHAIN_PREFIX-ar" 
@@ -156,11 +168,21 @@ function run_prepare() {
 		error "No ANDROIDSDK environment set, abort"
 		exit -1
 	fi
+	if [ ! -d "$ANDROIDSDK" ]; then
+		echo "ANDROIDSDK=$ANDROIDSDK"
+		error "ANDROIDSDK path is invalid, it must be a directory. abort."
+		exit 1
+	fi
 
 	if [ "X$ANDROIDNDK" == "X" ]; then
 		error "No ANDROIDNDK environment set, abort"
 		exit -1
 	fi
+	if [ ! -d "$ANDROIDNDK" ]; then
+		echo "ANDROIDNDK=$ANDROIDSDK"
+		error "ANDROIDNDK path is invalid, it must be a directory. abort."
+		exit 1
+	fi
 
 	if [ "X$ANDROIDAPI" == "X" ]; then
 		export ANDROIDAPI=14
@@ -220,6 +242,11 @@ function run_prepare() {
 	# create initial files
 	echo "target=android-$ANDROIDAPI" > $SRC_PATH/default.properties
 	echo "sdk.dir=$ANDROIDSDK" > $SRC_PATH/local.properties
+
+	# check arm env
+	push_arm
+	debug "PATH is $PATH"
+	pop_arm
 }
 
 function in_array() {
@@ -490,11 +517,6 @@ function run() {
 	run_prepare
 	run_source_modules
 	run_get_packages
-
-	push_arm
-	debug "PATH is $PATH"
-	pop_arm
-
 	run_prebuild
 	run_build
 	run_postbuild
