From 926e73f49f637a5d26d509d745cd2abc3f83a762 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 02:02:34 +0000 Subject: [PATCH 1/2] Bump com.android.tools.build:manifest-merger in /src/manifestmerger Bumps com.android.tools.build:manifest-merger from 31.12.2 to 31.13.0. --- updated-dependencies: - dependency-name: com.android.tools.build:manifest-merger dependency-version: 31.13.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/manifestmerger/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/manifestmerger/build.gradle b/src/manifestmerger/build.gradle index 1c22cc978fd..9b600961ea5 100644 --- a/src/manifestmerger/build.gradle +++ b/src/manifestmerger/build.gradle @@ -19,7 +19,7 @@ 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' } sourceSets { From 14acc4366d54ea741ae8eba4cd5a7cb0722213af Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 12 Sep 2025 16:09:58 -0500 Subject: [PATCH 2/2] Pass `--lenientUsesSdkInManifestHandling` Context: https://cs.android.com/android-studio/platform/tools/base/+/mirror-goog-studio-main:build-system/manifest-merger/src/main/java/com/android/manifmerger/Merger.java;l=190-193?q=Merger.main&ss=android-studio%2Fplatform%2Ftools%2Fbase --- src/Xamarin.Android.Build.Tasks/Tasks/ManifestMerger.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/ManifestMerger.cs b/src/Xamarin.Android.Build.Tasks/Tasks/ManifestMerger.cs index a2428b584cc..99c3c7a1a9a 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/ManifestMerger.cs +++ b/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 ());