[vlc-commits] contrib: x264: disable asm on Android x86*

[Thomas Guillem]

vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Dec 22 15:38:42 2017 +0100| [52be7faf233639ca2423ef6eac50284eaed48c92] | committer: Jean-Baptiste Kempf

contrib: x264: disable asm on Android x86*

Because of TEXTREL...

(cherry picked from commit 250e44ff9d0f90eb4f7b975818c07cdea19b8ce8)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/x264/rules.mak | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index 26788b5417..d4d711f83e 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -38,6 +38,15 @@ X264CONF += --enable-win32thread
 endif
 ifdef HAVE_CROSS_COMPILE
 X264CONF += --cross-prefix="$(HOST)-"
+ifdef HAVE_ANDROID
+# broken text relocations
+ifeq ($(ANDROID_ABI), x86)
+FFMPEGCONF +=  --disable-asm
+endif
+ifeq ($(ANDROID_ABI), x86_64)
+FFMPEGCONF +=  --disable-asm
+endif
+endif
 endif
 
 $(TARBALLS)/x262-git.tar.xz: