Skip to content

[Xamarin.Android.Build.Tasks] ResolveLibraryProjectImports temp files #2540

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

Merged
merged 1 commit into from
Dec 19, 2018
Merged

[Xamarin.Android.Build.Tasks] ResolveLibraryProjectImports temp files #2540

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
33 changes: 8 additions & 25 deletions src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@ void Extract (
Directory.CreateDirectory (outDirForDll);
var finfo = new FileInfo (Path.Combine (outDirForDll, envtxt.Name));
if (!finfo.Exists || finfo.LastWriteTimeUtc > assemblyLastWrite) {
using (var stream = envtxt.GetResourceStream ())
using (var fs = finfo.Create ()) {
var data = envtxt.GetResourceData ();
fs.Write (data, 0, data.Length);
stream.CopyTo (fs);
}
updated = true;
}
Expand All @@ -283,24 +283,18 @@ void Extract (
var outjarFile = Path.Combine (importsDir, resjar.Name);
var fi = new FileInfo (outjarFile);
if (!fi.Exists || fi.LastWriteTimeUtc > assemblyLastWrite) {
var data = resjar.GetResourceData ();
using (var stream = resjar.GetResourceStream ())
using (var outfs = File.Create (outjarFile))
outfs.Write (data, 0, data.Length);
stream.CopyTo (outfs);
updated = true;
}
}

var libzip = mod.Resources.FirstOrDefault (r => r.Name == "__AndroidNativeLibraries__.zip") as EmbeddedResource;
if (libzip != null) {
if (!Directory.Exists (outDirForDll))
Directory.CreateDirectory (outDirForDll);
var finfo = new FileInfo (Path.Combine (outDirForDll, libzip.Name));
using (var fs = finfo.Create ()) {
var data = libzip.GetResourceData ();
fs.Write (data, 0, data.Length);
}
List<string> files = new List<string> ();
using (var zip = MonoAndroidHelper.ReadZipFile (finfo.FullName)) {
using (var stream = libzip.GetResourceStream ())
using (var zip = Xamarin.Tools.Zip.ZipArchive.Open (stream)) {
try {
updated |= Files.ExtractAll (zip, nativeimportsDir, modifyCallback: (entryFullName) => {
files.Add (Path.GetFullPath (Path.Combine (nativeimportsDir, entryFullName)));
Expand All @@ -318,24 +312,15 @@ void Extract (
return;
}
}

finfo.Delete ();
}

// embedded AndroidResourceLibrary archive
var reszip = mod.Resources.FirstOrDefault (r => r.Name == "__AndroidLibraryProjects__.zip") as EmbeddedResource;
if (reszip != null) {
if (!Directory.Exists (outDirForDll))
Directory.CreateDirectory (outDirForDll);
var finfo = new FileInfo (Path.Combine (outDirForDll, reszip.Name));
using (var fs = finfo.Create ()) {
var data = reszip.GetResourceData ();
fs.Write (data, 0, data.Length);
}

// temporarily extracted directory will look like:
// __library_projects__/[dllname]/[library_project_imports | jlibs]/bin
using (var zip = MonoAndroidHelper.ReadZipFile (finfo.FullName)) {
using (var stream = reszip.GetResourceStream ())
using (var zip = Xamarin.Tools.Zip.ZipArchive.Open (stream)) {
try {
updated |= Files.ExtractAll (zip, importsDir, modifyCallback: (entryFullName) => {
return entryFullName
Expand Down Expand Up @@ -374,8 +359,6 @@ void Extract (
}
if (Directory.Exists (assemblyDir))
resolvedAssetDirectories.Add (assemblyDir);

finfo.Delete ();
}
}

Expand Down