[Android] ARCH is defined in ANDROID_ABI

[Edward Wang]

android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Wed Jun 27 15:03:19 2012 -0400| [63a52d7ed75241afe7966823c3428c71442ae809] | committer: Edward Wang

ARCH is defined in ANDROID_ABI

> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=63a52d7ed75241afe7966823c3428c71442ae809
---

 vlc-android/jni/Android.mk     |    6 +-----
 vlc-android/jni/Application.mk |    6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/vlc-android/jni/Android.mk b/vlc-android/jni/Android.mk
index a585e87..fb72a64 100644
--- a/vlc-android/jni/Android.mk
+++ b/vlc-android/jni/Android.mk
@@ -7,11 +7,7 @@ LOCAL_SRC_FILES := libvlcjni.c aout.c thumbnailer.c pthread-condattr.c pthread-r
 
 LOCAL_C_INCLUDES := $(VLC_SRC_DIR)/include
 
-ifeq ($(NO_NEON),)
-ARCH=armeabi-v7a
-else
-ARCH=armeabi
-endif
+ARCH=$(ANDROID_ABI)
 
 CPP_STATIC=$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(ARCH)/libgnustl_static.a
 
diff --git a/vlc-android/jni/Application.mk b/vlc-android/jni/Application.mk
index 9507cee..0e97806 100644
--- a/vlc-android/jni/Application.mk
+++ b/vlc-android/jni/Application.mk
@@ -1,6 +1,2 @@
 APP_PLATFORM := android-9
-ifeq ($(NO_NEON),)
-APP_ABI := armeabi-v7a
-else
-APP_ABI := armeabi
-endif
+APP_ABI := $(ANDROID_ABI)