From c16cede87acbee130c80a69e433f61b7ec8492bb Mon Sep 17 00:00:00 2001
From: Lars Brubaker <larsbrubaker@gmail.com>
Date: Wed, 28 Sep 2016 10:24:11 -0700
Subject: [PATCH] Getting android to build

---
 Submodules/agg-sharp                                          | 2 +-
 Tests/MatterControl.Tests/MatterControl/ReleaseBuildTests.cs  | 4 ++++
 .../MatterControl/Slicing/SliceLayersTests.cs                 | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index f5527750c..f6ce2512c 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit f5527750c618e301aec536be6f3e5b7b05ad7bdf
+Subproject commit f6ce2512c92e83136d5eaf06188a09a6214822b6
diff --git a/Tests/MatterControl.Tests/MatterControl/ReleaseBuildTests.cs b/Tests/MatterControl.Tests/MatterControl/ReleaseBuildTests.cs
index eebd3c55a..5e288f4fd 100644
--- a/Tests/MatterControl.Tests/MatterControl/ReleaseBuildTests.cs
+++ b/Tests/MatterControl.Tests/MatterControl/ReleaseBuildTests.cs
@@ -2,7 +2,9 @@
 using MatterHackers.Agg.UI.Tests;
 using MatterHackers.GuiAutomation;
 using MatterHackers.MatterControl;
+#if !__ANDROID__
 using MatterHackers.MatterControl.Tests.Automation;
+#endif
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
@@ -102,6 +104,7 @@ namespace MatterControl.Tests
 			Console.WriteLine(referencedItems);
 		}
 
+#if !__ANDROID__
 		[Test, RequiresSTA, RunInApplicationDomain]
 		public void MatterControlRuns()
 		{
@@ -120,6 +123,7 @@ namespace MatterControl.Tests
 			AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, maxTimeToRun: 200);
 			Assert.IsTrue(testHarness.AllTestsPassed(1));
 		}
+#endif
 
 		[Test, Category("ReleaseQuality")]
 		public void MatterControlDependenciesAreOptimized()
diff --git a/Tests/MatterControl.Tests/MatterControl/Slicing/SliceLayersTests.cs b/Tests/MatterControl.Tests/MatterControl/Slicing/SliceLayersTests.cs
index cda97ffa6..dd8771101 100644
--- a/Tests/MatterControl.Tests/MatterControl/Slicing/SliceLayersTests.cs
+++ b/Tests/MatterControl.Tests/MatterControl/Slicing/SliceLayersTests.cs
@@ -28,7 +28,10 @@ either expressed or implied, of the FreeBSD Project.
 */
 
 using MatterHackers.Agg.PlatformAbstract;
+using MatterHackers.MatterSlice.Tests;
+#if !__ANDROID__
 using MatterHackers.MatterControl.Tests.Automation;
+#endif
 using MatterHackers.PolygonMesh;
 using MatterHackers.PolygonMesh.Processors;
 using MatterHackers.VectorMath;