Skip to content

[mtouch] Copy aot data to the app even for assemblies that aren't copied. Fixes #54499. #1964

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
rolfbjarne merged 1 commit into from
Apr 6, 2017
Merged

[mtouch] Copy aot data to the app even for assemblies that aren't copied. Fixes #54499. #1964

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
43 changes: 43 additions & 0 deletions tests/mtouch/MTouch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,49 @@ public enum Profile { iOS, tvOS, watchOS }
[TestFixture]
public class MTouch
{
[Test]
[TestCase ("armv7,arm64")]
public void AotDataTest (string abi)
{
AssertDeviceAvailable ();

using (var mtouch = new MTouchTool ()) {
mtouch.CreateTemporaryApp ();
mtouch.CreateTemporaryCacheDirectory ();
mtouch.Abi = abi;
mtouch.DSym = false; // speeds up the test
mtouch.MSym = false; // speeds up the test
mtouch.AssertExecute (MTouchAction.BuildDev, "build");

var expectedFiles = new string []
{
"NOTICE",
"testApp",
"testApp.aotdata.armv7",
"testApp.aotdata.arm64",
"testApp.exe",
"mscorlib.dll",
"mscorlib.aotdata.armv7",
"mscorlib.aotdata.arm64",
"System.dll",
"System.aotdata.armv7",
"System.aotdata.arm64",
"Xamarin.iOS.dll",
"Xamarin.iOS.aotdata.armv7",
"Xamarin.iOS.aotdata.arm64",

};
var allFiles = Directory.GetFiles (mtouch.AppPath, "*", SearchOption.AllDirectories);
var failed = new List<string> ();
foreach (var expected in expectedFiles) {
if (allFiles.Any ((v) => v.EndsWith (expected, StringComparison.Ordinal)))
continue;
failed.Add (expected);
}
Assert.IsEmpty (failed, "expected files");
}
}

[Test]
[TestCase ("single", "", false)]
[TestCase ("dual", "armv7,arm64", false)]
Expand Down
5 changes: 5 additions & 0 deletions tools/mtouch/Application.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1883,6 +1883,7 @@ public void BuildMSymDirectory ()

foreach (var asm in target.Assemblies) {
asm.CopyToDirectory (tmpdir, reload: false, only_copy: true);
asm.CopyAotDataFilesToDirectory (tmpdir);
}
// mono-symbolicate knows best
CopyMSymData (target_directory, tmpdir);
Expand Down Expand Up @@ -1998,6 +1999,8 @@ public void BundleAssemblies ()
} else {
assemblies [0].CopyToDirectory (AppDirectory, copy_mdb: PackageMdb, strip: strip, only_copy: true);
}
foreach (var asm in assemblies)
asm.CopyAotDataFilesToDirectory (size_specific ? asm.Target.AppTargetDirectory : AppDirectory);
break;
case AssemblyBuildTarget.Framework:
// Put our resources in a subdirectory in the framework
Expand All @@ -2011,6 +2014,8 @@ public void BundleAssemblies ()
} else {
assemblies [0].CopyToDirectory (resource_directory, copy_mdb: PackageMdb, strip: strip, only_copy: true);
}
foreach (var asm in assemblies)
asm.CopyAotDataFilesToDirectory (size_specific ? Path.Combine (resource_directory, Path.GetFileName (asm.Target.AppTargetDirectory)) : resource_directory);
break;
default:
throw ErrorHelper.CreateError (100, "Invalid assembly build target: '{0}'. Please file a bug report with a test case (http://bugzilla.xamarin.com).", build_target);
Expand Down
10 changes: 8 additions & 2 deletions tools/mtouch/Assembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,14 @@ public void CopyConfigToDirectory (string directory)
}
}

// this will copy (and optionally strip) the assembly and all the related files:
// this will copy (and optionally strip) the assembly and almost all the related files:
// * debug file (.mdb)
// * config file (.config)
// * satellite assemblies (<language id>/.dll)
// * aot data
//
// Aot data is copied separately, because we might want to copy aot data
// even if we don't want to copy the assembly (if 32/64-bit assemblies are identical,
// only one is copied, but we still want the aotdata for both).
public void CopyToDirectory (string directory, bool reload = true, bool check_case = false, bool only_copy = false, bool copy_mdb = true, bool strip = false)
{
var target = Path.Combine (directory, FileName);
Expand All @@ -205,7 +208,10 @@ public void CopyToDirectory (string directory, bool reload = true, bool check_ca
FullPath = target;
}
}
}

public void CopyAotDataFilesToDirectory (string directory)
{
foreach (var aotdata in AotInfos.Values.SelectMany ((info) => info.AotDataFiles))
Application.UpdateFile (aotdata, Path.Combine (directory, Path.GetFileName (aotdata)));
}
Expand Down