From 4b0b3aef34be04f79805bd60ca580092d841e936 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Mon, 22 Oct 2012 17:24:34 +0300
Subject: [PATCH] [android] Added x86 support to apk

---
 android/jni/Application.mk | 2 +-
 tools/autobuild/android.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/jni/Application.mk b/android/jni/Application.mk
index 406d4030ea..bdaf09065b 100644
--- a/android/jni/Application.mk
+++ b/android/jni/Application.mk
@@ -1,5 +1,5 @@
 APP_PLATFORM := android-5
-APP_ABI := armeabi armeabi-v7a mips
+APP_ABI := armeabi armeabi-v7a mips x86
 APP_STL := gnustl_static
 LOCAL_PATH := $(call my-dir)
 APP_CFLAGS += -I$(LOCAL_PATH)/../../3party/boost
diff --git a/tools/autobuild/android.sh b/tools/autobuild/android.sh
index 5a6d614d4a..5bb8587abb 100644
--- a/tools/autobuild/android.sh
+++ b/tools/autobuild/android.sh
@@ -22,7 +22,7 @@ SHADOW_DIR_BASE="$LOCAL_DIRNAME/../../../omim-android"
 export NDK_ROOT=$(GetNdkRoot) || ( echo "Can't read NDK root path from android/local.properties"; exit 1 )
 export NDK_HOST=$(GetNdkHost) || ( echo "Can't get your OS type, please check tools/autobuild/ndk_helper.sh script"; exit 1 )
 
-NDK_ABI_TO_BUILD=(armeabi armeabi-v7a mips)
+NDK_ABI_TO_BUILD=(armeabi armeabi-v7a mips x86)
 
 for abi in "${NDK_ABI_TO_BUILD[@]}"; do
   SHADOW_DIR="${SHADOW_DIR_BASE}-${CONFIGURATION}-${abi}"