Index: Makefile.android |
diff --git a/Makefile.android b/Makefile.android |
index 396b58d7444d974330511f1f4afe7ad30612788f..d3ed1f43f9780133e8b9cdf19e52abbe0d25d361 100644 |
--- a/Makefile.android |
+++ b/Makefile.android |
@@ -26,7 +26,7 @@ |
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
# Those definitions should be consistent with the main Makefile |
-ANDROID_ARCHES = android_ia32 android_arm android_arm64 android_mipsel |
+ANDROID_ARCHES = android_ia32 android_arm android_arm64 android_mipsel android_x87 |
MODES = release debug |
# Generates all combinations of ANDROID ARCHES and MODES, |
@@ -73,7 +73,14 @@ else |
TOOLCHAIN_PREFIX = i686-linux-android |
TOOLCHAIN_VER = 4.6 |
else |
- $(error Target architecture "${ARCH}" is not supported) |
+ ifeq ($(ARCH), android_x87) |
+ DEFINES = target_arch=x87 v8_target_arch=x87 android_target_arch=x86 android_target_platform=14 |
+ TOOLCHAIN_ARCH = x86 |
+ TOOLCHAIN_PREFIX = i686-linux-android |
+ TOOLCHAIN_VER = 4.6 |
+ else |
+ $(error Target architecture "${ARCH}" is not supported) |
+ endif |
endif |
endif |
endif |