Try fix android (#1170)

* print things

* - more print

* - force path

* - set env variables

* - path

* - cake

* - set for user

* - set paths

* - set variables

* - fix path

* - remove prints

* - remove things

* - remove

* - remove it all

* - remove step

* - add setup sdk paths back in

Author: PureWeen

build.cake

@@ -1190,26 +1190,6 @@ AppleSimulator GetIosSimulator()
     return iosSimulators.First (s => s.Name == IOS_SIM_NAME && s.Runtime == IOS_SIM_RUNTIME);
 }
 
-public void PrintEnvironmentVariables()
-{
-    var envVars = EnvironmentVariables();
-
-    string path;
-    if (envVars.TryGetValue("PATH", out path))
-    {
-        Information("Path: {0}", path);
-    }
-
-    foreach(var envVar in envVars)
-    {
-        Information(
-            "Key: {0}\tValue: \"{1}\"",
-            envVar.Key,
-            envVar.Value
-            );
-    };
-}
-
 public void SetEnvironmentVariable(string key, string value, ICakeContext context)
 {
     var buildSystem = context.BuildSystem();

eng/cake/helpers.cake

@@ -28,4 +28,35 @@ T GetBuildVariable<T>(string key, T defaultValue)
     // And then Environment Variable check is case sensitive
     T upperCaseReturnValue = Argument(key.ToUpper(), EnvironmentVariable(key.ToUpper(), defaultValue));
     return Argument(key, EnvironmentVariable(key, upperCaseReturnValue));
+}
+
+string GetAndroidSDKPath()
+{
+    var ANDROID_SDK_ROOT = Argument("android", EnvironmentVariable("ANDROID_SDK_ROOT") ?? EnvironmentVariable("ANDROID_HOME"));
+
+    if (string.IsNullOrEmpty(ANDROID_SDK_ROOT)) {
+        throw new Exception("Environment variable 'ANDROID_SDK_ROOT' or 'ANDROID_HOME' must be set to the Android SDK root.");    
+    }
+
+    return ANDROID_SDK_ROOT;
+}
+
+public void PrintEnvironmentVariables()
+{
+    var envVars = EnvironmentVariables();
+
+    string path;
+    if (envVars.TryGetValue("PATH", out path))
+    {
+        Information("Path: {0}", path);
+    }
+
+    foreach(var envVar in envVars)
+    {
+        Information(
+            "Key: {0}\tValue: \"{1}\"",
+            envVar.Key,
+            envVar.Value
+            );
+    };
 }

eng/devices/android.cake

@@ -1,5 +1,6 @@
 #addin nuget:?package=Cake.Android.Adb&version=3.2.0
 #addin nuget:?package=Cake.Android.AvdManager&version=2.2.0
+#load "../cake/helpers.cake"
 
 string TARGET = Argument("target", "Test");
 
@@ -24,10 +25,8 @@ bool DEVICE_BOOT = Argument("boot", true);
 bool DEVICE_BOOT_WAIT = Argument("wait", true);
 
 // set up env
-var ANDROID_SDK_ROOT = Argument("android", EnvironmentVariable("ANDROID_SDK_ROOT") ?? EnvironmentVariable("ANDROID_HOME"));
-if (string.IsNullOrEmpty(ANDROID_SDK_ROOT)) {
-	throw new Exception("Environment variable 'ANDROID_SDK_ROOT' or 'ANDROID_HOME' must be set to the Android SDK root.");
-}
+var ANDROID_SDK_ROOT = GetAndroidSDKPath();
+
 System.Environment.SetEnvironmentVariable("PATH",
 	$"{ANDROID_SDK_ROOT}/tools/bin" + System.IO.Path.PathSeparator +
 	$"{ANDROID_SDK_ROOT}/platform-tools" + System.IO.Path.PathSeparator +
@@ -216,4 +215,4 @@ Task("Test")
 	}
 });
 
-RunTarget(TARGET);
+RunTarget(TARGET);

eng/pipelines/common/device-tests-steps.yml

@@ -48,6 +48,13 @@ steps:
   - script: dotnet tool restore
     displayName: install dotnet tools
 
+  - script: |
+      echo "##vso[task.prependpath]/Users/builder/Library/Developer/Xamarin/jdk/microsoft_dist_openjdk_1.8.0.40/bin"
+      echo "##vso[task.setvariable variable=JAVA_HOME]/Users/builder/Library/Developer/Xamarin/jdk/microsoft_dist_openjdk_1.8.0.40/"
+      echo "##vso[task.setvariable variable=ANDROID_SDK_ROOT]/Users/builder/Library/Developer/Xamarin/android-sdk-macosx/"
+    displayName: 'Setup SDK Paths'
+    condition: ne(variables['osx2019VmPool'], 'Azure Pipelines')
+
   - pwsh: |
       ./build.ps1 --target provision --TeamProject="$(System.TeamProject)"
     displayName: 'Cake Provision'