[build] Use xaprepare to provision Android tools

Author: pjcollins

build-tools/automation/azure-pipelines.yaml

@@ -253,11 +253,15 @@ stages:
 
     - template: yaml-templates/run-installer.yaml
 
-    # HACK - Provision Emulator
-    - script: |
-        make prepare CONFIGURATION=$(ApkTestConfiguration) V=1 MSBUILD=msbuild MSBUILD_ARGS="$(AutoProvisionArgs)"
-        git clean -xfd
-      displayName: (hack) make prepare - provision emulator
+    - task: MSBuild@1
+      displayName: build xaprepare
+      inputs:
+        solution: build-tools/xaprepare/xaprepare.sln
+        configuration: $(XA.Build.Configuration)
+        msbuildArguments: /t:Restore,Build
+
+    - script: mono build-tools/xaprepare/xaprepare/bin/$(XA.Build.Configuration)/xaprepare.exe --s=AndroidToolchain --no-emoji --run-mode=CI
+      displayName: provision Android toolchain
 
     - task: NuGetCommand@2
       displayName: nuget restore Xamarin.Android.Tools.sln

build-tools/automation/yaml-templates/apk-instrumentation.yaml

@@ -3,7 +3,7 @@ parameters:
   testName: []
   project: []
   testResultsFiles: []
-  extraBuildArgs: []
+  extraBuildArgs: ""
   testResultsFormat: NUnit
   packageType: Apk
 

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)"