From 1755dd6c43b3ae8f5f1688ea555856890fd6ce68 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Thu, 25 Aug 2016 10:22:31 +0100
Subject: [PATCH] [Xamarin.Android.Build.Tasks] [Symbolication] Android AOT
 msym files should not be stored in an `abi` specific folder

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=43549

The symbolication spec was changed to removed the abi specific
subfolders. The msym files are now stored in folders which use
an AOTID. As a result there is no need to store them in abi
folder to avoid clashes.
---
 .../Xamarin.Android.Common.targets                           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index c71e2e4336e..08650ca4538 100755
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -2283,11 +2283,12 @@ because xbuild doesn't support framework reference assemblies.
   />
 
   <ItemGroup>
-    <_SymbolicateFiles Include="$(_AndroidAotBinDirectory)\**\*.msym" />
+    <_BuiltAbis Include="$(_BuildTargetAbis)" />
+    <_SymbolicateFiles Include="$(_AndroidAotBinDirectory)\%(_BuiltAbis.Identity)\**\*.msym" />
   </ItemGroup>
 
   <Copy Condition=" '$(AndroidManagedSymbols)' == 'True' And '%(_SymbolicateFiles.Filename)' != '' "
-    SourceFiles="$(_AndroidAotBinDirectory)\%(_SymbolicateFiles.RecursiveDir)%(_SymbolicateFiles.Filename)%(_SymbolicateFiles.Extension)"
+    SourceFiles="%(_SymbolicateFiles.Identity)"
     DestinationFolder="$(OutDir)$(_AndroidPackage).apk.msym\%(_SymbolicateFiles.RecursiveDir)"
     SkipUnchangedFiles="true"
   />