[Android] Fix build :)
Jean-Baptiste Kempf
git at videolan.org
Thu Feb 5 17:39:14 CET 2015
vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Feb 5 17:39:08 2015 +0100| [c78c94995f21305a3efffd49f9f7a577aeca4e4e] | committer: Jean-Baptiste Kempf
Fix build :)
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=c78c94995f21305a3efffd49f9f7a577aeca4e4e
---
compile-libvlc.sh | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 07512df..0b71c7f 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -88,22 +88,6 @@ else
HAVE_ARM=1
fi
-SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH
-SRC_DIR=$PWD
-
-###############
-# DISPLAY ABI #
-###############
-
-echo "ABI: $ANDROID_ABI"
-echo "SYSROOT: $SYSROOT"
-if [ ! -z "$NO_FPU" ]; then
-echo "FPU: NO"
-fi
-if [ ! -z "$ARMV5" ]; then
-echo "ARMv5: YES"
-fi
-
# try to detect NDK version
REL=$(grep -o '^r[0-9]*.*' $ANDROID_NDK/RELEASE.TXT 2>/dev/null|cut -b2-)
case "$REL" in
@@ -122,6 +106,23 @@ case "$REL" in
;;
esac
+SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH
+SRC_DIR=$PWD
+
+###############
+# DISPLAY ABI #
+###############
+
+echo "ABI: $ANDROID_ABI"
+echo "API: $ANDROID_API"
+echo "SYSROOT: $SYSROOT"
+if [ ! -z "$NO_FPU" ]; then
+echo "FPU: NO"
+fi
+if [ ! -z "$ARMV5" ]; then
+echo "ARMv5: YES"
+fi
+
# Make in //
if [ -z "$MAKEFLAGS" ]; then
More information about the Android
mailing list