Skip to content
Merged
Prev Previous commit
Remove unused property
  • Loading branch information
dellis1972 committed Mar 14, 2024
commit ef915f07002dd5a82c4587b460d7839d397ce258
8 changes: 2 additions & 6 deletions src/Xamarin.Android.Build.Tasks/Tasks/Aapt2LinkAssetPack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ public class Aapt2LinkAssetPack : Aapt2 {
[Required]
public ITaskItem OutputArchive { get; set; }

public string OutputFormat { get; set; } = "proto";

protected override int GetRequiredDaemonInstances ()
{
return Math.Min (1, DaemonMaxInstanceCount);
Expand All @@ -40,7 +38,7 @@ public async override System.Threading.Tasks.Task RunTaskAsync ()
{
RunAapt (GenerateCommandLineCommands (Manifest, OutputArchive), OutputArchive.ItemSpec);
ProcessOutput ();
if (OutputFormat == "proto" && File.Exists (OutputArchive.ItemSpec)) {
if (File.Exists (OutputArchive.ItemSpec)) {
// move the manifest to the right place.
using (var zip = new ZipArchiveEx (OutputArchive.ItemSpec, File.Exists (OutputArchive.ItemSpec) ? FileMode.Open : FileMode.Create)) {
zip.MoveEntry ("AndroidManifest.xml", "manifest/AndroidManifest.xml");
Expand All @@ -61,9 +59,7 @@ protected string[] GenerateCommandLineCommands (ITaskItem manifest, ITaskItem ou
cmd.Add ("-v");
cmd.Add ("--manifest");
cmd.Add (GetFullPath (manifest.ItemSpec));
if (OutputFormat == "proto") {
cmd.Add ("--proto-format");
}
cmd.Add ("--proto-format");
cmd.Add ("--custom-package");
cmd.Add (PackageName);
foreach (var assetDirectory in AssetDirectories) {
Expand Down