commit 423c0f55fff0c56520eb8aed818bc8fa009bf5a0
author Jeremy Meyer <jakmcbane@google.com> Fri Aug 02 12:06:54 2024 -0700
committer Jeremy Meyer <jakmcbane@google.com> Wed Aug 07 14:55:45 2024 -0700
tree 617f5879e32a1402f4c7f627e67889817ff29e67
parent 16c83afa9b790d3fde434232771f6cb089291c44

Keep disabled resources out of final apk

Test: Automated
Bug: 329436914
Flag: EXEMPT Aconfig not supported on host tools
Change-Id: Id5fdb025f004788ea40bdbd0b0df0dbda181f2c7

tools/aapt2/Android.bp

diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp
index 7b227ce..f43cf52 100644
--- a/tools/aapt2/Android.bp
+++ b/tools/aapt2/Android.bp
@@ -113,6 +113,7 @@
         "io/ZipArchive.cpp",
         "link/AutoVersioner.cpp",
         "link/FeatureFlagsFilter.cpp",
+        "link/FlagDisabledResourceRemover.cpp",
         "link/ManifestFixer.cpp",
         "link/NoDefaultResourceRemover.cpp",
         "link/PrivateAttributeMover.cpp",
@@ -190,6 +191,7 @@
         "integration-tests/ConvertTest/**/*",
         "integration-tests/DumpTest/**/*",
         ":resource-flagging-test-app-apk",
+        ":resource-flagging-test-app-r-java",
     ],
 }