Bump com.android.tools.build:manifest-merger from 31.12.2 to 31.13.0 in /src/manifestmerger

src/Xamarin.Android.Build.Tasks/Tasks/ManifestMerger.cs

@@ -136,6 +136,7 @@ protected virtual CommandLineBuilder GetCommandLineBuilder ()
 					sb.AppendLine (entry);
 				}
 			}
+			sb.AppendLine ("--lenientUsesSdkInManifestHandling");
 			sb.AppendLine ("--out");
 			sb.AppendLine (tempFile);
 			File.WriteAllText (responseFile, sb.ToString ());

src/manifestmerger/build.gradle

@@ -19,7 +19,10 @@ repositories {
 
 dependencies {
     // https://mvnrepository.com/artifact/com.android.tools.build/manifest-merger
-    implementation 'com.android.tools.build:manifest-merger:31.12.2'
+    implementation 'com.android.tools.build:manifest-merger:31.13.0'
+    // ILogger is needed at compile time for the LenientMerger subclass, but
+    // manifest-merger declares common with runtime scope only.
+    implementation 'com.android.tools:common:31.13.0'
 }
 
 sourceSets {

src/manifestmerger/src/com/xamarin/manifestmerger/Main.java

@@ -7,9 +7,23 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import com.android.manifmerger.ManifestMerger2;
 import com.android.manifmerger.Merger;
+import com.android.utils.ILogger;
 
 public class Main {
+
+    // Subclass Merger to apply --lenientUsesSdkInManifestHandling via the API,
+    // working around a bug in Google's Merger CLI where the first pass doesn't
+    // recognize this as a value-less flag and consumes the next argument.
+    static class LenientMerger extends Merger {
+        @Override
+        protected ManifestMerger2.Invoker createInvoker(File mainManifestFile, ILogger logger) {
+            return super.createInvoker(mainManifestFile, logger)
+                .withFeatures(ManifestMerger2.Invoker.Feature.USES_SDK_IN_MANIFEST_LENIENT_HANDLING);
+        }
+    }
+
     public static void main(String[] args) {
         // parse the args and pick out the following
         // @responseFile
@@ -22,15 +36,21 @@ public static void main(String[] args) {
         //   AndroidManifest.xml.tmp
         try {
             FileReader fr = new FileReader (args [0]);
-            BufferedReader br = new BufferedReader (fr);   
+            BufferedReader br = new BufferedReader (fr);
             String line;
+            boolean lenient = false;
             List<String> arguments = new ArrayList<String> ();
-            while((line = br.readLine ())!=null) {
-                arguments.add (line);
+            while ((line = br.readLine ()) != null) {
+                if ("--lenientUsesSdkInManifestHandling".equals (line.trim ())) {
+                    lenient = true;
+                } else {
+                    arguments.add (line);
+                }
             }
             fr.close ();
-            String arg []=arguments.toArray (new String[arguments.size ()]);
-            Merger.main (arg);
+            String arg [] = arguments.toArray (new String [arguments.size ()]);
+            Merger merger = lenient ? new LenientMerger () : new Merger ();
+            System.exit (merger.process (arg));
         } catch (IOException ignore) {
             System.err.println("Response file not provided.");
         }