X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=contrib%2Fbootstrap;h=170b8f128988dcc958bddd1ad43532206360be67;hb=a8fe060f3f5e17af2aa7b7bafb599b80e4a3181f;hp=647a6002ecb3fcb59b6413f04ace6fb70e1d982e;hpb=259b9e4bcb0dee4f27c1c005f8c6ec0705558585;p=vlc

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 647a6002ec..170b8f1289 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -151,6 +151,13 @@ check_macosx_sdk()
    add_make "OSX_VERSION ?= ${OSX_VERSION}"
 }
 
+check_android_sdk()
+{
+	[ -z "${ANDROID_NDK}" ] && echo "You must set ANDROID_NDK environment variable" && exit 1
+	add_make "ANDROID_NDK := ${ANDROID_NDK}"
+	test -z "${NO_NEON}" && add_make_enabled "HAVE_NEON"
+}
+
 test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
 test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
 test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
@@ -170,6 +177,10 @@ case "${OS}" in
 	*bsd*)
 		add_make_enabled "HAVE_BSD"
 		;;
+	linux-androideabi)
+		check_android_sdk
+		add_make_enabled "HAVE_LINUX" "HAVE_ANDROID"
+		;;
 	*linux*)
 		add_make_enabled "HAVE_LINUX"
 		;;