Skip to content

write the stripped assemblies to new file and then move it #230

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
wants to merge 1 commit into from
+14 −2
Closed

write the stripped assemblies to new file and then move it #230

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
16 changes: 14 additions & 2 deletions src/Xamarin.Android.Build.Tasks/Tasks/StripEmbeddedLibraries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public override bool Execute ()
foreach (var assembly in Assemblies)
res.Load (Path.GetFullPath (assembly.ItemSpec));

var strippedAssemblies = new Dictionary<string, string> ();
foreach (var assemblyName in Assemblies) {
var suffix = assemblyName.ItemSpec.EndsWith (".dll") ? String.Empty : ".dll";
string hintPath = assemblyName.GetMetadata ("HintPath").Replace (Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
Expand Down Expand Up @@ -68,7 +69,8 @@ public override bool Execute ()
}
}
if (assembly_modified) {
Log.LogDebugMessage (" The stripped library is saved as {0}", assemblyPath);
var strippedPath = assemblyPath + ".stripped";
Log.LogDebugMessage (" The stripped library is saved as {0}", strippedPath);

// Output assembly needs to regenerate symbol file even if no IL/metadata was touched
// because Cecil still rewrites all assembly types in Cecil order (type A, nested types of A, type B, etc)
Expand All @@ -77,9 +79,19 @@ public override bool Execute ()
WriteSymbols = assembly.MainModule.HasSymbols
};

assembly.Write (assemblyPath, wp);
assembly.Write (strippedPath, wp);
strippedAssemblies [assemblyPath] = strippedPath;
}
}

res.Dispose ();

foreach (var pair in strippedAssemblies) {
File.Delete (pair.Key);
Copy link
Contributor

@dellis1972 dellis1972 Sep 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@radekdoulik @jonpryor won't this fail if the assembly is readonly. I can't remember if we fix those up before we run this task or not

File.Move (pair.Value, pair.Key);
Log.LogDebugMessage (" The stripped library {0} is moved back to {1}", pair.Value, pair.Key);
}

return true;
}
}
Expand Down