[TrimmableTypeMap] Build pipeline: targets, stubs, manifest integration, feature switches

src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/AcwMapWriter.cs

@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using System.Collections.Generic;
 using System.IO;

src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/AndroidEnumConverter.cs

@@ -1,4 +1,3 @@
-#nullable enable
 
 using System.Collections.Generic;
 

src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/AssemblyLevelElementBuilder.cs

@@ -1,4 +1,3 @@
-#nullable enable
 
 using System;
 using System.Collections.Generic;

src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ComponentElementBuilder.cs

@@ -1,4 +1,3 @@
-#nullable enable
 
 using System;
 using System.Globalization;

src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/JniSignatureHelper.cs

@@ -163,11 +163,14 @@ internal static void ValidateJniName (string jniName)
 
 	/// <summary>
 	/// Converts a JNI type name to a Java source type name.
-	/// e.g., "android/app/Activity" \u2192 "android.app.Activity"
+	/// JNI uses '/' for packages and '$' for inner classes.
+	/// Java source uses '.' for both.
+	/// e.g., "android/app/Activity" → "android.app.Activity"
+	/// e.g., "android/drm/DrmManagerClient$OnEventListener" → "android.drm.DrmManagerClient.OnEventListener"
 	/// </summary>
 	internal static string JniNameToJavaName (string jniName)
 	{
-		return jniName.Replace ('/', '.');
+		return jniName.Replace ('/', '.').Replace ('$', '.');
 	}
 
 	/// <summary>

src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ManifestConstants.cs

@@ -1,4 +1,3 @@
-#nullable enable
 
 using System.Xml.Linq;
 

src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ManifestGenerator.cs

@@ -1,4 +1,3 @@
-#nullable enable
 
 using System;
 using System.Collections.Generic;
@@ -46,7 +45,24 @@ public IList<string> Generate (
 		AssemblyManifestInfo assemblyInfo,
 		string outputPath)
 	{
-		var doc = LoadOrCreateManifest (manifestTemplatePath);
+		XDocument? template = null;
+		if (!string.IsNullOrEmpty (manifestTemplatePath) && File.Exists (manifestTemplatePath)) {
+			template = XDocument.Load (manifestTemplatePath);
+		}
+		return Generate (template, allPeers, assemblyInfo, outputPath);
+	}
+
+	/// <summary>
+	/// Generates the merged manifest from an optional pre-loaded template and writes it to <paramref name="outputPath"/>.
+	/// Returns the list of additional content provider names (for ApplicationRegistration.java).
+	/// </summary>
+	public IList<string> Generate (
+		XDocument? manifestTemplate,
+		IReadOnlyList<JavaPeerInfo> allPeers,
+		AssemblyManifestInfo assemblyInfo,
+		string outputPath)
+	{
+		var doc = manifestTemplate ?? CreateDefaultManifest ();
 		var manifest = doc.Root;
 		if (manifest is null) {
 			throw new InvalidOperationException ("Manifest document has no root element.");
@@ -134,12 +150,8 @@ public IList<string> Generate (
 		return providerNames;
 	}
 
-	XDocument LoadOrCreateManifest (string? templatePath)
+	XDocument CreateDefaultManifest ()
 	{
-		if (!string.IsNullOrEmpty (templatePath) && File.Exists (templatePath)) {
-			return XDocument.Load (templatePath);
-		}
-
 		return new XDocument (
 			new XDeclaration ("1.0", "utf-8", null),
 			new XElement ("manifest",

src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/PropertyMapper.cs

@@ -1,4 +1,3 @@
-#nullable enable
 
 using System;
 using System.Collections.Generic;

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

@@ -0,0 +1,18 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.Android.Sdk.TrimmableTypeMap;
+
+// The static methods in System.String are not NRT annotated in netstandard2.0,
+// so we need our own extension methods to make them nullable aware.
+static class NullableExtensions
+{
+	public static bool IsNullOrEmpty ([NotNullWhen (false)] this string? str)
+	{
+		return string.IsNullOrEmpty (str);
+	}
+
+	public static bool IsNullOrWhiteSpace ([NotNullWhen (false)] this string? str)
+	{
+		return string.IsNullOrWhiteSpace (str);
+	}
+}