[Android] fix build with ndk-macosx

[Rui Zhang]

android | branch: master | Rui Zhang <bbcallen at gmail.com> | Sun Jul 29 11:14:41 2012 +0800| [2330c338c381d1b21e6990dc60c9f138141cdd96] | committer: Jean-Baptiste Kempf

fix build with ndk-macosx

Close #7244

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=2330c338c381d1b21e6990dc60c9f138141cdd96
---

 compile.sh   |    1 +
 configure.sh |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/compile.sh b/compile.sh
index 4def041..4add5ae 100755
--- a/compile.sh
+++ b/compile.sh
@@ -57,6 +57,7 @@ export PLATFORM_SHORT_ARCH
 
 # Add the NDK toolchain to the PATH, needed both for contribs and for building
 # stub libraries
+export PATH=${ANDROID_NDK}/toolchains/${PATH_HOST}-4.4.3/prebuilt/darwin-x86/bin:${PATH}
 export PATH=${ANDROID_NDK}/toolchains/${PATH_HOST}-4.4.3/prebuilt/linux-x86/bin:${PATH}
 
 # 1/ libvlc, libvlccore and its plugins
diff --git a/configure.sh b/configure.sh
index 2c5cdae..71e39b4 100755
--- a/configure.sh
+++ b/configure.sh
@@ -36,7 +36,7 @@ CPPFLAGS="-I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/include -I${ANDROID_NDK
 LDFLAGS="$LDFLAGS -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_ABI}"
 
 SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH
-ANDROID_BIN=$ANDROID_NDK/toolchains/${PATH_HOST}-4.4.3/prebuilt/linux-x86/bin/
+ANDROID_BIN=$ANDROID_NDK/toolchains/${PATH_HOST}-4.4.3/prebuilt/*-x86/bin/
 CROSS_COMPILE=${ANDROID_BIN}/${TARGET_TUPLE}-
 
 CPPFLAGS="$CPPFLAGS" \