From db74a74af8d477fdc277a3909b12b2d151e64ed3 Mon Sep 17 00:00:00 2001
From: Redth <jondick@gmail.com>
Date: Mon, 29 Oct 2018 17:41:24 -0400
Subject: [PATCH] Embed .aar in .dll

Running into some resource not found issues at build time and suspect this is why.
---
 source/AndroidSupportProject.cshtml | 11 ++++++++++-
 source/AndroidSupportTargets.cshtml |  8 --------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/source/AndroidSupportProject.cshtml b/source/AndroidSupportProject.cshtml
index 70c5bcb..294e0b7 100644
--- a/source/AndroidSupportProject.cshtml
+++ b/source/AndroidSupportProject.cshtml
@@ -70,6 +70,15 @@
   </ItemGroup>
   }
 
+  <ItemGroup>
+    @foreach (var art in @Model.MavenArtifacts) {
+      if (art.MavenArtifactPackaging == "aar") {
+    <LibraryProjectZip Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId).aar" />
+      }
+    }   
+  </ItemGroup>
+
+
   <ItemGroup>
     <Folder Include="Additions\" />
     <Folder Include="Jars\" />
@@ -93,7 +102,7 @@
 
   <ItemGroup>
     @foreach (var art in @Model.MavenArtifacts) {
-      if (art.MavenArtifactPackaging == "aar") {
+      if (1==2 && art.MavenArtifactPackaging == "aar") {
     <None Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId).aar" Pack="True" PackagePath="aar\" />
       }
     }   
diff --git a/source/AndroidSupportTargets.cshtml b/source/AndroidSupportTargets.cshtml
index d6f8db1..81fd176 100644
--- a/source/AndroidSupportTargets.cshtml
+++ b/source/AndroidSupportTargets.cshtml
@@ -28,14 +28,6 @@
   </ItemGroup>
   }
 
-  <ItemGroup>
-    @foreach (var art in @Model.MavenArtifacts) {
-      if (art.MavenArtifactPackaging == "aar") {
-    <AndroidAarLibrary Include="$(MSBuildThisFileDirectory)..\..\aar\@(art.MavenGroupId).@(art.MavenArtifactId).aar" />
-      }
-    }   
-  </ItemGroup>
-
 @{
   string mergeTargets = Path.Combine(Model.Config.BasePath, "source", Model.MavenGroupId, Model.Name, "merge.targets");
   if (File.Exists(mergeTargets)) {