commit 5596a61b9711f479fe3db65332c06d1bc86f42e7
author Mark Punzalan <markpun@google.com> Fri Jan 19 00:06:38 2024 -0800
committer Mark Punzalan <markpun@google.com> Fri Jan 19 00:15:43 2024 -0800
tree eafb18a722c6de1d7822bf40b9b0ff60af85050b
parent 27aeef3cdec175dcd94db7c0227cfcb978c63a61

[aapt2] Ignore annotations in flag/enum attribute values

Bug: 258855262
Test: atest aapt2_tests
Change-Id: If67a73b02da719b049c19cee561a2f9b8945956b

tools/aapt2/test/Builders.h

diff --git a/tools/aapt2/test/Builders.h b/tools/aapt2/test/Builders.h
index 098535d..9ee44ba 100644
--- a/tools/aapt2/test/Builders.h
+++ b/tools/aapt2/test/Builders.h
@@ -116,7 +116,10 @@
   AttributeBuilder();
   AttributeBuilder& SetTypeMask(uint32_t typeMask);
   AttributeBuilder& SetWeak(bool weak);
+  AttributeBuilder& SetComment(android::StringPiece comment);
   AttributeBuilder& AddItem(android::StringPiece name, uint32_t value);
+  AttributeBuilder& AddItemWithComment(android::StringPiece name, uint32_t value,
+                                       android::StringPiece comment);
   std::unique_ptr<Attribute> Build();
 
  private: