[Android] Remove Application.mk

[Jean-Baptiste Kempf]

vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Feb  5 12:07:27 2015 +0100| [836c1fe63b8edc11b66b083eb341f457556cb8b6] | committer: Jean-Baptiste Kempf

Remove Application.mk

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

 compile-libvlc.sh         |   21 +++++++++++++--------
 libvlc/jni/Application.mk |    3 ---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 03c0816..45e1182 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -445,18 +445,23 @@ BUILTINS="$BUILTINS NULL\n};\n"; \
 printf "/* Autogenerated from the list of modules */\n $DEFINITION\n $BUILTINS\n" > libvlc/jni/libvlcjni.h
 
 
-echo "Generating static modules object files"
-
 echo $VLC_BUILD_DIR
 LIBVLC_LIBS="libvlcjni"
 VLC_MODULES=`echo $VLC_MODULES|sed "s|vlc/$VLC_BUILD_DIR|../vlc/$VLC_BUILD_DIR|g"`
 VLC_SRC_DIR="../vlc"
 VLC_CONTRIB="$VLC_SRC_DIR/contrib/$TARGET_TUPLE"
+
+echo "Building NDK"
+
 $ANDROID_NDK/ndk-build -C libvlc \
-	VLC_SRC_DIR="$VLC_SRC_DIR" \
-	VLC_BUILD_DIR="$VLC_SRC_DIR/$VLC_BUILD_DIR" \
-	VLC_CONTRIB="$VLC_CONTRIB" \
-	VLC_MODULES="$VLC_MODULES" \
-	TARGET_CFLAGS="$VLC_EXTRA_CFLAGS" \
-	LIBVLC_LIBS="$LIBVLC_LIBS" V=1
+    VLC_SRC_DIR="$VLC_SRC_DIR" \
+    VLC_BUILD_DIR="$VLC_SRC_DIR/$VLC_BUILD_DIR" \
+    VLC_CONTRIB="$VLC_CONTRIB" \
+    VLC_MODULES="$VLC_MODULES" \
+    TARGET_CFLAGS="$VLC_EXTRA_CFLAGS" \
+    LIBVLC_LIBS="$LIBVLC_LIBS" \
+    APP_BUILD_SCRIPT=jni/Android.mk \
+    APP_PLATFORM=${ANDROID_API} \
+    APP_ABI=${ANDROID_ABI} \
+    NDK_PROJECT_PATH=jni
 
diff --git a/libvlc/jni/Application.mk b/libvlc/jni/Application.mk
deleted file mode 100644
index 9e30f15..0000000
--- a/libvlc/jni/Application.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-APP_PLATFORM := $(ANDROID_API)
-APP_ABI := $(ANDROID_ABI)
-NDK_TOOLCHAIN_VERSION=$(GCCVER)