From dd664572b28c09cd4bf0920251c841788491b13b Mon Sep 17 00:00:00 2001
From: thomas-t1 <thomas.t1.hansen@hotmail.com>
Date: Wed, 3 Jun 2015 15:03:56 +0200
Subject: [PATCH] NEW: gcc 4.9 aarch64/arm64v8-a support

---
 ...pp.Android.aarch64-linux-android-4.9.props | 38 +++++++++++++++++++
 ....Android.aarch64-linux-android-4.9.targets |  9 +++++
 MSBuild/Android/Props/android_general.xml     |  2 +
 MSBuild/Android/vs-android.ToolPaths.props    |  1 +
 4 files changed, 50 insertions(+)
 create mode 100644 MSBuild/Android/PlatformToolsets/aarch64-linux-android-4.9/Microsoft.Cpp.Android.aarch64-linux-android-4.9.props
 create mode 100644 MSBuild/Android/PlatformToolsets/aarch64-linux-android-4.9/Microsoft.Cpp.Android.aarch64-linux-android-4.9.targets

diff --git a/MSBuild/Android/PlatformToolsets/aarch64-linux-android-4.9/Microsoft.Cpp.Android.aarch64-linux-android-4.9.props b/MSBuild/Android/PlatformToolsets/aarch64-linux-android-4.9/Microsoft.Cpp.Android.aarch64-linux-android-4.9.props
new file mode 100644
index 0000000..71b1b75
--- /dev/null
+++ b/MSBuild/Android/PlatformToolsets/aarch64-linux-android-4.9/Microsoft.Cpp.Android.aarch64-linux-android-4.9.props
@@ -0,0 +1,38 @@
+<!--
+***********************************************************************************************
+(c) 2014 Gavin Pugh http://www.gavpugh.com/ - Released under the open-source zlib license
+***********************************************************************************************
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+
+    <PlatformToolsetVersion>aarch64-linux-android-4.9</PlatformToolsetVersion>
+
+    <PlatformShortName>arm64</PlatformShortName>
+
+    <GccVersion>4.9</GccVersion>
+
+    <!-- Path to gcc prebuilt libs -->
+    <PrebuiltDir>$(AndroidNdkDir)\toolchains\$(PlatformToolsetVersion)\prebuilt\$(PrebuiltWinDirName)</PrebuiltDir>
+
+    <GccLibPath>$(PrebuiltDir)\lib\gcc\aarch64-linux-android\4.9</GccLibPath>
+    <GccLibPath_Thumb>$(GccLibPath)</GccLibPath_Thumb>
+    <GccLibPath_Arm7>$(GccLibPath)</GccLibPath_Arm7>
+    <GccLibPath_Arm7_Thumb>$(GccLibPath)</GccLibPath_Arm7_Thumb>
+
+    <!-- Path to the GCC compilation tools -->
+    <GccToolsPath>$(AndroidNdkDir)\toolchains\$(PlatformToolsetVersion)\prebuilt\$(PrebuiltWinDirName)\bin</GccToolsPath>
+
+    <!-- Path to the toolchain includes. Needed for Intellisense. -->
+    <GccToolchainIncludes>$(PrebuiltDir)\lib\gcc\aarch64-linux-android\4.9\include</GccToolchainIncludes>
+
+    <!-- GCC compilation tool filenames -->
+    <GccCompiler>aarch64-linux-android-g++.exe</GccCompiler>
+    <GccLinker>aarch64-linux-android-g++.exe</GccLinker>
+    <GccLibrarian>aarch64-linux-android-ar.exe</GccLibrarian>
+
+  </PropertyGroup>
+
+</Project>
diff --git a/MSBuild/Android/PlatformToolsets/aarch64-linux-android-4.9/Microsoft.Cpp.Android.aarch64-linux-android-4.9.targets b/MSBuild/Android/PlatformToolsets/aarch64-linux-android-4.9/Microsoft.Cpp.Android.aarch64-linux-android-4.9.targets
new file mode 100644
index 0000000..87ede19
--- /dev/null
+++ b/MSBuild/Android/PlatformToolsets/aarch64-linux-android-4.9/Microsoft.Cpp.Android.aarch64-linux-android-4.9.targets
@@ -0,0 +1,9 @@
+<!--
+***********************************************************************************************
+(c) 2014 Gavin Pugh http://www.gavpugh.com/ - Released under the open-source zlib license
+***********************************************************************************************
+-->
+
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ 
+</Project>
diff --git a/MSBuild/Android/Props/android_general.xml b/MSBuild/Android/Props/android_general.xml
index 2bc2979..434eec1 100644
--- a/MSBuild/Android/Props/android_general.xml
+++ b/MSBuild/Android/Props/android_general.xml
@@ -81,6 +81,7 @@
     <EnumValue Name="arm-linux-androideabi-4.6" DisplayName="ARM 4.6 Toolchain (arm-linux-androideabi-4.6)" />
     <EnumValue Name="arm-linux-androideabi-4.8" DisplayName="ARM 4.8 Toolchain (arm-linux-androideabi-4.8)" />
     <EnumValue Name="arm-linux-androideabi-4.9" DisplayName="ARM 4.9 Toolchain (arm-linux-androideabi-4.9)" />
+    <EnumValue Name="aarch64-linux-android-4.9" DisplayName="ARM64 4.9 Toolchain (aarch64-linux-android-4.9)" />
     <EnumValue Name="x86-4.6" DisplayName="x86 4.6 Toolchain (x86-4.6)" />
     <EnumValue Name="x86-4.8" DisplayName="x86 4.8 Toolchain (x86-4.8)" />
     <EnumValue Name="x86-4.9" DisplayName="x86 4.9 Toolchain (x86-4.9)" />
@@ -118,6 +119,7 @@
   <EnumProperty Name="AndroidArch" DisplayName="Target Architecture" Category="ProjectDefaults">
     <EnumValue Name="armv5te" DisplayName="ARM Architecture v5te (armv5te)" />
     <EnumValue Name="armv7-a" DisplayName="ARM Architecture v7-a (armv7-a)" />
+    <EnumValue Name="arm64v8-a" DisplayName="ARM64 Architecture v8-a (arm64v8-a)" />
     <EnumValue Name="x86" DisplayName="x86 Architecture (x86)" />
     <EnumValue Name="mips" DisplayName="MIPS Architecture (mips)" />
   </EnumProperty>
diff --git a/MSBuild/Android/vs-android.ToolPaths.props b/MSBuild/Android/vs-android.ToolPaths.props
index f28d011..4746289 100644
--- a/MSBuild/Android/vs-android.ToolPaths.props
+++ b/MSBuild/Android/vs-android.ToolPaths.props
@@ -19,6 +19,7 @@
     <ArchStlDirName Condition="'$(AndroidArch)' == 'armv7-a'">armeabi-v7a</ArchStlDirName>
     <ArchStlDirName Condition="'$(AndroidArch)' == 'x86'">x86</ArchStlDirName>
     <ArchStlDirName Condition="'$(AndroidArch)' == 'mips'">mips</ArchStlDirName>
+    <ArchStlDirName Condition="'$(AndroidArch)' == 'arm64v8-a'">arm64-v8a</ArchStlDirName>
 
     <AndroidStlIncludeDir Condition="'$(AndroidStlType)' == 'system'">$(AndroidNdkDir)\sources\cxx-stl\system\include</AndroidStlIncludeDir>
     <AndroidStlIncludeDir Condition="'$(AndroidStlType)' == 'gnustl_static'">$(AndroidNdkDir)\sources\cxx-stl\gnu-libstdc++\$(GccVersion)\include;$(AndroidNdkDir)\sources\cxx-stl\gnu-libstdc++\$(GccVersion)\libs\$(ArchStlDirName)\include</AndroidStlIncludeDir>