[build] Use xaprepare to provision Android tools

dotnet · Jun 10, 2019 · 88bbd48 · 88bbd48
1 parent 0e489de
commit 88bbd48
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
@@ -253,11 +253,18 @@ stages:
 
     - template: yaml-templates/run-installer.yaml
 
-    # HACK - Provision Emulator
+    - task: MSBuild@1
+      displayName: build xaprepare
+      inputs:
+        solution: build-tools/xaprepare/xaprepare.sln
+        configuration: $(XA.Build.Configuration)
+        msbuildArguments: /t:Restore,Build
+
     - script: |
-        make prepare CONFIGURATION=$(ApkTestConfiguration) V=1 MSBUILD=msbuild MSBUILD_ARGS="$(AutoProvisionArgs)"
-        git clean -xfd
-      displayName: (hack) make prepare - provision emulator
+        mono build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=UpdateMono --auto-provision=yes --auto-provision-uses-sudo=yes --no-emoji --run-mode=CI
+        mono build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=Required --auto-provision=yes --auto-provision-uses-sudo=yes --no-emoji --run-mode=CI
+        mono build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=AndroidToolchain --no-emoji --run-mode=CI
+      displayName: provision dependencies
 
     - task: NuGetCommand@2
       displayName: nuget restore Xamarin.Android.Tools.sln

diff --git a/build-tools/automation/yaml-templates/apk-instrumentation.yaml b/build-tools/automation/yaml-templates/apk-instrumentation.yaml
@@ -3,7 +3,7 @@ parameters:
   testName: []
   project: []
   testResultsFiles: []
-  extraBuildArgs: []
+  extraBuildArgs: ""
   testResultsFormat: NUnit
   packageType: Apk
 

diff --git a/build-tools/scripts/TestApks.targets b/build-tools/scripts/TestApks.targets
@@ -303,7 +303,7 @@
     />
   </Target>
   <Target Name="RenameApkTestCases"
-      Condition=" '@(TestApk)' != '' ">
+      Condition=" '@(TestApk)' != '' Or '@(TestAab)' != '' ">
     <RenameTestCases
         Condition=" '%(TestApkInstrumentation.ResultsPath)' != '' "
         Configuration="$(Configuration)"

diff --git a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/ProcessLogcatTiming.cs b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/ProcessLogcatTiming.cs
@@ -53,7 +53,6 @@ public override bool Execute ()
 					} else {
 						if (line.Contains ($"Process {ApplicationPackageName} (pid {PID}) has died")) {
 							Log.LogError ("Application crash detected. Could not collect performance data.");
-							reader.Close ();
 							return false;
 						}
 
@@ -99,11 +98,8 @@ public override bool Execute ()
 					WriteResults ();
 				} else {
 					Log.LogError ("Application start wasn't detected. Could not collect performance data.");
-					reader.Close ();
 					return false;
 				}
-
-				reader.Close ();
 			}
 
 			return true;

diff --git a/...n.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.targets b/...n.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.targets
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="Xamarin.Forms.Performance.Integration.Droid.projitems" />
-  <Import Project="..\..\..\build-tools\scripts\TestApks.targets" />
-  <Import Project="..\..\..\build-tools\scripts\JavaInteropDllConfigs.targets" />
+  <Import Project="$(XamarinAndroidSourcePath)build-tools\scripts\TestApks.targets" />
+  <Import Project="$(XamarinAndroidSourcePath)build-tools\scripts\JavaInteropDllConfigs.targets" />
   <Target Name="EnsureJavaInteropDllConfigs"
       Condition="Exists ('$(XAInstallPrefix)xbuild\Xamarin\Android\Java.Interop.dll')"
       BeforeTargets="_GenerateJniMarshalMethods"