ARCH is defined in ANDROID_ABI

63a52d7e · Edward Wang · 6150372b · 63a52d7e · 63a52d7e
Commit 63a52d7e authored Jun 27, 2012 by Edward Wang
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 10 deletions

vlc-android/jni/Android.mk vlc-android/jni/Android.mk +1 -5

vlc-android/jni/Application.mk vlc-android/jni/Application.mk +1 -5

No files found.
--- 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


--- a/vlc-android/jni/Application.mk
+++ b/vlc-android/jni/Application.mk
 APP_PLATFORM := android-9
-ifeq ($(NO_NEON),)
-APP_ABI := armeabi-v7a
-else
-APP_ABI := armeabi
-endif
+APP_ABI := $(ANDROID_ABI)