[Android] [PATCH 2/7] Makefile: don't hardcode the ARM architecture

[Rafaël Carré]

Le 2012-07-23 05:56, Edward Wang a écrit :
> ---
>  Makefile |    6 +-----
>  1 files changed, 1 insertions(+), 5 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index ca687a8..6022f8e 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1,10 +1,6 @@
>  # Sources and objects
>  
> -ifeq ($(NO_NEON),)
> -ARCH = armeabi-v7a
> -else
> -ARCH = armeabi
> -endif
> +ARCH = $(ANDROID_ABI)
>  
>  SRC=vlc-android
>  JAVA_SOURCES=$(SRC)/src/org/videolan/vlc/*.java

Merged, thanks.