[vlc-commits] Contribs: android, simplify the code, let the users supply the flags

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jun 22 17:26:43 2012 +0200| [3e140bd05dc6e41d4cc59c7aacb90635d2c707fe] | committer: Jean-Baptiste Kempf

Contribs: android, simplify the code, let the users supply the flags

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3e140bd05dc6e41d4cc59c7aacb90635d2c707fe
---

 contrib/bootstrap    |    3 ++-
 contrib/src/main.mak |   13 -------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index f263491..35866aa 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -188,8 +188,9 @@ check_android_sdk()
 {
 	[ -z "${ANDROID_NDK}" ] && echo "You must set ANDROID_NDK environment variable" && exit 1
 	add_make "ANDROID_NDK := ${ANDROID_NDK}"
+	[ -z "${ANDROID_ABI}" ] && echo "You must set ANDROID_ABI environment variable" && exit 1
+	add_make "ANDROID_ABI := ${ANDROID_ABI}"
 	test -z "${NO_NEON}" && add_make_enabled "HAVE_NEON"
-	test -n "${TEGRA2}" && add_make_enabled "HAVE_TEGRA2"
 }
 
 test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 5250c7f..4c4d974 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -102,21 +102,8 @@ endif
 ifdef HAVE_ANDROID
 CC :=  $(HOST)-gcc --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-arm
 CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-arm
-ifdef HAVE_NEON
-    ANDROID_ABI = armeabi-v7a
-    ANDROID_CPU_FLAGS = -mfpu=neon -mcpu=cortex-a8
-else
-ifdef HAVE_TEGRA2
-    ANDROID_ABI = armeabi-v7a
-    ANDROID_CPU_FLAGS = -mfpu=vfpv3-d16 -mcpu=cortex-a9
-else
-    ANDROID_ABI = armeabi
-    ANDROID_CPU_FLAGS = -mcpu=arm1136jf-s -mfpu=vfp
-endif
-endif
 EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/include
 EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(ANDROID_ABI)/include
-EXTRA_CFLAGS += -mfloat-abi=softfp $(ANDROID_CPU_FLAGS)
 endif
 
 ifdef HAVE_MACOSX