[Android] build: move ndk fixup into configure.sh

[Thomas Guillem]

vlc-ports/android | branch: master | Thomas Guillem <tom at gllm.fr> | Mon Oct 20 14:23:17 2014 +0200| [0a79ed074b323e5184ac42108c6be2a3af2e1df0] | committer: Thomas Guillem

build: move ndk fixup into configure.sh

and fix full rebuild of VLC because config.h was always touched.

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

 compile.sh   |   17 -----------------
 configure.sh |   17 +++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/compile.sh b/compile.sh
index 1dc8604..0655a35 100755
--- a/compile.sh
+++ b/compile.sh
@@ -314,23 +314,6 @@ else
     TARGET=
 fi
 
-# ANDROID NDK FIXUP (BLAME GOOGLE)
-config_undef ()
-{
-    sed -i 's,#define '$1' 1,/\* #undef '$1' \*/,' 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
-
 echo "Building"
 make $MAKEFLAGS
 
diff --git a/configure.sh b/configure.sh
index bec7966..d20c27c 100755
--- a/configure.sh
+++ b/configure.sh
@@ -113,3 +113,20 @@ 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 ()
+{
+    sed -i 's,#define '$1' 1,/\* #undef '$1' \*/,' 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