Skip to content

[Xamarin.Android.Build.Tasks] Allow the cache'ing of the dex/jack compilation for support libraries. [DO NOT MERGE WIP] #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dellis1972 wants to merge 1 commit into from
Closed

[Xamarin.Android.Build.Tasks] Allow the cache'ing of the dex/jack compilation for support libraries. [DO NOT MERGE WIP] #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/Xamarin.Android.Build.Tasks/Tasks/CompileToDalvik.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ public class CompileToDalvik : JavaToolTask
[Required]
public string ClassesOutputDirectory { get; set; }

public string ClassesOutputFile { get; set; }

public string DxJarPath { get; set; }

public string JavaToolPath { get; set; }
Expand Down Expand Up @@ -106,16 +108,24 @@ protected override string GenerateCommandLineCommands ()
cmd.AppendSwitch ("--multi-dex");
cmd.AppendSwitchIfNotNull ("--main-dex-list=", MultiDexMainDexListFile);
}
cmd.AppendSwitchIfNotNull ("--output=", Path.GetDirectoryName (ClassesOutputDirectory));
cmd.AppendSwitchIfNotNull ("--output=", Path.Combine (Path.GetDirectoryName (ClassesOutputDirectory), ClassesOutputFile ?? String.Empty));


// .jar files
if (File.Exists (OptionalObfuscatedJarFile))
cmd.AppendFileNameIfNotNull (OptionalObfuscatedJarFile);
else {
cmd.AppendFileNameIfNotNull (ClassesOutputDirectory);
foreach (var jar in JavaLibrariesToCompile)
cmd.AppendFileNameIfNotNull (jar.ItemSpec);
if (string.IsNullOrEmpty (ClassesOutputFile))
cmd.AppendFileNameIfNotNull (ClassesOutputDirectory);
foreach (var jar in JavaLibrariesToCompile) {
var cacheJar = Path.Combine (Path.GetDirectoryName (jar.ItemSpec), "xamarin_cache.jar");
if (File.Exists (cacheJar)) {
cmd.AppendFileNameIfNotNull (cacheJar);
Log.LogDebugMessage (" using: {0}", cacheJar);
}
else
cmd.AppendFileNameIfNotNull (jar.ItemSpec);
}
}

return cmd.ToString ();
Expand Down
6 changes: 4 additions & 2 deletions src/Xamarin.Android.Build.Tasks/Tasks/Dx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ public class Dx : JavaToolTask
[Required]
public string OutputDexDirectory { get; set; }

public string OutputFileName { get; set; }

public string [] Jars { get; set; }

[Output]
Expand Down Expand Up @@ -48,13 +50,13 @@ public override bool Execute ()
var md5 = System.Security.Cryptography.MD5.Create ();
foreach (var jar in Jars) {
context_jar = jar;
context_dex = Path.Combine (OutputDexDirectory, BitConverter.ToString (md5.ComputeHash (Encoding.UTF8.GetBytes (jar))) + Path.GetFileNameWithoutExtension (context_jar) + ".dex");
context_dex = Path.Combine (OutputDexDirectory, OutputFileName ?? BitConverter.ToString (md5.ComputeHash (Encoding.UTF8.GetBytes (jar))) + Path.GetFileNameWithoutExtension (context_jar) + ".dex");
retval &= base.Execute ();
outputJackFiles.Add (context_dex);
}
OutputDexFiles = outputJackFiles.ToArray ();

Log.LogDebugTaskItems (" OutputJackFiles: ", OutputDexFiles);
Log.LogDebugTaskItems (" OutputDexFiles: ", OutputDexFiles);
return retval;
}

Expand Down
8 changes: 5 additions & 3 deletions src/Xamarin.Android.Build.Tasks/Tasks/GetConvertedJavaLibraries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ public override bool Execute ()
var md5 = MD5.Create ();
ConvertedFilesToBeGenerated =
(JarsToConvert ?? new string [0]).Select (
j => Path.Combine (OutputJackDirectory,
BitConverter.ToString (md5.ComputeHash (Encoding.UTF8.GetBytes (j))) + Path.ChangeExtension (Path.GetFileName (j), Extension)))
.ToArray ();
j => File.Exists (Path.Combine (Path.GetDirectoryName (j), "xamarin_cache.jack"))
? Path.Combine (Path.GetDirectoryName (j), "xamarin_cache.jack")
: Path.Combine (OutputJackDirectory,
BitConverter.ToString (md5.ComputeHash (Encoding.UTF8.GetBytes (j))) + Path.ChangeExtension (Path.GetFileName (j), Extension)))
.ToArray ();
Log.LogDebugTaskItems (" ConvertedFilesToBeGenerated:", ConvertedFilesToBeGenerated);
return true;
}
Expand Down
6 changes: 5 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Tasks/Jill.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ public class Jill : JavaToolTask
[Required]
public string OutputJackDirectory { get; set; }

public string OutputFileName { get; set; }

public string [] Jars { get; set; }

[Output]
Expand All @@ -47,8 +49,10 @@ public override bool Execute ()
var outputJackFiles = new List<string> ();
var md5 = System.Security.Cryptography.MD5.Create ();
foreach (var jar in Jars) {
if (File.Exists (Path.Combine (Path.GetDirectoryName (jar), "xamarin_cache.jack")))
continue;
context_jar = jar;
context_jack = Path.Combine (OutputJackDirectory, BitConverter.ToString (md5.ComputeHash (Encoding.UTF8.GetBytes (jar))) + Path.GetFileNameWithoutExtension (context_jar) + ".jack");
context_jack = Path.Combine (OutputJackDirectory, OutputFileName ?? BitConverter.ToString (md5.ComputeHash (Encoding.UTF8.GetBytes (jar))) + Path.GetFileNameWithoutExtension (context_jar) + ".jack");
retval &= base.Execute ();
outputJackFiles.Add (context_jack);
}
Expand Down
31 changes: 30 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2019,6 +2019,35 @@ because xbuild doesn't support framework reference assemblies.
Condition="'$(UseJackAndJill)' == 'True'"
DependsOnTargets="_CompileJavaWithJack" />

<Target Name="_CreateAdditionalJavaLibraryJackCache"
Condition="'$(UseJackAndJill)' == 'True'"
Inputs="@(_AdditionalJavaLibraryReferences)"
Outputs="@(_AdditionalJavaLibraryReferences->'%(RootDir)%(Directory)xamarin_cache.jack')">
<Jill
Condition="'$(UseJackAndJill)' == 'True'"
OutputJackDirectory="%(RootDir)%(Directory)"
OutputFileName="xamarin_cache.jack"
Jars="%(_AdditionalJavaLibraryReferences.Identity)"
ToolPath="$(JavaToolPath)"
ToolExe="$(JavaToolExe)"
JillJarPath="$(JillJarPath)" />
</Target>

<Target Name="_CreateAdditionalJavaLibraryDxCache"
Condition="'$(UseJackAndJill)'!='True'"
Inputs="@(_AdditionalJavaLibraryReferences)"
Outputs="@(_AdditionalJavaLibraryReferences->'%(RootDir)%(Directory)xamarin_cache.jar')"
>
<Dx
OutputDexDirectory="%(RootDir)%(Directory)"
OutputFileName="xamarin_cache.jar"
Jars="%(_AdditionalJavaLibraryReferences.Identity)"
ToolPath="$(JavaToolPath)"
ToolExe="$(JavaToolExe)"
DxJarPath="$(DxJarPath)"
/>
</Target>

<Target Name="_CompileToDalvikWithDx"
Condition="'$(UseJackAndJill)' != 'True'"
DependsOnTargets="$(_CompileToDalvikDependsOnTargets)"
Expand Down Expand Up @@ -2092,7 +2121,7 @@ because xbuild doesn't support framework reference assemblies.
</Target>

<Target Name="_CompileDex"
DependsOnTargets="_CompileToDalvikWithDx;_CompileToDalvikWithJack">
DependsOnTargets="_CreateAdditionalJavaLibraryDxCache;_CreateAdditionalJavaLibraryJackCache;_CompileToDalvikWithDx;_CompileToDalvikWithJack">

<ItemGroup>
<_DexFile Include="$(IntermediateOutputPath)android\bin\dex\*.dex" />
Expand Down