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/cmd/Link.cpp

diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp
index e614a75..790f2b3 100644
--- a/tools/aapt2/cmd/Link.cpp
+++ b/tools/aapt2/cmd/Link.cpp
@@ -207,7 +207,7 @@
     }
 
     // Check to see if this is an 'id' with the target package.
-    if (name.type == ResourceType::kId && symbol->id) {
+    if (name.type.type == ResourceType::kId && symbol->id) {
       ResourceId* id = &symbol->id.value();
       if (id->package_id() > kAppPackageId) {
         // Rewrite the resource ID to be compatible pre-O.