From f5762afd3a237311aa26f26a156b1b40567d6e91 Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Tue, 3 Feb 2015 14:32:12 -0800
Subject: [PATCH] Default to X86 when using the Android simulator

---
 tools/project/HXProject.hx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/project/HXProject.hx b/tools/project/HXProject.hx
index 508e3888f..e0f7b0cfb 100644
--- a/tools/project/HXProject.hx
+++ b/tools/project/HXProject.hx
@@ -148,7 +148,15 @@ class HXProject {
 					
 				} else if (target == Platform.ANDROID) {
 					
-					architectures = [ Architecture.ARMV7 ];
+					if (targetFlags.exists ("simulator") || targetFlags.exists ("emulator")) {
+						
+						architectures = [ Architecture.X86 ];
+						
+					} else {
+						
+						architectures = [ Architecture.ARMV7 ];
+						
+					}
 					
 				} else {