Address PR review: fix manifest name matching and null guard

- Fix RootManifestReferencedTypes to resolve relative android:name
  values (.MyActivity, MyActivity) using manifest package attribute
- Keep $ separator in peer lookup keys so nested types (Outer$Inner)
  match correctly against manifest class names
- Guard Path.GetDirectoryName against null return for acw-map path
- Fix pre-existing compilation error: load XDocument from template
  path before passing to ManifestGenerator.Generate
- Add tests for relative name resolution and nested type matching

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: simonrozsival

src/Microsoft.Android.Sdk.TrimmableTypeMap/TrimmableTypeMapGenerator.cs

@@ -62,7 +62,10 @@ public TrimmableTypeMapResult Execute (
 
 		// Write merged acw-map.txt if requested
 		if (!acwMapOutputPath.IsNullOrEmpty ()) {
-			Directory.CreateDirectory (Path.GetDirectoryName (acwMapOutputPath));
+			var acwDirectory = Path.GetDirectoryName (acwMapOutputPath);
+		if (!acwDirectory.IsNullOrEmpty ()) {
+			Directory.CreateDirectory (acwDirectory);
+		}
 			using (var writer = new StreamWriter (acwMapOutputPath)) {
 				AcwMapWriter.Write (writer, allPeers);
 			}
@@ -104,7 +107,12 @@ IList<string> GenerateManifest (List<JavaPeerInfo> allPeers, AssemblyManifestInf
 			ApplicationJavaClass = config.ApplicationJavaClass,
 		};
 
-		return generator.Generate (manifestTemplatePath, allPeers, assemblyManifestInfo, mergedManifestOutputPath);
+		XDocument? manifestTemplateDoc = null;
+		if (!manifestTemplatePath.IsNullOrEmpty () && File.Exists (manifestTemplatePath)) {
+			manifestTemplateDoc = XDocument.Load (manifestTemplatePath);
+		}
+
+		return generator.Generate (manifestTemplateDoc, allPeers, assemblyManifestInfo, mergedManifestOutputPath);
 	}
 
 	(List<JavaPeerInfo> peers, AssemblyManifestInfo manifestInfo) ScanAssemblies (IReadOnlyList<(string Name, PEReader Reader)> assemblies)
@@ -176,6 +184,7 @@ internal void RootManifestReferencedTypes (List<JavaPeerInfo> allPeers, XDocumen
 
 		XNamespace androidNs = "http://schemas.android.com/apk/res/android";
 		XName attName = androidNs + "name";
+		var packageName = (string?) root.Attribute ("package") ?? "";
 
 		var componentNames = new HashSet<string> (StringComparer.Ordinal);
 		foreach (var element in root.Descendants ()) {
@@ -186,7 +195,7 @@ internal void RootManifestReferencedTypes (List<JavaPeerInfo> allPeers, XDocumen
 			case "provider":
 				var name = (string?) element.Attribute (attName);
 				if (name is not null) {
-					componentNames.Add (name);
+					componentNames.Add (ResolveManifestClassName (name, packageName));
 				}
 				break;
 			}
@@ -196,9 +205,10 @@ internal void RootManifestReferencedTypes (List<JavaPeerInfo> allPeers, XDocumen
 			return;
 		}
 
+		// Build lookup by dot-name, keeping '$' for nested types (manifests use '$' too).
 		var peersByDotName = new Dictionary<string, List<JavaPeerInfo>> (StringComparer.Ordinal);
 		foreach (var peer in allPeers) {
-			var dotName = peer.JavaName.Replace ('/', '.').Replace ('$', '.');
+			var dotName = peer.JavaName.Replace ('/', '.');
 			if (!peersByDotName.TryGetValue (dotName, out var list)) {
 				list = [];
 				peersByDotName [dotName] = list;
@@ -219,4 +229,22 @@ internal void RootManifestReferencedTypes (List<JavaPeerInfo> allPeers, XDocumen
 			}
 		}
 	}
+
+	/// <summary>
+	/// Resolves an android:name value to a fully-qualified class name.
+	/// Names starting with '.' are relative to the package. Names with no '.' at all
+	/// are also treated as relative (Android tooling convention).
+	/// </summary>
+	static string ResolveManifestClassName (string name, string packageName)
+	{
+		if (name.StartsWith (".", StringComparison.Ordinal)) {
+			return packageName + name;
+		}
+
+		if (name.IndexOf ('.') < 0 && !packageName.IsNullOrEmpty ()) {
+			return packageName + "." + name;
+		}
+
+		return name;
+	}
 }

tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TrimmableTypeMapGeneratorTests.cs

@@ -194,6 +194,65 @@ public void RootManifestReferencedTypes_EmptyManifest_NoChanges ()
 		Assert.False (peers [0].IsUnconditional);
 	}
 
+	[Fact]
+	public void RootManifestReferencedTypes_ResolvesRelativeNames ()
+	{
+		var peers = new List<JavaPeerInfo> {
+			new JavaPeerInfo {
+				JavaName = "com/example/MyActivity", CompatJniName = "com.example.MyActivity",
+				ManagedTypeName = "MyApp.MyActivity", ManagedTypeNamespace = "MyApp", ManagedTypeShortName = "MyActivity",
+				AssemblyName = "MyApp", IsUnconditional = false,
+			},
+			new JavaPeerInfo {
+				JavaName = "com/example/MyService", CompatJniName = "com.example.MyService",
+				ManagedTypeName = "MyApp.MyService", ManagedTypeNamespace = "MyApp", ManagedTypeShortName = "MyService",
+				AssemblyName = "MyApp", IsUnconditional = false,
+			},
+		};
+
+		var doc = System.Xml.Linq.XDocument.Parse ("""
+			<?xml version="1.0" encoding="utf-8"?>
+			<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example">
+			  <application>
+			    <activity android:name=".MyActivity" />
+			    <service android:name="MyService" />
+			  </application>
+			</manifest>
+			""");
+
+		var generator = CreateGenerator ();
+		generator.RootManifestReferencedTypes (peers, doc);
+
+		Assert.True (peers [0].IsUnconditional, "Dot-relative name '.MyActivity' should resolve to com.example.MyActivity.");
+		Assert.True (peers [1].IsUnconditional, "Simple name 'MyService' should resolve to com.example.MyService.");
+	}
+
+	[Fact]
+	public void RootManifestReferencedTypes_MatchesNestedTypes ()
+	{
+		var peers = new List<JavaPeerInfo> {
+			new JavaPeerInfo {
+				JavaName = "com/example/Outer$Inner", CompatJniName = "com.example.Outer$Inner",
+				ManagedTypeName = "MyApp.Outer.Inner", ManagedTypeNamespace = "MyApp", ManagedTypeShortName = "Inner",
+				AssemblyName = "MyApp", IsUnconditional = false,
+			},
+		};
+
+		var doc = System.Xml.Linq.XDocument.Parse ("""
+			<?xml version="1.0" encoding="utf-8"?>
+			<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example">
+			  <application>
+			    <activity android:name="com.example.Outer$Inner" />
+			  </application>
+			</manifest>
+			""");
+
+		var generator = CreateGenerator ();
+		generator.RootManifestReferencedTypes (peers, doc);
+
+		Assert.True (peers [0].IsUnconditional, "Nested type 'Outer$Inner' should be matched using '$' separator.");
+	}
+
 	static PEReader CreateTestFixturePEReader ()
 	{
 		var dir = Path.GetDirectoryName (typeof (FixtureTestBase).Assembly.Location)