Skip to content

Commit

Permalink
try this
Browse files Browse the repository at this point in the history
  • Loading branch information
dellis1972 committed Nov 4, 2024
1 parent 26cfd6d commit 79cfc8d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,14 @@ Copyright (C) 2016 Xamarin. All rights reserved.
Inputs="@(_AndroidResourceDest);@(LibraryResourceDirectories->'%(StampFile)')"
Outputs="$(_GenerateResourceCaseMapFile)"
>
<ItemGroup>
<!-- Only use the aar files if we have not extracted the data -->
<_LocalAarFiles Include="@(AndroidAarLibrary)" Condition=" '@(LibraryResourceDirectories->Count())' == '0' " />
</ItemGroup>
<!-- Generate a ResourceMap file for the project and its resources -->
<GenerateResourceCaseMap
AdditionalResourceDirectories="@(LibraryResourceDirectories)"
AarLibraries="@(AndroidAarLibrary)"
AarLibraries="@(_LocalAarFiles)"
OutputFile="$(_GenerateResourceCaseMapFile)"
ProjectDir="$(ProjectDir)"
ResourceDirectory="$(MonoAndroidResDirIntermediate)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public override bool RunTask ()
continue;
if (entry.FullName != resmap)
continue;
Log.LogDebugMessage ($"Found: {entry.FullName}");
using var ms = new MemoryStream();
entry.Extract (ms);
ms.Position = 0;
Expand All @@ -94,6 +95,8 @@ public override bool RunTask ()
string [] tok = line.Split (';');
AddRename (tok [1].Replace ('/', Path.DirectorySeparatorChar), tok [0].Replace ('/', Path.DirectorySeparatorChar));
}
// no need to read the rest of the files we found the one we want
break;
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.CodeDom;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
using System.Linq;
Expand Down Expand Up @@ -332,8 +333,8 @@ void ProcessStyleable (XmlReader reader, Dictionary<string, ICollection<R>> reso
fields.Add (r);
}
}
if (field.Type != RType.Array)
return;
//if (field.Type != RType.Array)
// return;
arrayMapping.Add (field, fields.ToArray ());

field.Ids = new int [attribs.Count];
Expand Down

0 comments on commit 79cfc8d

Please sign in to comment.