[Android] Remove TARGET_TUPLE export

[Jean-Baptiste Kempf]

vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Feb  5 17:45:50 2015 +0100| [95fa9b1b331f6f1c620fa49be84c1dc2e35f87b7] | committer: Jean-Baptiste Kempf

Remove TARGET_TUPLE export

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

 compile-libvlc.sh |    1 +
 compile.sh        |   15 ++++-----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 1979b5c..a579012 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -497,4 +497,5 @@ $ANDROID_NDK/ndk-build -C libvlc \
     APP_PLATFORM=${ANDROID_API} \
     APP_ABI=${ANDROID_ABI} \
     SYSROOT=${SYSROOT} \
+    TARGET_TUPLE=$TARGET_TUPLE \
     NDK_PROJECT_PATH=jni V=1
diff --git a/compile.sh b/compile.sh
index ee46b5b..d6e0b3e 100755
--- a/compile.sh
+++ b/compile.sh
@@ -50,22 +50,17 @@ HAVE_64=0
 
 # Set up ABI variables
 if [ ${ANDROID_ABI} = "x86" ] ; then
-    TARGET_TUPLE="i686-linux-android"
     PATH_HOST="x86"
 elif [ ${ANDROID_ABI} = "x86_64" ] ; then
-    TARGET_TUPLE="x86_64-linux-android"
     PATH_HOST="x86_64"
     HAVE_64=1
 elif [ ${ANDROID_ABI} = "mips" ] ; then
-    TARGET_TUPLE="mipsel-linux-android"
-    PATH_HOST=$TARGET_TUPLE
+    PATH_HOST="mipsel-linux-android"
 elif [ ${ANDROID_ABI} = "arm64-v8a" ] ; then
-    TARGET_TUPLE="aarch64-linux-android"
-    PATH_HOST=$TARGET_TUPLE
+    PATH_HOST="aarch64-linux-android"
     HAVE_64=1
 else
-    TARGET_TUPLE="arm-linux-androideabi"
-    PATH_HOST=$TARGET_TUPLE
+    PATH_HOST="arm-linux-androideabi"
 fi
 
 # try to detect NDK version
@@ -84,7 +79,6 @@ case "$REL" in
     ;;
 esac
 
-export TARGET_TUPLE      # Makefile for android-libs
 export HAVE_64           # Makefile for libiomx.so.*
 
 # Add the NDK toolchain to the PATH, needed both for contribs and for building
@@ -154,7 +148,7 @@ else
     TARGET=
 fi
 
-make -j1 TARGET_TUPLE=$TARGET_TUPLE RELEASE=$RELEASE $TARGET
+make -j1 RELEASE=$RELEASE $TARGET
 
 #
 # Exporting a environment script with all the necessary variables
@@ -185,7 +179,6 @@ cat <<EssentialsA >> env.sh
 export ANDROID_SDK=$ANDROID_SDK
 export ANDROID_NDK=$ANDROID_NDK
 export ANDROID_ABI=$ANDROID_ABI
-export TARGET_TUPLE=$TARGET_TUPLE
 export RELEASE=$RELEASE
 EssentialsA