[vlc-commits] contrib: mpg123: fix CPU detection

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Aug 24 15:48:32 2016 +0200| [b93123a0f2387a7ce5b4f3e5752761aab411e698] | committer: Thomas Guillem

contrib: mpg123: fix CPU detection

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

 contrib/src/mpg123/rules.mak | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/contrib/src/mpg123/rules.mak b/contrib/src/mpg123/rules.mak
index ea4cb8a..c933d8b 100644
--- a/contrib/src/mpg123/rules.mak
+++ b/contrib/src/mpg123/rules.mak
@@ -10,10 +10,15 @@ endif
 MPG123CONF = $(HOSTCONF)
 
 ifdef HAVE_ANDROID
-ifeq ($(ANDROID_ABI), x86)
+ifeq ($(ANDROID_ABI), armeabi-v7a)
+MPG123CONF += --with-cpu=arm_fpu
+else ifeq ($(ANDROID_ABI), arm64-v8a)
+MPG123CONF += --with-cpu=aarch64
+else
 MPG123CONF += --with-cpu=generic_fpu
 endif
 endif
+
 ifdef HAVE_VISUALSTUDIO
 ifeq ($(ARCH), x86_64)
 MPG123CONF += --with-cpu=generic_dither