contrib: Allow live555 build on Android x86

[vlc] / contrib / bootstrap

diff --git a/contrib/bootstrap b/contrib/bootstrap
index f2634914b93a70ccb323d78830769aafba3d5de7..4eb558fc475c2addb877087a0bd28e0a763c558c 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -188,8 +188,9 @@ check_android_sdk()
 {
        [ -z "${ANDROID_NDK}" ] && echo "You must set ANDROID_NDK environment variable" && exit 1
        add_make "ANDROID_NDK := ${ANDROID_NDK}"
+       [ -z "${ANDROID_ABI}" ] && echo "You must set ANDROID_ABI environment variable" && exit 1
+       add_make "ANDROID_ABI := ${ANDROID_ABI}"
        test -z "${NO_NEON}" && add_make_enabled "HAVE_NEON"
-       test -n "${TEGRA2}" && add_make_enabled "HAVE_TEGRA2"
 }
 
 test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
@@ -215,10 +216,23 @@ case "${OS}" in
        *bsd*)
                add_make_enabled "HAVE_BSD"
                ;;
-       linux-androideabi)
+       *android*)
                check_android_sdk
                add_make_enabled "HAVE_LINUX" "HAVE_ANDROID"
-               add_make "PATH = ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
+               case "${HOST}" in
+                       *arm*)
+                       add_make "PATH = ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
+                       add_make "PLATFORM_SHORT_ARCH := arm"
+                       ;;
+                       *i686*)
+                       add_make "PATH = ${ANDROID_NDK}/toolchains/x86-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
+                       add_make "PLATFORM_SHORT_ARCH := x86"
+                       ;;
+                       *mipsel*)
+                       add_make "PATH = ${ANDROID_NDK}/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
+                       add_make "PLATFORM_SHORT_ARCH := mips"
+                       ;;
+               esac
                ;;
        *linux*)
                add_make_enabled "HAVE_LINUX"