commit d52bd6858a6b2913f46e57bca0d96d5212416f10
author Jeremy Meyer <jakmcbane@google.com> Wed Aug 14 11:16:58 2024 -0700
committer Jeremy Meyer <jakmcbane@google.com> Thu Aug 15 14:39:42 2024 -0700
tree 344a52e787e6e0064193d0b176ba58fd50d71c00
parent d439c6190e217780329f747d18e9683fce8a5002

Flag support for bag resource types

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

tools/aapt2/link/FlagDisabledResourceRemover.cpp

diff --git a/tools/aapt2/link/FlagDisabledResourceRemover.cpp b/tools/aapt2/link/FlagDisabledResourceRemover.cpp
index e3289e2..3ac1762 100644
--- a/tools/aapt2/link/FlagDisabledResourceRemover.cpp
+++ b/tools/aapt2/link/FlagDisabledResourceRemover.cpp
@@ -32,12 +32,17 @@
   const auto remove_iter =
       std::stable_partition(entry->values.begin(), end_iter,
                             [](const std::unique_ptr<ResourceConfigValue>& value) -> bool {
-                              return value->flag_status != FlagStatus::Disabled;
+                              return value->value->GetFlagStatus() != FlagStatus::Disabled;
                             });
 
   bool keep = remove_iter != entry->values.begin();
 
   entry->values.erase(remove_iter, end_iter);
+
+  for (auto& value : entry->values) {
+    value->value->RemoveFlagDisabledElements();
+  }
+
   return keep;
 }