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

diff --git a/contrib/bootstrap b/contrib/bootstrap
index f2634914b93a70ccb323d78830769aafba3d5de7..35866aa7aa91ab2c8ddfde14223579b4b85a7987 100755 (executable)
--- 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 5250c7f14c325e05d63dc290adc483e9785c5567..4c4d9747d400450c4cd84e91f74300a3afe39bb4 100644 (file)
--- 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