Use Android SDK tools to fix up APK after patching.

Author: jkoritzinsky

src/tasks/AndroidAppBuilder/ApkBuilder.cs

@@ -463,7 +463,7 @@ public ApkBuilder(TaskLoggingHelper logger)
         // 4. Align APK
 
         string alignedApk = Path.Combine(OutputDir, "bin", $"{ProjectName}.apk");
-        Utils.RunProcess(logger, zipalign, $"-v 4 {apkFile} {alignedApk}", workingDir: OutputDir);
+        AlignApk(apkFile, alignedApk, zipalign);
         // we don't need the unaligned one any more
         File.Delete(apkFile);
 
@@ -475,6 +475,11 @@ public ApkBuilder(TaskLoggingHelper logger)
         return (alignedApk, packageId);
     }
 
+    private void AlignApk(string unalignedApkPath, string apkOutPath, string zipalign)
+    {
+        Utils.RunProcess(logger, zipalign, $"-v 4 {unalignedApkPath} {apkOutPath}", workingDir: OutputDir);
+    }
+
     private void SignApk(string apkPath, string apksigner)
     {
         string defaultKey = Path.Combine(OutputDir, "debug.keystore");
@@ -495,6 +500,31 @@ private void SignApk(string apkPath, string apksigner)
             $"--ks-pass pass:android --key-pass pass:android {apkPath}", workingDir: OutputDir);
     }
 
+    public void ZipAndSignApk(string apkPath)
+    {
+        if (string.IsNullOrEmpty(AndroidSdk))
+            AndroidSdk = Environment.GetEnvironmentVariable("ANDROID_SDK_ROOT");
+
+        if (string.IsNullOrEmpty(AndroidSdk) || !Directory.Exists(AndroidSdk))
+            throw new ArgumentException($"Android SDK='{AndroidSdk}' was not found or incorrect (can be set via ANDROID_SDK_ROOT envvar).");
+
+        if (string.IsNullOrEmpty(BuildToolsVersion))
+            BuildToolsVersion = GetLatestBuildTools(AndroidSdk);
+
+        if (string.IsNullOrEmpty(MinApiLevel))
+            MinApiLevel = DefaultMinApiLevel;
+
+        string buildToolsFolder = Path.Combine(AndroidSdk, "build-tools", BuildToolsVersion);
+        string zipalign = Path.Combine(buildToolsFolder, "zipalign");
+        string apksigner = Path.Combine(buildToolsFolder, "apksigner");
+
+        string alignedApkPath = $"{apkPath}.aligned";
+        AlignApk(apkPath, alignedApkPath, zipalign);
+        logger.LogMessage(MessageImportance.High, $"\nMoving '{alignedApkPath}' to '{apkPath}'.\n");
+        File.Move(alignedApkPath, apkPath, overwrite: true);
+        SignApk(apkPath, apksigner);
+    }
+
     public void ReplaceFileInApk(string file)
     {
         if (string.IsNullOrEmpty(AndroidSdk))

src/tasks/TestExclusionListTasks/PatchExclusionListInApks.cs

@@ -18,19 +18,38 @@ public class PatchExclusionListInApks : Task
     [Required]
     public ITaskItem[]? ExcludedTests { get; set; }
 
+    public string? AndroidSdk { get; set; }
+
+    public string? MinApiLevel { get; set; }
+
+    public string? BuildToolsVersion { get; set; }
+
+    public string? KeyStorePath { get; set; }
+
     public override bool Execute()
     {
+        var apkBuilder = new ApkBuilder(Log);
+        apkBuilder.AndroidSdk = AndroidSdk;
+        apkBuilder.MinApiLevel = MinApiLevel;
+        apkBuilder.BuildToolsVersion = BuildToolsVersion;
+        apkBuilder.KeyStorePath = KeyStorePath;
+
         string testExclusionList = string.Join(
             '\n',
             (ExcludedTests ?? Enumerable.Empty<ITaskItem>()).Select(t => t.ItemSpec));
         foreach (ITaskItem apk in ApkPaths ?? Enumerable.Empty<ITaskItem>())
         {
-            using ZipArchive apkArchive = ZipFile.Open(apk.GetMetadata("FullPath"), ZipArchiveMode.Update);
-            ZipArchiveEntry assetsZipEntry = apkArchive.GetEntry("assets/assets.zip")!;
-            using ZipArchive assetsArchive = new ZipArchive(assetsZipEntry.Open(), ZipArchiveMode.Update);
-            ZipArchiveEntry testExclusionListEntry = assetsArchive.GetEntry("TestExclusionList.txt")!;
-            using StreamWriter textExclusionListWriter = new StreamWriter(testExclusionListEntry.Open());
-            textExclusionListWriter.WriteLine(testExclusionList);
+            string apkPath = apk.GetMetadata("FullPath")!;
+            apkBuilder.OutputDir = Path.GetDirectoryName(apkPath)!;
+            using (ZipArchive apkArchive = ZipFile.Open(apkPath, ZipArchiveMode.Update))
+            {
+                ZipArchiveEntry assetsZipEntry = apkArchive.GetEntry("assets/assets.zip")!;
+                using ZipArchive assetsArchive = new ZipArchive(assetsZipEntry.Open(), ZipArchiveMode.Update);
+                ZipArchiveEntry testExclusionListEntry = assetsArchive.GetEntry("TestExclusionList.txt")!;
+                using StreamWriter textExclusionListWriter = new StreamWriter(testExclusionListEntry.Open());
+                textExclusionListWriter.WriteLine(testExclusionList);
+            }
+            apkBuilder.ZipAndSignApk(apkPath);
         }
         return true;
     }

src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj

@@ -5,10 +5,13 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <Nullable>enable</Nullable>
+    <NoWarn>$(NoWarn),CA1050</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="PatchExclusionListInApks.cs" />
+    <Compile Include="../AndroidAppBuilder/ApkBuilder.cs" />
+    <Compile Include="../Common/Utils.cs" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />