From 72d0bc164dc6aa8e73254b095b8c21d746dbd5d8 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <iBotPeaches@users.noreply.github.com>
Date: Thu, 16 Nov 2023 06:45:38 -0500
Subject: [PATCH] #3427 - Treat manifest warnings as warnings (#3429)

* feat: treat warnings as warnings during aapt2 build

* test: add invalid fragment to manifest to confirm warning
---
 .../apktool-lib/src/main/java/brut/androlib/AaptInvoker.java   | 3 +++
 .../src/test/resources/aapt2/testapp/AndroidManifest.xml       | 1 +
 2 files changed, 4 insertions(+)

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/AaptInvoker.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/AaptInvoker.java
index 4bd891d9..db9afc78 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/AaptInvoker.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/AaptInvoker.java
@@ -178,6 +178,9 @@ public class AaptInvoker {
 
         cmd.add("--no-compile-sdk-metadata");
 
+        // #3427 - Ignore stricter parsing during aapt2
+        cmd.add("--warn-manifest-validation");
+
         if (mApkInfo.sparseResources) {
             cmd.add("--enable-sparse-encoding");
         }
diff --git a/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/AndroidManifest.xml b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/AndroidManifest.xml
index ea5477ef..444556f3 100644
--- a/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/AndroidManifest.xml
+++ b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/AndroidManifest.xml
@@ -6,6 +6,7 @@
                 android:name="android.accessibilityservice"
                 android:resource="@xml/accessibility_service_config" />
         </service>
+        <fragment android:name=".views.Issue3427"/>
         <meta-data name="test_int_as_string" value="\ 12345" />
         <meta-data name="test_int" value="12345" />
     </application>