From 652589d56c60b7db1e4d0af28d585372335ea81e Mon Sep 17 00:00:00 2001
From: Andoni Morales Alastruey <ylatuya@gmail.com>
Date: Mon, 14 Jan 2013 12:25:52 +0100
Subject: [PATCH] configure: add support for android x86

Change-Id: Iadbfce5ecddd53a5238c2036e2c07f05d5853a5a
---
 build/make/configure.sh | 2 +-
 configure               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/make/configure.sh b/build/make/configure.sh
index c32fb91bc9..ed07797e65 100755
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1089,7 +1089,7 @@ EOF
                 add_asflags -f x64
                 enabled debug && add_asflags -g cv8
             ;;
-            linux*|solaris*)
+            linux*|solaris*|android*)
                 add_asflags -f elf${bits}
                 enabled debug && [ "${AS}" = yasm ] && add_asflags -g dwarf2
                 enabled debug && [ "${AS}" = nasm ] && add_asflags -g
diff --git a/configure b/configure
index 8bbd7ba5ee..4999283e36 100755
--- a/configure
+++ b/configure
@@ -106,6 +106,7 @@ all_platforms="${all_platforms} ppc64-darwin8-gcc"
 all_platforms="${all_platforms} ppc64-darwin9-gcc"
 all_platforms="${all_platforms} ppc64-linux-gcc"
 all_platforms="${all_platforms} sparc-solaris-gcc"
+all_platforms="${all_platforms} x86-android-gcc"
 all_platforms="${all_platforms} x86-darwin8-gcc"
 all_platforms="${all_platforms} x86-darwin8-icc"
 all_platforms="${all_platforms} x86-darwin9-gcc"
-- 
GitLab