[Android] Continue the same and simplify

[Jean-Baptiste Kempf]

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

Continue the same and simplify

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

 compile-libvlc.sh |    4 ++--
 compile.sh        |   23 ++++++-----------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index db83199..27e65f0 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -266,8 +266,8 @@ cd contrib/contrib-android-${TARGET_TUPLE}
 
 echo "EXTRA_CFLAGS= -g ${EXTRA_CFLAGS}" >> config.mak
 echo "EXTRA_LDFLAGS= ${EXTRA_LDFLAGS}" >> config.mak
-export VLC_EXTRA_CFLAGS="${EXTRA_CFLAGS}"
-export VLC_EXTRA_LDFLAGS="${EXTRA_LDFLAGS}"
+export VLC_EXTRA_CFLAGS="${EXTRA_CFLAGS}"                   # Makefile
+export VLC_EXTRA_LDFLAGS="${EXTRA_LDFLAGS}"                 # Makefile
 
 make fetch
 # We already have zlib available
diff --git a/compile.sh b/compile.sh
index 8b107fd..6d1271b 100755
--- a/compile.sh
+++ b/compile.sh
@@ -148,17 +148,6 @@ then
     exit 0
 fi
 
-# Make in //
-if [ -z "$MAKEFLAGS" ]; then
-    UNAMES=$(uname -s)
-    MAKEFLAGS=
-    if which nproc >/dev/null; then
-        MAKEFLAGS=-j`nproc`
-    elif [ "$UNAMES" == "Darwin" ] && which sysctl >/dev/null; then
-        MAKEFLAGS=-j`sysctl -n machdep.cpu.thread_count`
-    fi
-fi
-
 ############
 # Make VLC #
 ############
@@ -179,10 +168,9 @@ else
     TARGET=
 fi
 
-export ANDROID_SYS_HEADERS=${PWD}/android-headers
-
-export ANDROID_LIBS=${PWD}/android-libs
-export VLC_BUILD_DIR=vlc/build-android-${TARGET_TUPLE}
+export ANDROID_SYS_HEADERS=${PWD}/android-headers           # Android.mk
+export ANDROID_LIBS=${PWD}/android-libs                     # Android.mk
+export VLC_BUILD_DIR=vlc/build-android-${TARGET_TUPLE}      # Android.mk
 
 make $CLEAN
 make -j1 TARGET_TUPLE=$TARGET_TUPLE SYSROOT=$SYSROOT GCCVER=$GCCVER RELEASE=$RELEASE $TARGET
@@ -213,11 +201,12 @@ echo "# Re-run 'sh compile.sh' to update this file." >> env.sh
 
 # The essentials
 cat <<EssentialsA >> env.sh
-export ANDROID_API=$ANDROID_API
-export ANDROID_ABI=$ANDROID_ABI
 export ANDROID_SDK=$ANDROID_SDK
 export ANDROID_NDK=$ANDROID_NDK
+export ANDROID_ABI=$ANDROID_ABI
+export ANDROID_API=$ANDROID_API
 export GCCVER=$GCCVER
+export SYSROOT=$SYSROOT
 export ANDROID_SYS_HEADERS=$ANDROID_SYS_HEADERS
 export ANDROID_LIBS=$ANDROID_LIBS
 export VLC_BUILD_DIR=$VLC_BUILD_DIR