[Android] Only accept NDKr9 or later

Jean-Baptiste Kempf git at videolan.org
Mon Jul 7 21:12:40 CEST 2014


vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jul  7 20:49:35 2014 +0200| [e932009be37ffb37246faac7cfbe6763e0f26cf6] | committer: Jean-Baptiste Kempf

Only accept NDKr9 or later

There are no reasons to use older NDK now...

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

 compile.sh |   15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/compile.sh b/compile.sh
index d67bf4a..8c5b39f 100755
--- a/compile.sh
+++ b/compile.sh
@@ -41,21 +41,8 @@ case "$REL" in
         GCCVER=4.8
         CXXSTL="/"${GCCVER}
     ;;
-    8?*)
-        # we don't use 4.4.3 because it doesn't handle threads correctly.
-        # TODO : clang?
-        if test -d ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.7
-        # if gcc 4.7 is present, it's there for all the archs (x86, mips, arm)
-        then
-            # since r8d
-            GCCVER=4.7
-        else
-            GCCVER=4.6
-        fi
-        CXXSTL="/"${GCCVER}
-    ;;
     7|8|*)
-        echo "You need the NDKv8b or later"
+        echo "You need the NDKv9 or later"
         exit 1
     ;;
 esac



More information about the Android mailing list