From deba6cbcd1d13f74fa927b415f7445cba316592d Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Mon, 3 Mar 2014 17:30:19 -0500
Subject: [PATCH] Fix automated NDK build on windows, Add x86 to touchpad

---
 shell/android/build.xml                 | 16 ---------------
 shell/android/custom_rules.xml          | 27 +++++++++++++++++++++++++
 shell/android/xperia/jni/Application.mk |  4 ++--
 3 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 shell/android/custom_rules.xml

diff --git a/shell/android/build.xml b/shell/android/build.xml
index 47dc9c9a2..a5c2daa35 100644
--- a/shell/android/build.xml
+++ b/shell/android/build.xml
@@ -70,22 +70,6 @@
             -pre-clean
     -->
     <import file="custom_rules.xml" optional="true" />
-    <property name="ndkbuildopt" value=""/>
-    <target name="-pre-build">
-        <exec executable="${ndk.dir}/ndk-build" failonerror="true">
-            <arg line="-j4 ${ndkbuildopt}"/>
-        </exec>
-        <copy todir="${jar.libs.dir}/armeabi-v7a">
-            <fileset
-			dir="xperia/libs/armeabi-v7a"
-			includes="libsexplay.so" />
-        </copy>
-    </target>
-    <target name="clean" depends="android_rules.clean">
-        <exec executable="${ndk.dir}/ndk-build" failonerror="true">
-            <arg value="clean"/>
-        </exec>
-    </target>
 
     <!-- Import the actual build file.
 
diff --git a/shell/android/custom_rules.xml b/shell/android/custom_rules.xml
new file mode 100644
index 000000000..72e6a6da8
--- /dev/null
+++ b/shell/android/custom_rules.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="reicast-touchpad" default="help">
+    <property name="ndkbuildopt" value=""/>
+    <target name="-pre-build">
+        <exec executable="${ndk.dir}/ndk-build.cmd" failonerror="true" osfamily="windows">
+            <arg line="-j8 ${ndkbuildopt}"/>
+        </exec>
+        <exec executable="${ndk.dir}/ndk-build" failonerror="true" osfamily="unix">
+            <arg line="-j8 ${ndkbuildopt}"/>
+        </exec>
+        <copy todir="${jar.libs.dir}/armeabi-v7a">
+            <fileset
+			dir="xperia/libs/armeabi-v7a"
+			includes="libsexplay.so" />
+        </copy>
+        <copy todir="${jar.libs.dir}/x86">
+            <fileset
+			dir="xperia/libs/x86"
+			includes="libsexplay.so" />
+        </copy>
+    </target>
+    <target name="clean" depends="android_rules.clean">
+        <exec executable="${ndk.dir}/ndk-build" failonerror="true">
+            <arg value="clean"/>
+        </exec>
+    </target>
+</project>
diff --git a/shell/android/xperia/jni/Application.mk b/shell/android/xperia/jni/Application.mk
index 7f414647d..9d685c750 100644
--- a/shell/android/xperia/jni/Application.mk
+++ b/shell/android/xperia/jni/Application.mk
@@ -1,4 +1,4 @@
-#APP_ABI 	:= armeabi-v7a x86
-APP_ABI		:= armeabi-v7a
+APP_ABI 	:= armeabi-v7a x86
+#APP_ABI		:= armeabi-v7a
 APP_PLATFORM	:= android-9
 NDK_TOOLCHAIN_VERSION := 4.8
\ No newline at end of file