[Android] Move the NDK fixes on compile-libvlc.sh
Jean-Baptiste Kempf
git at videolan.org
Wed Feb 4 18:22:59 CET 2015
vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Feb 4 18:02:28 2015 +0100| [0239358dcc700a39971d574348bef9e36a61c2da] | committer: Jean-Baptiste Kempf
Move the NDK fixes on compile-libvlc.sh
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=0239358dcc700a39971d574348bef9e36a61c2da
---
compile-libvlc.sh | 35 +++++++++++++++++++++++++++++++++++
compile.sh | 34 ----------------------------------
2 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index c24c0ad..39b14c0 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -113,3 +113,38 @@ sh $VLC_SOURCEDIR/configure --host=$TARGET_TUPLE --build=x86_64-unknown-linux $E
--disable-x264 \
--disable-schroedinger --disable-dirac \
$*
+
+# ANDROID NDK FIXUP (BLAME GOOGLE)
+config_undef ()
+{
+ unamestr=`uname`
+ if [[ "$unamestr" == 'Darwin' ]]; then
+ previous_change=`stat -f "%Sm" -t "%y%m%d%H%M.%S" config.h`
+ sed -i '' 's,#define '$1' 1,/\* #undef '$1' \*/,' config.h
+ touch -t "$previous_change" config.h
+ else
+ previous_change=`stat -c "%y" config.h`
+ sed -i 's,#define '$1' 1,/\* #undef '$1' \*/,' config.h
+ # don't change modified date in order to don't trigger a full build
+ touch -d "$previous_change" config.h
+ fi
+}
+
+# if config dependencies change, ./config.status
+# is run and overwrite previously hacked config.h. So call make config.h here
+# and hack config.h after.
+
+make $MAKEFLAGS config.h
+
+if [ ${ANDROID_ABI} = "x86" -a ${ANDROID_API} != "android-21" ] ; then
+ # NDK x86 libm.so has nanf symbol but no nanf definition, we don't known if
+ # intel devices has nanf. Assume they don't have it.
+ config_undef HAVE_NANF
+fi
+if [ ${ANDROID_API} = "android-21" ] ; then
+ # android-21 has empty sys/shm.h headers that triggers shm detection but it
+ # doesn't have any shm functions and/or symbols. */
+ config_undef HAVE_SYS_SHM_H
+fi
+# END OF ANDROID NDK FIXUP
+
diff --git a/compile.sh b/compile.sh
index 84a7788..dfa6917 100755
--- a/compile.sh
+++ b/compile.sh
@@ -352,40 +352,6 @@ if [ ! -f config.h ]; then
${ANDROID_PATH}/compile-libvlc.sh $OPTS
fi
-# ANDROID NDK FIXUP (BLAME GOOGLE)
-config_undef ()
-{
- unamestr=`uname`
- if [[ "$unamestr" == 'Darwin' ]]; then
- previous_change=`stat -f "%Sm" -t "%y%m%d%H%M.%S" config.h`
- sed -i '' 's,#define '$1' 1,/\* #undef '$1' \*/,' config.h
- touch -t "$previous_change" config.h
- else
- previous_change=`stat -c "%y" config.h`
- sed -i 's,#define '$1' 1,/\* #undef '$1' \*/,' config.h
- # don't change modified date in order to don't trigger a full build
- touch -d "$previous_change" config.h
- fi
-}
-
-# if config dependencies change, ./config.status
-# is run and overwrite previously hacked config.h. So call make config.h here
-# and hack config.h after.
-
-make $MAKEFLAGS config.h
-
-if [ ${ANDROID_ABI} = "x86" -a ${ANDROID_API} != "android-21" ] ; then
- # NDK x86 libm.so has nanf symbol but no nanf definition, we don't known if
- # intel devices has nanf. Assume they don't have it.
- config_undef HAVE_NANF
-fi
-if [ ${ANDROID_API} = "android-21" ] ; then
- # android-21 has empty sys/shm.h headers that triggers shm detection but it
- # doesn't have any shm functions and/or symbols. */
- config_undef HAVE_SYS_SHM_H
-fi
-# END OF ANDROID NDK FIXUP
-
echo "Building"
make $MAKEFLAGS
More information about the Android
mailing list