Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public class GenerateTypeMappings : AndroidTask
public string TypemapOutputDirectory { get; set; } = "";

AndroidRuntime androidRuntime;
readonly List<ITaskItem> generatedBinaryTypeMaps = new List<ITaskItem> ();
Comment thread
jonathanpeppers marked this conversation as resolved.

public override bool RunTask ()
{
Expand All @@ -71,6 +72,7 @@ public override bool RunTask ()
if (RunCheckedBuild || useMarshalMethods)
GenerateAllTypeMappingsFromNativeState (useMarshalMethods);

GeneratedBinaryTypeMaps = generatedBinaryTypeMaps.ToArray ();
return !Log.HasLoggedErrors;
}

Expand Down Expand Up @@ -153,17 +155,14 @@ void GenerateTypeMapFromNativeState (NativeCodeGenState state, bool useMarshalMe
void AddOutputTypeMaps (TypeMapGenerator tmg, AndroidTargetArch arch)
{
string abi = MonoAndroidHelper.ArchToAbi (arch);
var items = new List<ITaskItem> ();

foreach (string file in tmg.GeneratedBinaryTypeMaps) {
var item = new TaskItem (file);
string fileName = Path.GetFileName (file);
item.SetMetadata ("DestinationSubPath", $"{abi}/{fileName}");
item.SetMetadata ("DestinationSubDirectory", $"{abi}/");
item.SetMetadata ("Abi", abi);
items.Add (item);
generatedBinaryTypeMaps.Add (item);
}

GeneratedBinaryTypeMaps = GeneratedBinaryTypeMaps.Concat (items).ToArray ();
}
}