From b3fe5aa3e41971dbe8d4b16a2ae33d5755851dd9 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 10 Dec 2014 15:21:49 +0100
Subject: [PATCH] (Android) Add x86 target too

---
 jni/Android.mk     | 14 ++++++++------
 jni/Application.mk |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 4755db9..b3b81aa 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -3,15 +3,18 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE    := retro
+CPU_ARCH        :=
 
 ifeq ($(TARGET_ARCH),arm)
-LOCAL_CFLAGS += -DANDROID_ARM
+LOCAL_CFLAGS += -DANDROID_ARM -DARM_ARCH
 LOCAL_ARM_MODE := arm
+CPU_ARCH := arm
 endif
 
-#ifeq ($(TARGET_ARCH),x86)
-#LOCAL_CFLAGS +=  -DANDROID_X86
-#endif
+ifeq ($(TARGET_ARCH),x86)
+LOCAL_CFLAGS +=  -DANDROID_X86
+CPU_ARCH := x86_32
+endif
 
 #ifeq ($(TARGET_ARCH),mips)
 #LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__
@@ -22,11 +25,10 @@ CORE_DIR := ..
 SOURCES_C   :=
 SOURCES_ASM :=
 
-CPU_ARCH := arm
 
 include $(CORE_DIR)/Makefile.common
 
 LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_ASM)
-LOCAL_CFLAGS += -O2 -DHAVE_MMAP -DARM_ARCH -DNDEBUG -DINLINE=inline -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 $(INCFLAGS)
+LOCAL_CFLAGS += -O2 -DHAVE_MMAP -DNDEBUG -DPC_BUILD -DINLINE=inline -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 $(INCFLAGS)
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/Application.mk b/jni/Application.mk
index f05229c..7866257 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1 +1 @@
-APP_ABI := armeabi armeabi-v7a
+APP_ABI := armeabi armeabi-v7a x86