[Android] Allow compile-libvlc.sh to run standalone

Jean-Baptiste Kempf git at videolan.org
Wed Feb 4 20:44:42 CET 2015


vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Feb  4 20:44:31 2015 +0100| [cb5dc127bf86ea8f5e64d0ae01e9f3aaebf3775d] | committer: Jean-Baptiste Kempf

Allow compile-libvlc.sh to run standalone

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=cb5dc127bf86ea8f5e64d0ae01e9f3aaebf3775d
---

 compile-libvlc.sh |    5 +++++
 compile.sh        |    3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 57a3c21..dc46057 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -87,6 +87,7 @@ fi
 ###############
 
 echo "ABI:        $ANDROID_ABI"
+echo "SYSROOT:    $SYSROOT"
 if [ ! -z "$NO_FPU" ]; then
 echo "FPU:        NO"
 fi
@@ -192,6 +193,10 @@ fi
 echo "CFLAGS:            ${CFLAGS}"
 echo "EXTRA_CFLAGS:      ${EXTRA_CFLAGS}"
 
+####################################################################################################
+
+cd vlc
+
 ###########################
 # Build buildsystem tools #
 ###########################
diff --git a/compile.sh b/compile.sh
index 6d1271b..da854df 100755
--- a/compile.sh
+++ b/compile.sh
@@ -137,9 +137,8 @@ git checkout -B android ${TESTED_HASH}
 EOF
             exit 1
         fi
+        cd ..
     fi
-else
-    cd vlc
 fi
 
 if [ "$BUILD" = 0 ]



More information about the Android mailing list