commit cff10cec6cb6f406f71d42b064d527549cc0cca8
author Iurii Makhno <iuriimak@google.com> Tue Feb 15 19:33:50 2022 +0000
committer Iurii Makhno <iuriimak@google.com> Wed Feb 16 20:23:24 2022 +0000
tree 1d2facf050dc96a030ae07e59e197dec7479733f
parent dfbac39d3854daabdef722fd62ccb58203ff3e2d

Switch ResourceName to use ResourceNamedType instead of ResourceType.

DD: go/custom-resource-types-in-aapt2

Bug: b/215108200
Test: Resource_test.cpp
Change-Id: I0b97fc0024523700e01adce788bb934d388da288

tools/aapt2/compile/XmlIdCollector.cpp

diff --git a/tools/aapt2/compile/XmlIdCollector.cpp b/tools/aapt2/compile/XmlIdCollector.cpp
index 5054115..bb72159 100644
--- a/tools/aapt2/compile/XmlIdCollector.cpp
+++ b/tools/aapt2/compile/XmlIdCollector.cpp
@@ -46,7 +46,7 @@
       ResourceNameRef name;
       bool create = false;
       if (ResourceUtils::ParseReference(attr.value, &name, &create, nullptr)) {
-        if (create && name.type == ResourceType::kId) {
+        if (create && name.type.type == ResourceType::kId) {
           if (!text::IsValidResourceEntryName(name.entry)) {
             source_diag_->Error(DiagMessage(element->line_number)
                                    << "id '" << name << "' has an invalid entry name");