From 244b5ea460b8f20b85cafa9326257b35a5570161 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Fri, 17 Nov 2017 09:19:52 -0600
Subject: [PATCH] [tests] set $(AndroidSdkDirectory) for JI tests

Context: https://github.com/xamarin/java.interop/pull/211

For Windows to set `ANDROID_SDK_PATH` for the Java.Interop unit tests,
we need to pass `$(AndroidSdkDirectory)` through.

Otherwise a few tests get skipped in
Xamarin.Android.Tools.Bytecode-Tests.dll.
---
 build-tools/scripts/RunTests.targets | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build-tools/scripts/RunTests.targets b/build-tools/scripts/RunTests.targets
index 825d4dd6932..92ce345062c 100644
--- a/build-tools/scripts/RunTests.targets
+++ b/build-tools/scripts/RunTests.targets
@@ -48,7 +48,10 @@
         Condition=" '$(HostOS)' != 'Windows' "
     />
     <SetEnvironmentVariable Name="ANDROID_SDK_PATH" Value="$(AndroidSdkFullPath)" />
-    <MSBuild Projects="$(JavaInteropSourceDirectory)\build-tools\scripts\RunNUnitTests.targets" />
+    <MSBuild 
+        Projects="$(JavaInteropSourceDirectory)\build-tools\scripts\RunNUnitTests.targets"
+        Properties="AndroidSdkDirectory=$(AndroidSdkDirectory)"
+    />
     <ItemGroup>
       <_RenameTestCasesGlob Include="$(JavaInteropSourceDirectory)\TestResult-*Tests.xml" />
     </ItemGroup>