From 40f16ab2f9ca99ea247b4a0f4d35b2204e803eeb Mon Sep 17 00:00:00 2001
From: Caio <caio.honma@pearson.com>
Date: Thu, 3 Oct 2019 10:26:30 -0300
Subject: [PATCH] Added correct platform for android x86_64 builds

---
 project/Build.xml                  | 3 ++-
 tools/platforms/AndroidPlatform.hx | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/project/Build.xml b/project/Build.xml
index aad527a48..fd2227ff7 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -1,7 +1,8 @@
 <xml>
 
-	<set name="PLATFORM" value="android-16" if="android" unless="HXCPP_ARM64" />
+	<set name="PLATFORM" value="android-16" if="android" unless="HXCPP_ARM64 || HXCPP_X86_64" />
 	<set name="PLATFORM" value="android-21" if="android HXCPP_ARM64" />
+	<set name="PLATFORM" value="android-21" if="android HXCPP_X86_64" />
 	<set name="HXCPP_CPP11" value="1" />
 
 	<include name="${HXCPP}/build-tool/BuildCommon.xml" />
diff --git a/tools/platforms/AndroidPlatform.hx b/tools/platforms/AndroidPlatform.hx
index ca3b76464..3dbe82165 100644
--- a/tools/platforms/AndroidPlatform.hx
+++ b/tools/platforms/AndroidPlatform.hx
@@ -105,6 +105,9 @@ class AndroidPlatform extends PlatformTarget
 			}
 			else if (architecture == Architecture.X64)
 			{
+				haxeParams = [hxml, "-D", "android", "-D", "PLATFORM=android-21"];
+				cppParams = ["-Dandroid", "-DPLATFORM=android-21"];
+
 				haxeParams.push("-D");
 				haxeParams.push("HXCPP_X86_64");
 				cppParams.push("-DHXCPP_X86_64");