[[ Prebuilts ]] Ensure CROSS_SYSROOT is set when building for Android

livecodeian · livecodeian · commit 153096e48283 · 2017-07-11T16:46:28.000+01:00
diff --git a/prebuilt/scripts/android.inc b/prebuilt/scripts/android.inc
@@ -12,9 +12,13 @@ else
 	# Attempt to set up the toolchain automatically
 	if [ -z "${ANDROID_TOOLCHAIN}" ] ; then
 		ANDROID_TOOLCHAIN="${HOME}/android/toolchain/standalone/bin/arm-linux-androideabi-"
-
-        # OpenSSL requires this to be set when cross-compiling for Android
-        export CROSS_SYSROOT="${HOME}/android/toolchain/standalone/sysroot"
+		# OpenSSL requires this to be set when cross-compiling for Android
+		export CROSS_SYSROOT="${HOME}/android/toolchain/standalone/sysroot"
+	else
+		# if not defined, derive CROSS_ROOT from ANDROID_TOOLCHAIN
+		if [ -z "${CROSS_SYSROOT}" ] ; then
+			export CROSS_ROOT="${ANDROID_TOOLCHAIN%/*/*}/sysroot"
+		fi
 	fi
 
 	ANDROID_CC_NAME=${ANDROID_CC_NAME:-gcc}
