[build] Use xaprepare to provision Android tools

pjcollins · pjcollins · commit bcf5ba68e8d0 · 2019-06-11T17:22:35.000-04:00
diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CreateAndroidEmulator.cs b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CreateAndroidEmulator.cs
@@ -92,9 +92,11 @@ void Run (string android)
 			if (Log.HasLoggedErrors)
 				return;
 
+			string fullSystemImagePath = Path.Combine (AndroidSdkHome, "system-images", $"android-{SdkVersion}", "default", AndroidAbi);
 			File.AppendAllLines (configPath, new string[] {
 				$"disk.dataPartition.size={diskSize}M",
-				$"hw.ramSize={ramSize}"
+				$"hw.ramSize={ramSize}",
+				$"image.sysdir.1={fullSystemImagePath}"
 			});
 		}
 
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
@@ -415,7 +422,14 @@ stages:
     - task: MSBuild@1
       displayName: package results
       inputs:
-        solution: build-tools\Xamarin.Android.Tools.BootstrapTasks\Xamarin.Android.Tools.BootstrapTasks.csproj
+        solution: build-tools/xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj
         configuration: $(ApkTestConfiguration)
-        msbuildArguments: /t:ZipTestResults /p:TestResultZipOutputPath=$(Build.ArtifactStagingDirectory)
+        msbuildArguments: /t:ZipBuildStatus;ZipTestResults /p:BuildStatusZipOutputPath=$(Build.ArtifactStagingDirectory) /p:TestResultZipOutputPath=$(Build.ArtifactStagingDirectory)
+      condition: always()
+
+    - task: PublishPipelineArtifact@0
+      displayName: upload artifacts
+      inputs:
+        artifactName: mac-apk-test-results
+        targetPath: $(Build.ArtifactStagingDirectory)
       condition: always()
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
 
@@ -15,7 +15,7 @@ steps:
     configuration: ${{ parameters.configuration }}
     msbuildArguments: >
       /t:AcquireAndroidTarget,SignAndroidPackage,UndeployTestApks,DeployTest${{ parameters.packageType }}s,RunTestApks,RenameApkTestCases,ReportComponentFailures
-      /bl:$(System.DefaultWorkingDirectory)/bin/Test${{ parameters.configuration }}run${{ parameters.testName }}.binlog
+      /bl:$(System.DefaultWorkingDirectory)/bin/Test${{ parameters.configuration }}/run${{ parameters.testName }}.binlog
       ${{ parameters.extraBuildArgs }}
   condition: succeededOrFailed()
 
diff --git a/build-tools/scripts/Jar.targets b/build-tools/scripts/Jar.targets
@@ -7,10 +7,8 @@
       <_JavacSourceVersion Condition=" '$(_JavacSourceVersion)' == '' ">1.5</_JavacSourceVersion>
       <_JavacTargetVersion Condition="$(_JdkVersion.StartsWith ('9'))">1.8</_JavacTargetVersion>
       <_JavacTargetVersion Condition=" '$(_JavacTargetVersion)' == '' ">1.6</_JavacTargetVersion>
-      <JarPath Condition=" '$(JarPath)' == '' And !$([MSBuild]::IsOsPlatform(Windows)) ">$(JavaSdkDirectory)\bin\jar</JarPath>
-      <JarPath Condition=" '$(JarPath)' == '' And $([MSBuild]::IsOsPlatform(Windows)) ">$(JavaSdkDirectory)\bin\jar.exe</JarPath>
-      <JavaCPath Condition=" '$(JavaCPath)' == '' And !$([MSBuild]::IsOsPlatform(Windows)) ">$(JavaSdkDirectory)\bin\javac</JavaCPath>
-      <JavaCPath Condition=" '$(JavaCPath)' == '' And $([MSBuild]::IsOsPlatform(Windows)) ">$(JavaSdkDirectory)\bin\javac.exe</JavaCPath>
+      <JarPath Condition=" '$(JarPath)' == '' ">$(JavaSdkDirectory)\bin\jar</JarPath>
+      <JavaCPath Condition=" '$(JavaCPath)' == '' ">$(JavaSdkDirectory)\bin\javac</JavaCPath>
     </PropertyGroup>
   </Target>
   <Target Name="BuildTestJarFile"
diff --git a/build-tools/scripts/TestApks.targets b/build-tools/scripts/TestApks.targets
@@ -177,8 +177,7 @@
       <_StorePass>android</_StorePass>
       <!-- Support for running against a system installation of XA. -->
       <BundleToolJarPath Condition=" !Exists('$(BundleToolJarPath)') ">$(AndroidBundleToolJarPath)</BundleToolJarPath>
-      <JavaPath Condition=" '$(JavaPath)' == '' And !$([MSBuild]::IsOsPlatform(Windows)) ">$(JavaSdkDirectory)\bin\java</JavaPath>
-      <JavaPath Condition=" '$(JavaPath)' == '' And $([MSBuild]::IsOsPlatform(Windows)) ">$(JavaSdkDirectory)\bin\java.exe</JavaPath>
+      <JavaPath Condition=" '$(JavaPath)' == '' ">$(JavaSdkDirectory)\bin\java</JavaPath>
     </PropertyGroup>
     <Xamarin.Android.Tools.BootstrapTasks.BundleTool
         Arguments="build-apks --connected-device --overwrite --mode default --bundle &quot;%(TestAab.Identity)&quot; --output &quot;%(TestAab.Identity).apks&quot;"
@@ -303,7 +302,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/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.targets b/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\build-tools\scripts\Jar.targets" />
-  <UsingTask AssemblyFile="..\..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" />
+  <Import Project="$(XamarinAndroidSourcePath)build-tools\scripts\Jar.targets" />
+  <UsingTask AssemblyFile="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" />
   <Target Name="BuildNativeLibs"
       DependsOnTargets="AndroidPrepareForBuild;_GetJavacVersions"
       Inputs="jni\simple-lib.c;jni\Android.mk"
diff --git a/tests/Xamarin.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.targets b/tests/Xamarin.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"

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ public override bool Execute ()`
`53`	`53`	`} else {`
`54`	`54`	`if (line.Contains ($"Process {ApplicationPackageName} (pid {PID}) has died")) {`
`55`	`55`	`Log.LogError ("Application crash detected. Could not collect performance data.");`
`56`		`- reader.Close ();`
`57`	`56`	`return false;`
`58`	`57`	`}`
`59`	`58`
`@@ -99,11 +98,8 @@ public override bool Execute ()`
`99`	`98`	`WriteResults ();`
`100`	`99`	`} else {`
`101`	`100`	`Log.LogError ("Application start wasn't detected. Could not collect performance data.");`
`102`		`- reader.Close ();`
`103`	`101`	`return false;`
`104`	`102`	`}`
`105`		`-`
`106`		`- reader.Close ();`
`107`	`103`	`}`
`108`	`104`
`109`	`105`	`return true;`