[Xamarin.Android.Build.Tasks] leave classes.zip uncompressed (#2140)

jonathanpeppers · dellis1972 · commit 84f928cbb15a · 2018-09-05T09:49:07.000+01:00
I was thinking about a couple of the slower MSBuild tasks:
- `Javac`
- `CompileToDalvik`

One thing I noticed here was that `Javac` outputs a `classes.zip`
file, and `CompileToDalvik` consumes it. It also looked like we are
using `CompressionMethod.Default` as you would expect.

So why should we compress this file at all? It seemed that was work we
could just skip and things would work fine? Presumably `dx.jar` can
work with an uncompressed `classes.zip` file faster than a compressed
one?

So I made the following changes:
- Added an option to pass in the `CompressionMethod` in `ZipArchiveEx`
- Used `CompressionMethod.Store` for creating `classes.zip`

The results on a File | New Xamarin.Forms app looked great!

Before:

     3443 ms  Javac                                      1 calls
    11545 ms  CompileToDalvik                            1 calls

After:

     3338 ms  Javac                                      1 calls
    10535 ms  CompileToDalvik                            1 calls

I did a `Clean` before running the `SignAndroidPackage` target on
these builds.

These savings seem pretty good! The only drawback being we use more
disk space in `$(IntermediateOutputPath)`.
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Javac.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Javac.cs
@@ -7,6 +7,7 @@
 using Microsoft.Build.Utilities;
 using System.Text;
 using System.Collections.Generic;
+using Xamarin.Tools.Zip;
 
 namespace Xamarin.Android.Tasks
 {
@@ -36,7 +37,7 @@ public override bool Execute ()
 				return result;
 			// compress all the class files
 			using (var zip = new ZipArchiveEx (Path.Combine (ClassesOutputDirectory, "..", "classes.zip"), FileMode.OpenOrCreate))
-				zip.AddDirectory (ClassesOutputDirectory, "");
+				zip.AddDirectory (ClassesOutputDirectory, "", CompressionMethod.Store);
 			return result;
 		}
 
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ZipArchiveEx.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ZipArchiveEx.cs
@@ -52,7 +52,7 @@ string ArchiveNameForFile (string filename, string directoryPathInZip)
 			return pathName.Replace ("\\", "/");
 		}
 
-		void AddFiles (string folder, string folderInArchive)
+		void AddFiles (string folder, string folderInArchive, CompressionMethod method)
 		{
 			int count = 0;
 			foreach (string fileName in Directory.GetFiles (folder, "*.*", SearchOption.TopDirectoryOnly)) {
@@ -64,9 +64,9 @@ void AddFiles (string folder, string folderInArchive)
 				if (zip.ContainsEntry (archiveFileName, out index)) {
 					var e = zip.First (x => x.FullName == archiveFileName);
 					if (e.ModificationTime < fi.LastWriteTimeUtc)
-						zip.AddFile (fileName, archiveFileName);
+						zip.AddFile (fileName, archiveFileName, compressionMethod: method);
 				} else {
-					zip.AddFile (fileName, archiveFileName);
+					zip.AddFile (fileName, archiveFileName, compressionMethod: method);
 				}
 				count++;
 				if (count == ZipArchiveEx.ZipFlushLimit) {
@@ -84,7 +84,7 @@ public void RemoveFile (string folder, string file)
 				zip.DeleteEntry ((ulong)index);
 		}
 
-		public void AddDirectory (string folder, string folderInArchive)
+		public void AddDirectory (string folder, string folderInArchive, CompressionMethod method = CompressionMethod.Default)
 		{
 			if (!string.IsNullOrEmpty (folder)) {
 				folder = folder.Replace ('/', Path.DirectorySeparatorChar).Replace ('\\', Path.DirectorySeparatorChar);
@@ -94,7 +94,7 @@ public void AddDirectory (string folder, string folderInArchive)
 				}
 			}
 
-			AddFiles (folder, folderInArchive);
+			AddFiles (folder, folderInArchive, method);
 			foreach (string dir in Directory.GetDirectories (folder, "*", SearchOption.AllDirectories)) {
 				var di = new DirectoryInfo (dir);
 				if ((di.Attributes & FileAttributes.Hidden) != 0)
@@ -106,7 +106,7 @@ public void AddDirectory (string folder, string folderInArchive)
 				} catch (ZipException) {
 					
 				}
-				AddFiles (dir, fullDirPath);
+				AddFiles (dir, fullDirPath, method);
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using Microsoft.Build.Utilities;`
`8`	`8`	`using System.Text;`
`9`	`9`	`using System.Collections.Generic;`
	`10`	`+using Xamarin.Tools.Zip;`
`10`	`11`
`11`	`12`	`namespace Xamarin.Android.Tasks`
`12`	`13`	`{`
`@@ -36,7 +37,7 @@ public override bool Execute ()`
`36`	`37`	`return result;`
`37`	`38`	`// compress all the class files`
`38`	`39`	`using (var zip = new ZipArchiveEx (Path.Combine (ClassesOutputDirectory, "..", "classes.zip"), FileMode.OpenOrCreate))`
`39`		`- zip.AddDirectory (ClassesOutputDirectory, "");`
	`40`	`+ zip.AddDirectory (ClassesOutputDirectory, "", CompressionMethod.Store);`
`40`	`41`	`return result;`
`41`	`42`	`}`
`42`	`43`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ string ArchiveNameForFile (string filename, string directoryPathInZip)`
`52`	`52`	`return pathName.Replace ("\\", "/");`
`53`	`53`	`}`
`54`	`54`
`55`		`- void AddFiles (string folder, string folderInArchive)`
	`55`	`+ void AddFiles (string folder, string folderInArchive, CompressionMethod method)`
`56`	`56`	`{`
`57`	`57`	`int count = 0;`
`58`	`58`	`foreach (string fileName in Directory.GetFiles (folder, ".", SearchOption.TopDirectoryOnly)) {`
`@@ -64,9 +64,9 @@ void AddFiles (string folder, string folderInArchive)`
`64`	`64`	`if (zip.ContainsEntry (archiveFileName, out index)) {`
`65`	`65`	`var e = zip.First (x => x.FullName == archiveFileName);`
`66`	`66`	`if (e.ModificationTime < fi.LastWriteTimeUtc)`
`67`		`- zip.AddFile (fileName, archiveFileName);`
	`67`	`+ zip.AddFile (fileName, archiveFileName, compressionMethod: method);`
`68`	`68`	`} else {`
`69`		`- zip.AddFile (fileName, archiveFileName);`
	`69`	`+ zip.AddFile (fileName, archiveFileName, compressionMethod: method);`
`70`	`70`	`}`
`71`	`71`	`count++;`
`72`	`72`	`if (count == ZipArchiveEx.ZipFlushLimit) {`
`@@ -84,7 +84,7 @@ public void RemoveFile (string folder, string file)`
`84`	`84`	`zip.DeleteEntry ((ulong)index);`
`85`	`85`	`}`
`86`	`86`
`87`		`- public void AddDirectory (string folder, string folderInArchive)`
	`87`	`+ public void AddDirectory (string folder, string folderInArchive, CompressionMethod method = CompressionMethod.Default)`
`88`	`88`	`{`
`89`	`89`	`if (!string.IsNullOrEmpty (folder)) {`
`90`	`90`	`folder = folder.Replace ('/', Path.DirectorySeparatorChar).Replace ('\\', Path.DirectorySeparatorChar);`
`@@ -94,7 +94,7 @@ public void AddDirectory (string folder, string folderInArchive)`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`		`- AddFiles (folder, folderInArchive);`
	`97`	`+ AddFiles (folder, folderInArchive, method);`
`98`	`98`	`foreach (string dir in Directory.GetDirectories (folder, "*", SearchOption.AllDirectories)) {`
`99`	`99`	`var di = new DirectoryInfo (dir);`
`100`	`100`	`if ((di.Attributes & FileAttributes.Hidden) != 0)`
`@@ -106,7 +106,7 @@ public void AddDirectory (string folder, string folderInArchive)`
`106`	`106`	`} catch (ZipException) {`
`107`	`107`
`108`	`108`	`}`
`109`		`- AddFiles (dir, fullDirPath);`
	`109`	`+ AddFiles (dir, fullDirPath, method);`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`