commit 3d8d4a18c2bd4d697692ea30471852c90e7a3775
author Jeremy Meyer <jakmcbane@google.com> Fri Aug 23 17:29:03 2024 -0700
committer Jeremy Meyer <jakmcbane@google.com> Wed Sep 25 14:50:54 2024 -0700
tree 19f6ae00972e306ed53d18712bc3893f2b973b42
parent b7ab38e10e1f0d3088153f070e681e34263d393c

Error on duplicate resource with same disabled flag

Also realized I hadn't handled flag negation so added that as well.

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

tools/aapt2/ResourceValues.cpp

diff --git a/tools/aapt2/ResourceValues.cpp b/tools/aapt2/ResourceValues.cpp
index b75e87c..723cfc0 100644
--- a/tools/aapt2/ResourceValues.cpp
+++ b/tools/aapt2/ResourceValues.cpp
@@ -1102,6 +1102,7 @@
 std::unique_ptr<T> CopyValueFields(std::unique_ptr<T> new_value, const T* value) {
   new_value->SetSource(value->GetSource());
   new_value->SetComment(value->GetComment());
+  new_value->SetFlag(value->GetFlag());
   new_value->SetFlagStatus(value->GetFlagStatus());
   return new_value;
 }